TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

96 files changed, 904 insertions, 870 deletions

diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp
index d28372e6..a0ed07a9 100644
--- a/cervisia/addremovedlg.cpp
+++ b/cervisia/addremovedlg.cpp
@@ -30,8 +30,8 @@
 #include <klocale.h>
 
 
-AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char* name)
-    : KDialogBase(parent, name, true, TQString::null,
+AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* tqparent, const char* name)
+    : KDialogBase(tqparent, name, true, TQString(),
                   Ok | Cancel | Help, Ok, true)
 {
     setCaption( (action==Add)?       i18n("CVS Add") :
@@ -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 QLabel
+    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 )
@@ -85,10 +85,10 @@ void AddRemoveDialog::setFileList(const TQStringList& files)
 {
     // the dot for the root directory is hard to see, so
     // we convert it to the absolut path
-    if( files.find(".") != files.end() )
+    if( files.tqfind(".") != files.end() )
     {
         TQStringList copy(files);
-        int idx = copy.findIndex(".");
+        int idx = copy.tqfindIndex(".");
         copy[idx] = TQFileInfo(".").absFilePath();
 
         m_listBox->insertStringList(copy);
@@ -98,4 +98,4 @@ void AddRemoveDialog::setFileList(const TQStringList& files)
 }
 
 
-// kate: space-indent on; indent-width 4; replace-tabs on;
+// kate: space-indent on; indent-width 4; tqreplace-tabs on;
diff --git a/cervisia/addremovedlg.h b/cervisia/addremovedlg.h
index e18547f2..e151e097 100644
--- a/cervisia/addremovedlg.h
+++ b/cervisia/addremovedlg.h
@@ -35,7 +35,7 @@ class AddRemoveDialog : public KDialogBase
 public:
     enum ActionType { Add, AddBinary, Remove };
 
-    explicit AddRemoveDialog(ActionType action, TQWidget* parent=0, const char* name=0);
+    explicit AddRemoveDialog(ActionType action, TQWidget* tqparent=0, const char* name=0);
 
     void setFileList(const TQStringList& files);
 
@@ -46,4 +46,4 @@ private:
 #endif
 
 
-// kate: space-indent on; indent-width 4; replace-tabs on;
+// kate: space-indent on; indent-width 4; tqreplace-tabs on;
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index c370b02a..8a4d05fd 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -33,17 +33,17 @@
 
 
 AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo, 
-                                         TQWidget* parent, const char* name)
-    : KDialogBase(parent, name, true, i18n("Add Repository"),
+                                         TQWidget* tqparent, const char* name)
+    : KDialogBase(tqparent, name, true, i18n("Add Repository"),
                   Ok | Cancel, Ok, true)
     , partConfig(cfg)
 {
     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()) );
@@ -180,9 +180,9 @@ void AddRepositoryDialog::repoChanged()
 {
     TQString repo = repository();
     rsh_edit->setEnabled((!repo.startsWith(":pserver:"))
-                         && repo.contains(":"));
-    m_useDifferentCompression->setEnabled(repo.contains(":"));
-    if( !repo.contains(":") )
+                         && repo.tqcontains(":"));
+    m_useDifferentCompression->setEnabled(repo.tqcontains(":"));
+    if( !repo.tqcontains(":") )
         m_compressionLevel->setEnabled(false);
     else
         compressionToggled(m_useDifferentCompression->isChecked());
diff --git a/cervisia/addrepositorydlg.h b/cervisia/addrepositorydlg.h
index 7ef270a4..3e18c6d6 100644
--- a/cervisia/addrepositorydlg.h
+++ b/cervisia/addrepositorydlg.h
@@ -33,9 +33,10 @@ class KLineEdit;
 class AddRepositoryDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AddRepositoryDialog(KConfig& cfg, const TQString& repo, TQWidget* parent = 0,
+    AddRepositoryDialog(KConfig& cfg, const TQString& repo, TQWidget* tqparent = 0,
                          const char* name = 0);
     virtual ~AddRepositoryDialog();
 
diff --git a/cervisia/annotatectl.cpp b/cervisia/annotatectl.cpp
index f74735e3..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();
 }
 
@@ -182,8 +182,8 @@ void AnnotateController::Private::parseCvsAnnotateOutput()
 
         if( rev == oldRevision )
         {
-            logInfo.m_author = TQString::null;
-            rev = TQString::null;
+            logInfo.m_author = TQString();
+            rev = TQString();
         }
         else
         {
diff --git a/cervisia/annotatectl.h b/cervisia/annotatectl.h
index 1000d0db..72078375 100644
--- a/cervisia/annotatectl.h
+++ b/cervisia/annotatectl.h
@@ -33,7 +33,7 @@ public:
     AnnotateController(AnnotateDialog* dialog, CvsService_stub* cvsService);
     ~AnnotateController();
 
-    void showDialog(const TQString& fileName, const TQString& revision = TQString::null);
+    void showDialog(const TQString& fileName, const TQString& revision = TQString());
 
 private:
     struct Private;
diff --git a/cervisia/annotatedlg.cpp b/cervisia/annotatedlg.cpp
index 86b64b43..e40a26bd 100644
--- a/cervisia/annotatedlg.cpp
+++ b/cervisia/annotatedlg.cpp
@@ -23,8 +23,8 @@
 #include "annotateview.h"
 
 
-AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, false, TQString::null,
+AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, false, TQString(),
                   Close | Help, Close, true)
     , partConfig(cfg)
 {
@@ -33,7 +33,7 @@ AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *parent, const char *name)
 
     setHelp("annotate");
 
-    setWFlags(Qt::WDestructiveClose | getWFlags());
+    setWFlags(TQt::WDestructiveClose | getWFlags());
 
     TQSize size = configDialogSize(partConfig, "AnnotateDialog");
     resize(size);
diff --git a/cervisia/annotatedlg.h b/cervisia/annotatedlg.h
index d9ba0317..f0360e73 100644
--- a/cervisia/annotatedlg.h
+++ b/cervisia/annotatedlg.h
@@ -39,7 +39,7 @@ class AnnotateDialog : public KDialogBase
 {
 public:
 
-    explicit AnnotateDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit AnnotateDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
 
     virtual ~AnnotateDialog();
 
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index 58d8d407..c3b4634a 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -31,12 +31,12 @@
 using namespace Cervisia;
 
 
-class AnnotateViewItem : public QListViewItem
+class AnnotateViewItem : public TQListViewItem
 {
 public:
     enum { LineNumberColumn, AuthorColumn, ContentColumn };
 
-    AnnotateViewItem(AnnotateView *parent, const LogInfo& logInfo,
+    AnnotateViewItem(AnnotateView *tqparent, const LogInfo& logInfo,
                      const TQString &content, bool odd, int linenumber);
 
     virtual int compare(TQListViewItem *item, int col, bool ascending) const;
@@ -58,9 +58,9 @@ private:
 const int AnnotateViewItem::BORDER = 4;
 
 
-AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, const LogInfo& logInfo,
+AnnotateViewItem::AnnotateViewItem(AnnotateView *tqparent, const LogInfo& logInfo,
                                    const TQString &content, bool odd, int linenumber)
-    : TQListViewItem(parent)
+    : TQListViewItem(tqparent)
     , m_logInfo(logInfo)
     , m_content(content)
     , m_odd(odd)
@@ -85,7 +85,7 @@ TQString AnnotateViewItem::text(int col) const
         return TQString::number(m_lineNumber);
     case AuthorColumn:
         if( m_logInfo.m_author.isNull() )
-            return TQString::null;
+            return TQString();
         else
             return (m_logInfo.m_author + TQChar(' ') + m_logInfo.m_revision);
     case ContentColumn:
@@ -94,7 +94,7 @@ TQString AnnotateViewItem::text(int col) const
         ;
     };
 
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -137,11 +137,11 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col
 
 /*!
   @todo The dummy column (remaining space eater) doesn't work
-  caused by a bug in TQHeader::adjustHeaderSize() in Qt <= 3.0.4.
+  caused by a bug in TQHeader::adjustHeaderSize() in TQt <= 3.0.4.
 */
 
-AnnotateView::AnnotateView(KConfig &cfg, TQWidget *parent, const char *name)
-    : TQListView(parent, name, WRepaintNoErase | WResizeNoErase)
+AnnotateView::AnnotateView(KConfig &cfg, TQWidget *tqparent, const char *name)
+    : TQListView(tqparent, name, WRepaintNoErase | WResizeNoErase)
 {
     setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
     setAllColumnsShowFocus(true);
@@ -150,12 +150,12 @@ AnnotateView::AnnotateView(KConfig &cfg, TQWidget *parent, const char *name)
     header()->hide();
     //    setResizeMode(LastColumn);
 
-    addColumn(TQString::null);
-    addColumn(TQString::null);
-    addColumn(TQString::null);
+    addColumn(TQString());
+    addColumn(TQString());
+    addColumn(TQString());
 
     setSorting(AnnotateViewItem::LineNumberColumn);
-    setColumnAlignment(AnnotateViewItem::LineNumberColumn, Qt::AlignRight);
+    setColumnAlignment(AnnotateViewItem::LineNumberColumn, TQt::AlignRight);
 
     ToolTip* toolTip = new ToolTip(viewport());
 
@@ -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 f0ae7e21..acaafe24 100644
--- a/cervisia/annotateview.h
+++ b/cervisia/annotateview.h
@@ -34,18 +34,19 @@ struct LogInfo;
 }
 
 
-class AnnotateView : public QListView
+class AnnotateView : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    explicit AnnotateView( KConfig &cfg, TQWidget *parent=0, const char *name=0 );
+    explicit AnnotateView( KConfig &cfg, TQWidget *tqparent=0, const char *name=0 );
 
     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 b810f98c..3a0c720a 100644
--- a/cervisia/cervisia.1.in
+++ b/cervisia/cervisia.1.in
@@ -10,7 +10,7 @@
 \fB\\$1\fR
 .PP
 ..
-.de Sp \" Vertical space (when we can't use .PP)
+.de Sp \"Qt::Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
 ..
@@ -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 df166d7a..abc66521 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -80,9 +80,9 @@ using Cervisia::TagDialog;
 
 K_EXPORT_COMPONENT_FACTORY( libcervisiapart, CervisiaFactory )
 
-CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
-                            TQObject *parent, const char *name, const TQStringList& /*args*/ )
-    : KParts::ReadOnlyPart( parent, name )
+CervisiaPart::CervisiaPart( TQWidget *tqparentWidget, const char *widgetName,
+                            TQObject *tqparent, const char *name, const TQStringList& /*args*/ )
+    : KParts::ReadOnlyPart( tqparent, name )
     , hasRunningJob( false )
     , opt_hideFiles( false )
     , opt_hideUpToDate( false )
@@ -129,14 +129,14 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
     // an explaination
     if( cvsService )
     {
-        Orientation o = splitHorz ? TQSplitter::Vertical
-                                  : TQSplitter::Horizontal;
-        splitter = new TQSplitter(o, parentWidget, widgetName);
+        Qt::Orientation o = splitHorz ? Qt::Vertical
+                                  : Qt::Horizontal;
+        splitter = new TQSplitter(o, tqparentWidget, widgetName);
         // avoid PartManager's warning that Part's window can't handle focus
-        splitter->setFocusPolicy( TQWidget::StrongFocus );
+        splitter->setFocusPolicy( TQ_StrongFocus );
 
         update = new UpdateView(*config(), splitter);
-        update->setFocusPolicy( TQWidget::StrongFocus );
+        update->setFocusPolicy( TQ_StrongFocus );
         update->setFocus();
         connect( update, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
                  this, TQT_SLOT(popupRequested(KListView*, TQListViewItem*, const TQPoint&)) );
@@ -144,14 +144,14 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
                  this, TQT_SLOT(openFile(TQString)) );
 
         protocol = new ProtocolView(appId, splitter);
-        protocol->setFocusPolicy( TQWidget::StrongFocus );
+        protocol->setFocusPolicy( TQ_StrongFocus );
 
         setWidget(splitter);
     }
     else
         setWidget(new TQLabel(i18n("This KPart is non-functional, because the "
                                   "cvs DCOP service could not be started."),
-                             parentWidget));
+                             tqparentWidget));
 
     if( cvsService )
     {
@@ -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"
@@ -257,8 +257,8 @@ void CervisiaPart::setupActions()
     action->setToolTip( hint );
     action->setWhatsThis( hint );
 
-    action = new KAction( i18n("&Status"), "vcs_status", Key_F5,
-                          this, TQT_SLOT( slotStatus() ),
+    action = new KAction( i18n("&tqStatus"), "vcs_status", Key_F5,
+                          this, TQT_SLOT( slottqStatus() ),
                           actionCollection(), "file_status" );
     hint = i18n("Updates the status (cvs -n update) of the selected files and folders");
     action->setToolTip( hint );
@@ -322,7 +322,7 @@ void CervisiaPart::setupActions()
     // View Menu
     //
     action = new KAction( i18n("Stop"), "stop", Key_Escape,
-                          protocol, TQT_SLOT(cancelJob()),
+                          TQT_TQOBJECT(protocol), TQT_SLOT(cancelJob()),
                           actionCollection(), "stop_job" );
     action->setEnabled( false );
     hint = i18n("Stops any running sub-processes");
@@ -649,7 +649,7 @@ void CervisiaPart::popupRequested(KListView*, TQListViewItem* item, const TQPoin
         if( isFileItem(item) )
         {
             // remove old 'Edit with...' menu
-            if( m_editWithId && popup->findItem(m_editWithId) != 0 )
+            if( m_editWithId && popup->tqfindItem(m_editWithId) != 0 )
             {
                 popup->removeItem(m_editWithId);
                 delete m_currentEditMenu; 
@@ -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(KDE_VERSION_STRING));
+                       aboutstr.tqarg(CERVISIA_VERSION).tqarg(KDE_VERSION_STRING));
 }
 
 
@@ -856,7 +856,7 @@ void CervisiaPart::slotUpdate()
 }
 
 
-void CervisiaPart::slotStatus()
+void CervisiaPart::slottqStatus()
 {
     TQStringList list = update->multipleSelection();
     if (list.isEmpty())
@@ -969,7 +969,7 @@ void CervisiaPart::slotCommit()
             return;
 
         TQString msg = dlg.logMessage();
-        if( !recentCommits.contains( msg ) )
+        if( !recentCommits.tqcontains( msg ) )
         {
             recentCommits.prepend( msg );
             while (recentCommits.count() > 50)
@@ -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"));
 }
 
 
@@ -1504,7 +1504,7 @@ void CervisiaPart::slotLastChange()
 
     int pos, lastnumber;
     bool ok;
-    if ( (pos = revA.findRev('.')) == -1
+    if ( (pos = revA.tqfindRev('.')) == -1
          || (lastnumber=revA.right(revA.length()-pos-1).toUInt(&ok), !ok) )
     {
         KMessageBox::sorry(widget(),
@@ -1635,8 +1635,8 @@ void CervisiaPart::slotConfigure()
     conf->setGroup("LookAndFeel");
     bool splitHorz = conf->readBoolEntry("SplitHorizontally",true);
     splitter->setOrientation( splitHorz ?
-                              TQSplitter::Vertical :
-                              TQSplitter::Horizontal);
+                              Qt::Vertical :
+                              Qt::Horizontal);
 }
 
 void CervisiaPart::slotHelp()
@@ -1673,7 +1673,7 @@ void CervisiaPart::showDiff(const TQString& revision)
 
     // Non-modal dialog
     DiffDialog *l = new DiffDialog(*config());
-    if (l->parseCvsDiff(cvsService, fileName, revision, TQString::null))
+    if (l->parseCvsDiff(cvsService, fileName, revision, TQString()))
         l->show();
     else
         delete l;
@@ -1692,9 +1692,9 @@ void CervisiaPart::slotJobFinished()
 
     if( m_jobType == Commit )
     {
-        KNotifyClient::event(widget()->parentWidget()->winId(), "cvs_commit_done",
+        KNotifyClient::event(widget()->tqparentWidget()->winId(), "cvs_commit_done",
                              i18n("A CVS commit to repository %1 is done")
-                             .arg(repository));
+                             .tqarg(repository));
         m_jobType = Unknown;
     }
 }
@@ -1757,14 +1757,14 @@ bool CervisiaPart::openSandbox(const TQString &dirname)
 
     KConfig *conf = config();
     conf->setGroup("General");
-    bool dostatus = conf->readBoolEntry(repository.contains(":")?
+    bool dostatus = conf->readBoolEntry(repository.tqcontains(":")?
                                         "StatusForRemoteRepos" :
                                         "StatusForLocalRepos",
                                         false);
     if (dostatus)
     {
         update->setSelected(update->firstChild(), true);
-        slotStatus();
+        slottqStatus();
     }
 
     //load the recentCommits for this app from the KConfig app
@@ -1931,7 +1931,7 @@ void CervisiaBrowserExtension::setPropertiesActionEnabled(bool enabled)
 
 void CervisiaBrowserExtension::properties()
 {
-    static_cast<CervisiaPart*>(parent())->slotFileProperties();
+    static_cast<CervisiaPart*>(tqparent())->slotFileProperties();
 }
 
 // Local Variables:
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index 08b29e19..877f5cfc 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -53,10 +53,11 @@ class CervisiaBrowserExtension;
 class CervisiaPart : public KParts::ReadOnlyPart
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CervisiaPart( TQWidget *parentWidget, const char *widgetName,
-                  TQObject *parent, const char *name=0, const TQStringList& args = TQStringList());
+    CervisiaPart( TQWidget *tqparentWidget, const char *widgetName,
+                  TQObject *tqparent, const char *name=0, const TQStringList& args = TQStringList());
     virtual ~CervisiaPart();
 
     /**
@@ -82,7 +83,7 @@ public slots:
 
     void slotOpen();
     void slotResolve();
-    void slotStatus();
+    void slottqStatus();
     void slotUpdate();
     void slotChangeLog();
     void slotCommit();
@@ -157,7 +158,7 @@ private:
     void writeSettings();
 
     bool openSandbox(const TQString &dirname);
-    void updateSandbox(const TQString &extraopt = TQString::null);
+    void updateSandbox(const TQString &extraopt = TQString());
     void addOrRemove(AddRemoveDialog::ActionType action);
     void addOrRemoveWatch(WatchDialog::ActionType action);
     void createOrDeleteTag(Cervisia::TagDialog::ActionType action);
@@ -200,6 +201,7 @@ typedef KParts::GenericFactory<CervisiaPart> CervisiaFactory;
 class CervisiaBrowserExtension : public KParts::BrowserExtension
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     CervisiaBrowserExtension( CervisiaPart * );
diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp
index eb0518e2..53e42bf1 100644
--- a/cervisia/cervisiashell.cpp
+++ b/cervisia/cervisiashell.cpp
@@ -43,7 +43,7 @@ CervisiaShell::CervisiaShell( const char *name )
     KLibFactory* factory = KLibLoader::self()->factory("libcervisiapart");
     if( factory )
     {
-        m_part = static_cast<KParts::ReadOnlyPart*>(factory->create(this,
+        m_part = static_cast<KParts::ReadOnlyPart*>(factory->create(TQT_TQOBJECT(this),
                                       "cervisiaview", "KParts::ReadOnlyPart"));
         if( m_part )
             setCentralWidget(m_part->widget());
@@ -92,19 +92,19 @@ void CervisiaShell::setupActions()
 {
     setStandardToolBarMenuEnabled( true );
 
-    KAction *action = KStdAction::configureToolbars( this, TQT_SLOT(slotConfigureToolBars()),
+    KAction *action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolBars()),
                                             actionCollection() );
     TQString hint = i18n("Allows you to configure the toolbar");
     action->setToolTip( hint );
     action->setWhatsThis( hint );
 
-    action = KStdAction::keyBindings( this, TQT_SLOT(slotConfigureKeys()),
+    action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()),
                                       actionCollection() );
     hint = i18n("Allows you to customize the keybindings");
     action->setToolTip( hint );
     action->setWhatsThis( hint );
 
-    action = KStdAction::quit( kapp, TQT_SLOT( quit() ), actionCollection() );
+    action = KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection() );
     hint = i18n("Exits Cervisia");
     action->setToolTip( hint );
     action->setWhatsThis( hint );
diff --git a/cervisia/cervisiashell.h b/cervisia/cervisiashell.h
index e96e15d9..87c33b02 100644
--- a/cervisia/cervisiashell.h
+++ b/cervisia/cervisiashell.h
@@ -34,6 +34,7 @@ class KRecentFilesAction;
 class CervisiaShell : public KParts::MainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     CervisiaShell(const char* name=0);
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index 49476610..edaa3b6f 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -33,15 +33,15 @@
 
 static inline TQString DateStringISO8601()
 {
-    return TQDate::currentDate().toString(Qt::ISODate);
+    return TQDate::tqcurrentDate().toString(Qt::ISODate);
 }
 
 
 ChangeLogDialog::Options *ChangeLogDialog::options = 0;
 
 
-ChangeLogDialog::ChangeLogDialog(KConfig& cfg, TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, true, i18n("Edit ChangeLog"),
+ChangeLogDialog::ChangeLogDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, true, i18n("Edit ChangeLog"),
                   Ok | Cancel, Ok, true)
     , partConfig(cfg)
 {
@@ -167,7 +167,7 @@ TQString ChangeLogDialog::message()
                     for (j = 0; j < (int)str.length(); ++j)
                         if (!str[j].isSpace())
                             break;
-                    str.remove(0, QMIN(j, 8));
+                    str.remove(0, TQMIN(j, 8));
                 }
             res += str;
             res += '\n';
diff --git a/cervisia/changelogdlg.h b/cervisia/changelogdlg.h
index ee7b8fc4..54e36e87 100644
--- a/cervisia/changelogdlg.h
+++ b/cervisia/changelogdlg.h
@@ -31,7 +31,7 @@ class KConfig;
 class ChangeLogDialog : public KDialogBase
 {
 public:
-    explicit ChangeLogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit ChangeLogDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
 
     virtual ~ChangeLogDialog();
 
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index 32885e8e..e2b09697 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -43,9 +43,9 @@ using Cervisia::IsValidTag;
 
 
 CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
-                               ActionType action, TQWidget* parent,
+                               ActionType action, TQWidget* tqparent,
                                const char* name)
-    : KDialogBase(parent, name, true, TQString::null,
+    : KDialogBase(tqparent, name, true, TQString(),
                   Ok | Cancel | Help, Ok, true)
     , act(action)
     , partConfig(cfg)
@@ -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);
@@ -198,7 +198,7 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
     TQStringList list2 = Repositories::readConfigFile();
     TQStringList::ConstIterator it2;
     for (it2 = list2.begin(); it2 != list2.end(); ++it2)
-        if (!list1.contains(*it2))
+        if (!list1.tqcontains(*it2))
             repo_combo->insertItem(*it2);
 
     setHelp((act == Import) ? "importing" : "checkingout");
@@ -353,9 +353,9 @@ void CheckoutDialog::moduleButtonClicked()
         if (str.left(12) == "Unknown host")
             continue;
 
-        int pos = str.find(' ');
+        int pos = str.tqfind(' ');
         if (pos == -1)
-            pos = str.find('\t');
+            pos = str.tqfind('\t');
         if (pos == -1)
             pos = str.length();
         TQString module( str.left(pos).stripWhiteSpace() );
@@ -386,7 +386,7 @@ void CheckoutDialog::branchButtonClicked()
     if( !cvsService->ok() )
         return;
 
-    ProgressDialog dlg(this, "Remote Log", cvsJob, TQString::null, 
+    ProgressDialog dlg(this, "Remote Log", cvsJob, TQString(), 
                        i18n("CVS Remote Log"));
     if( !dlg.execute() )
         return;
@@ -398,11 +398,11 @@ void CheckoutDialog::branchButtonClicked()
 
         if( line.isEmpty() || line[0] != '\t' )
             continue;
-        if( (colonPos = line.find(':', 1)) < 0 )
+        if( (colonPos = line.tqfind(':', 1)) < 0 )
            continue;
 
         const TQString tag  = line.mid(1, colonPos - 1);
-        if( !branchTagList.contains(tag) )
+        if( !branchTagList.tqcontains(tag) )
             branchTagList.push_back(tag);
     }
 
diff --git a/cervisia/checkoutdlg.h b/cervisia/checkoutdlg.h
index 633f1feb..4e6d3b73 100644
--- a/cervisia/checkoutdlg.h
+++ b/cervisia/checkoutdlg.h
@@ -35,12 +35,13 @@ class CvsService_stub;
 class CheckoutDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum ActionType { Checkout, Import };
     
     CheckoutDialog( KConfig& cfg, CvsService_stub* service, ActionType action,
-                    TQWidget *parent=0, const char *name=0 );
+                    TQWidget *tqparent=0, const char *name=0 );
 
     TQString workingDirectory() const;
     TQString repository() const;
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index 4fdaca68..5077e5d8 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -36,11 +36,11 @@
 #include "diffdlg.h"
 
 
-class CommitListItem : public QCheckListItem
+class CommitListItem : public TQCheckListItem
 {
 public:
-    CommitListItem(TQListView* parent, const TQString& text, const TQString fileName)
-        : TQCheckListItem(parent, text, TQCheckListItem::CheckBox)
+    CommitListItem(TQListView* tqparent, const TQString& text, const TQString fileName)
+        : TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox)
         , m_fileName(fileName)
     {
     }
@@ -53,18 +53,18 @@ private:
 
 
 CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
-                           TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, true, i18n("CVS Commit"),
+                           TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, true, i18n("CVS Commit"),
                   Ok | Cancel | Help | User1, Ok, true)
     , partConfig(cfg)
     , cvsService(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();
@@ -185,7 +185,7 @@ void CommitDialog::setLogHistory(const TQStringList &list)
                 continue;
 
             TQString txt = *it;
-            int index = txt.find('\n', 0);
+            int index = txt.tqfind('\n', 0);
             if ( index != -1 ) // Fetch first line
             {
                 txt = txt.mid(0, index);
diff --git a/cervisia/commitdlg.h b/cervisia/commitdlg.h
index 61350c7e..7ee5ee1b 100644
--- a/cervisia/commitdlg.h
+++ b/cervisia/commitdlg.h
@@ -37,9 +37,10 @@ class CvsService_stub;
 class CommitDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CommitDialog( KConfig& cfg, CvsService_stub* service, TQWidget *parent=0, 
+    CommitDialog( KConfig& cfg, CvsService_stub* service, TQWidget *tqparent=0, 
                   const char *name=0 );
 
     virtual ~CommitDialog();
diff --git a/cervisia/cvsdir.cpp b/cervisia/cvsdir.cpp
index 20f2994d..11473c2f 100644
--- a/cervisia/cvsdir.cpp
+++ b/cervisia/cvsdir.cpp
@@ -31,16 +31,16 @@ CvsDir::CvsDir(const TQString &path)
 {}
 
 
-const QFileInfoList *CvsDir::entryInfoList() const
+const TQFileInfoList *CvsDir::entryInfoList() const
 {
     DirIgnoreList ignorelist(absPath());
-    const QFileInfoList *fulllist = TQDir::entryInfoList();
+    const TQFileInfoList *fulllist = TQDir::entryInfoList();
     if (!fulllist)
         return 0;
     
     entrylist.clear();
 
-    QFileInfoListIterator it(*fulllist);
+    TQFileInfoListIterator it(*fulllist);
     for (; it.current(); ++it)
         {
             if (!ignorelist.matches(it.current()) && !GlobalIgnoreList().matches(it.current()))
diff --git a/cervisia/cvsdir.h b/cervisia/cvsdir.h
index 2b9cd9ce..c2ebf065 100644
--- a/cervisia/cvsdir.h
+++ b/cervisia/cvsdir.h
@@ -24,15 +24,15 @@
 #include <tqdir.h>
 
 
-class CvsDir : public QDir
+class CvsDir : public TQDir
 {
 public:
     explicit CvsDir(const TQString &path);
 
-    const QFileInfoList *entryInfoList() const;
+    const TQFileInfoList *entryInfoList() const;
 
 private:
-    mutable QFileInfoList entrylist;
+    mutable TQFileInfoList entrylist;
 };
 
 #endif
diff --git a/cervisia/cvsinitdlg.cpp b/cervisia/cvsinitdlg.cpp
index cf0b4641..f6be89d6 100644
--- a/cervisia/cvsinitdlg.cpp
+++ b/cervisia/cvsinitdlg.cpp
@@ -32,8 +32,8 @@
 using Cervisia::CvsInitDialog;
 
 
-CvsInitDialog::CvsInitDialog(TQWidget* parent, const char* name)
-    : KDialogBase(parent, name, true, i18n("Create New Repository (cvs init)"),
+CvsInitDialog::CvsInitDialog(TQWidget* tqparent, const char* name)
+    : KDialogBase(tqparent, name, true, i18n("Create New Repository (cvs init)"),
                   Ok | Cancel, Ok, true)
 {
     TQFrame* mainWidget = makeMainWidget();
diff --git a/cervisia/cvsinitdlg.h b/cervisia/cvsinitdlg.h
index 9ca35ad0..f36d8742 100644
--- a/cervisia/cvsinitdlg.h
+++ b/cervisia/cvsinitdlg.h
@@ -32,9 +32,10 @@ namespace Cervisia
 class CvsInitDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CvsInitDialog(TQWidget* parent = 0, const char* name = 0);
+    CvsInitDialog(TQWidget* tqparent = 0, const char* name = 0);
 
     TQString directory() const;
    
diff --git a/cervisia/cvsservice/DESIGN b/cervisia/cvsservice/DESIGN
index cbd414da..90ad3f18 100644
--- a/cervisia/cvsservice/DESIGN
+++ b/cervisia/cvsservice/DESIGN
@@ -16,7 +16,7 @@ The cvs DCOP service consists of the following three parts:
 
 3. CvsJob     - This class represents a cvs job. You can execute and cancel it,
                 and you can retrieve the output of the cvs client by either
-                connecting to the proper DCOP signals or by using the output()
+                connecting to the proper DCOP Q_SIGNALS or by using the output()
                 method. There are two types of jobs. First the non-concurrent
                 job which has to run alone, like cvs update or import. Second
                 the jobs which can run concurrently like cvs log or annotate.
@@ -45,7 +45,7 @@ How-to use this service in C++ applications:
     // call "cvs log" for cervisiapart.h
     DCOPRef job = cvsService.log("cervisiapart.h");
 
-    // connect to signals to get output
+    // connect to Q_SIGNALS to get output
     connectDCOPSignal(job.app(), job.obj(), "jobExited(bool, int)", [MY SLOT]);
     connectDCOPSignal(job.app(), job.obj(), "receivedStdout(QString)",
                       [MY SLOT]);
diff --git a/cervisia/cvsservice/cvsjob.h b/cervisia/cvsservice/cvsjob.h
index 88aaa9fb..f469f91c 100644
--- a/cervisia/cvsservice/cvsjob.h
+++ b/cervisia/cvsservice/cvsjob.h
@@ -32,6 +32,7 @@ class KProcess;
 class KDE_EXPORT CvsJob : public TQObject, public DCOPObject
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 
 public:
diff --git a/cervisia/cvsservice/cvsloginjob.cpp b/cervisia/cvsservice/cvsloginjob.cpp
index ad6f9176..0288df0e 100644
--- a/cervisia/cvsservice/cvsloginjob.cpp
+++ b/cervisia/cvsservice/cvsloginjob.cpp
@@ -97,15 +97,15 @@ bool CvsLoginJob::execute()
         kdDebug(8051) << "process output = " << line << endl;
 
         // retrieve repository from 'Logging in to'-line
-        if( line.contains(LOGIN_PHRASE) )
+        if( line.tqcontains(LOGIN_PHRASE) )
         {
-            repository = line.remove(0, line.find(":pserver:"));
+            repository = line.remove(0, line.tqfind(":pserver:"));
             continue;
         }
 
         // process asks for the password
         // search case insensitive as cvs and cvsnt use different capitalization
-        if( line.contains(PASS_PHRASE, false) )
+        if( line.tqcontains(PASS_PHRASE, false) )
         {
             kdDebug(8051) << "process waits for the password." << endl;
 
@@ -123,7 +123,7 @@ bool CvsLoginJob::execute()
                 m_Proc->writeLine(password);
 
                 // wait for the result
-                while( !line.contains(FAILURE_PHRASE) )
+                while( !line.tqcontains(FAILURE_PHRASE) )
                 {
                     line = m_Proc->readLine();
                     if( line.isNull() )
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index d5f06ef4..2ac4c241 100644
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@@ -144,7 +144,7 @@ bool Repository::setWorkingCopy(const TQString& dirName)
         return false;
 
     d->workingCopy = path;
-    d->location    = TQString::null;
+    d->location    = TQString();
 
     // determine path to the repository
     TQFile rootFile(path + "/CVS/Root");
@@ -157,7 +157,7 @@ bool Repository::setWorkingCopy(const TQString& dirName)
 
     // add identities (ssh-add) to ssh-agent
     // TODO CL make sure this is called only once
-    if( d->location.contains(":ext:", false) > 0 )
+    if( d->location.tqcontains(":ext:", false) > 0 )
     {
         SshAgent ssh;
         ssh.addSshIdentities();
@@ -223,11 +223,11 @@ 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
-        const int insertPos = repositoryGroup.find('/');
+        const int insertPos = repositoryGroup.tqfind('/');
         if( insertPos > 0 )
         {
             // add port to location
diff --git a/cervisia/cvsservice/repository.h b/cervisia/cvsservice/repository.h
index 6f638949..6739c0d6 100644
--- a/cervisia/cvsservice/repository.h
+++ b/cervisia/cvsservice/repository.h
@@ -35,6 +35,7 @@ class KDE_EXPORT Repository : public TQObject, public DCOPObject
 {
     K_DCOP
     Q_OBJECT
+//    TQ_OBJECT
 
 public:
     Repository();
diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp
index 4f8abd25..6c6845f6 100644
--- a/cervisia/cvsservice/sshagent.cpp
+++ b/cervisia/cvsservice/sshagent.cpp
@@ -32,12 +32,12 @@
 // initialize static member variables
 bool    SshAgent::m_isRunning  = false;
 bool    SshAgent::m_isOurAgent = false;
-TQString SshAgent::m_authSock   = TQString::null;
-TQString SshAgent::m_pid        = TQString::null;
+TQString SshAgent::m_authSock   = TQString();
+TQString SshAgent::m_pid        = TQString();
 
 
-SshAgent::SshAgent(TQObject* parent, const char* name)
-    : TQObject(parent, name)
+SshAgent::SshAgent(TQObject* tqparent, const char* name)
+    : TQObject(tqparent, name)
 {
 }
 
diff --git a/cervisia/cvsservice/sshagent.h b/cervisia/cvsservice/sshagent.h
index 3de23076..e14bc0ae 100644
--- a/cervisia/cvsservice/sshagent.h
+++ b/cervisia/cvsservice/sshagent.h
@@ -28,12 +28,13 @@
 class KProcess;
 
 
-class SshAgent : public QObject
+class SshAgent : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SshAgent(TQObject* parent = 0, const char* name = 0);
+    SshAgent(TQObject* tqparent = 0, const char* name = 0);
     ~SshAgent();
 
     bool querySshAgent();
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index fadb6582..1de5e48f 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -41,8 +41,8 @@
 #include "diffview.h"
 
 
-DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool modal)
-    : KDialogBase(parent, name, modal, TQString::null,
+DiffDialog::DiffDialog(KConfig& cfg, TQWidget *tqparent, const char *name, bool modal)
+    : KDialogBase(tqparent, name, modal, TQString(),
                   Close | Help | User1, Close, true, KStdGuiItem::saveAs())
     , partConfig(cfg)
 {
@@ -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);
@@ -85,35 +85,35 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
 	     this, TQT_SLOT(toggleSynchronize(bool)) );
 
     itemscombo = new TQComboBox(mainWidget);
-    itemscombo->insertItem(TQString::null);
+    itemscombo->insertItem(TQString());
     connect( itemscombo, TQT_SIGNAL(activated(int)),
              this, TQT_SLOT(comboActivated(int)) );
 
     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");
 
-    setWFlags(Qt::WDestructiveClose | getWFlags());
+    setWFlags(TQt::WDestructiveClose | getWFlags());
 
     TQSize size = configDialogSize(partConfig, "DiffDialog");
     resize(size);
@@ -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+":" );
@@ -236,7 +236,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName
     // front end, it is executed from here. Of course, in that
     // case this dialog wouldn't have to be created in the first
     // place, but this design at least makes the handling trans-
-    // parent for the calling routines
+    // tqparent for the calling routines
 
     TQString extdiff = partConfig.readPathEntry("ExternalDiff");
     if (!extdiff.isEmpty())
@@ -302,7 +302,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName
     if (!linesA.isEmpty() || !linesB.isEmpty())
         newDiffHunk(linenoA, linenoB, linesA, linesB);
 
-    // sets the right size as there is no more auto resize in QComboBox
+    // sets the right size as there is no more auto resize in TQComboBox
     itemscombo->adjustSize();
 
     updateNofN();
@@ -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();
 }
 
@@ -477,7 +477,7 @@ void DiffDialog::forwClicked()
 
 void DiffDialog::saveAsClicked()
 {
-    TQString fileName = KFileDialog::getSaveFileName(TQString::null, TQString::null, this);
+    TQString fileName = KFileDialog::getSaveFileName(TQString(), TQString(), this);
     if( fileName.isEmpty() )
         return;
 
diff --git a/cervisia/diffdlg.h b/cervisia/diffdlg.h
index e0af7d4a..eec4bee4 100644
--- a/cervisia/diffdlg.h
+++ b/cervisia/diffdlg.h
@@ -37,10 +37,11 @@ class CvsService_stub;
 class DiffDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    explicit DiffDialog( KConfig& config, TQWidget *parent=0, const char *name=0, 
+    explicit DiffDialog( KConfig& config, TQWidget *tqparent=0, const char *name=0, 
                          bool modal=false );
 
     virtual ~DiffDialog();
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 597ec97f..baf80152 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -54,8 +54,8 @@ const int DiffView::BORDER = 7;
 
 
 DiffView::DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
-                    TQWidget *parent, const char *name )
-    : QtTableView(parent, name, WRepaintNoErase)
+                    TQWidget *tqparent, const char *name )
+    : TQtTableView(tqparent, name, WRepaintNoErase)
     , partConfig(cfg)
 {
     setNumRows(0);
@@ -92,7 +92,7 @@ DiffView::DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
 
 void DiffView::setFont(const TQFont &font)
 {
-    QtTableView::setFont(font);
+    TQtTableView::setFont(font);
     TQFontMetrics fm(font);
     setCellHeight(fm.lineSpacing());
 }
@@ -118,14 +118,14 @@ void DiffView::setPartner(DiffView *other)
 void DiffView::vertPositionChanged(int val)
 {
     if (partner)
-        partner->setYOffset(QMIN(val,partner->maxYOffset()));
+        partner->setYOffset(TQMIN(val,partner->maxYOffset()));
 }
 
 
 void DiffView::horzPositionChanged(int val)
 {
     if (partner)
-        partner->setXOffset(QMIN(val,partner->maxXOffset()));
+        partner->setXOffset(TQMIN(val,partner->maxXOffset()));
 }
 
 
@@ -154,7 +154,7 @@ void DiffView::setCenterOffset(int offset)
     if (!rowIsVisible(offset))
     {
         int visiblerows = viewHeight()/cellHeight(0);
-        setTopCell( QMAX(0, offset - visiblerows/2) );
+        setTopCell( TQMAX(0, offset - visiblerows/2) );
     }
 }
 
@@ -173,12 +173,12 @@ void DiffView::addLine(const TQString &line, DiffType type, int no)
     // For some fonts, e.g. "Clean", is fm.maxWidth() greater than
     // fmbold.maxWidth().
     TQString copy(line);
-    const int numTabs = copy.contains('\t', false);
-    copy.replace( TQRegExp("\t"), "");
+    const int numTabs = copy.tqcontains('\t', false);
+    copy.tqreplace( TQRegExp("\t"), "");
 
-    const int tabSize   = m_tabWidth * QMAX(fm.maxWidth(), fmbold.maxWidth());
-    const int copyWidth = QMAX(fm.width(copy), fmbold.width(copy));
-    textwidth = QMAX(textwidth, copyWidth + numTabs * tabSize);
+    const int tabSize   = m_tabWidth * TQMAX(fm.maxWidth(), fmbold.maxWidth());
+    const int copyWidth = TQMAX(fm.width(copy), fmbold.width(copy));
+    textwidth = TQMAX(textwidth, copyWidth + numTabs * tabSize);
 
     DiffViewItem *item = new DiffViewItem;
     item->line = line;
@@ -211,7 +211,7 @@ int DiffView::findLine(int lineno)
     int offset;
     DiffViewItem tmp;
     tmp.no = lineno;
-    if ( (offset = items.find(&tmp)) == -1)
+    if ( (offset = items.tqfind(&tmp)) == -1)
     {
         kdDebug(8050) << "Internal Error: Line " << lineno << " not found" << endl;
         return -1;
@@ -279,7 +279,7 @@ int DiffView::cellWidth(int col)
     else if (marker && (col == 0 || col == 1))
     {
         TQFontMetrics fm( fontMetrics() );
-        return QMAX(QMAX( fm.width(i18n("Delete")),
+        return TQMAX(TQMAX( fm.width(i18n("Delete")),
                           fm.width(i18n("Insert"))),
                     fm.width(i18n("Change")))+2*BORDER;
     }
@@ -288,12 +288,12 @@ int DiffView::cellWidth(int col)
         int rest = (linenos || marker)? cellWidth(0) : 0;
         if (linenos && marker)
             rest += cellWidth(1);
-        return QMAX(textwidth, viewWidth()-rest);
+        return TQMAX(textwidth, viewWidth()-rest);
     }
 }
 
 
-TQSize DiffView::sizeHint() const
+TQSize DiffView::tqsizeHint() const
 {
     TQFontMetrics fm(font());
     return TQSize( 4*fm.width("0123456789"), fm.lineSpacing()*8 );
@@ -351,7 +351,7 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
         innerborder = BORDER;
         str = (item->type==Change)? i18n("Change")
             : (item->type==Insert)? i18n("Insert")
-            : (item->type==Delete)? i18n("Delete") : TQString::null;
+            : (item->type==Delete)? i18n("Delete") : TQString();
     }
     else
     {
@@ -388,10 +388,10 @@ void DiffView::wheelEvent(TQWheelEvent *e)
 }
 
 
-DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *parent, const char *name)
-    : TQFrame(parent, name)
+DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *tqparent, const char *name)
+    : TQFrame(tqparent, 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, style().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);
 }
@@ -440,7 +440,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *)
 
     // only y and height are important
     const TQRect scrollBarGroove(scrollBar->isVisible()
-                                ? style().querySubControlMetrics(TQStyle::CC_ScrollBar,
+                                ? tqstyle().querySubControlMetrics(TQStyle::CC_ScrollBar,
                                                                  scrollBar,
                                                                  TQStyle::SC_ScrollBarGroove)
                                 : rect());
@@ -460,7 +460,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *)
         {
             const char lineType(lineTypes[index]);
 
-            // don't use qRound() to avoid painting outside of the pixmap
+            // don't use tqRound() to avoid painting outside of the pixmap
             // (yPos1 must be lesser than scrollBarGroove.height())
             const int yPos1(static_cast<int>(index * scale));
 
@@ -488,7 +488,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *)
 
             if (color.isValid())
             {
-                const int yPos2(qRound(index * scale));
+                const int yPos2(tqRound(index * scale));
                 const int areaHeight((yPos2 != yPos1) ? yPos2 - yPos1 : 1);
 
                 p.fillRect(0, yPos1, pixbuf.width(), areaHeight, TQBrush(color));
diff --git a/cervisia/diffview.h b/cervisia/diffview.h
index 160dd2cd..7099f172 100644
--- a/cervisia/diffview.h
+++ b/cervisia/diffview.h
@@ -39,15 +39,16 @@ protected:
 };
 
 
-class DiffView : public QtTableView
+class DiffView : public TQtTableView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum DiffType { Change, Insert, Delete, Neutral, Unchanged, Separator };
 
     DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
-              TQWidget *parent=0, const char *name=0 );
+              TQWidget *tqparent=0, const char *name=0 );
 
     void setPartner(DiffView *other);
 
@@ -73,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
@@ -101,16 +102,17 @@ private:
 };
 
 
-class DiffZoomWidget : public QFrame
+class DiffZoomWidget : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DiffZoomWidget(KConfig& cfg, TQWidget *parent=0, const char *name=0);
+    DiffZoomWidget(KConfig& cfg, TQWidget *tqparent=0, const char *name=0);
     ~DiffZoomWidget();
 
     void setDiffView(DiffView *view);
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 protected:
     void paintEvent(TQPaintEvent *);
diff --git a/cervisia/editwithmenu.cpp b/cervisia/editwithmenu.cpp
index d7d1044a..b91283e8 100644
--- a/cervisia/editwithmenu.cpp
+++ b/cervisia/editwithmenu.cpp
@@ -27,8 +27,8 @@ using namespace Cervisia;
 #include <kurl.h>
 
 
-EditWithMenu::EditWithMenu(const KURL& url, TQWidget* parent)
-    : TQObject(parent)
+EditWithMenu::EditWithMenu(const KURL& url, TQWidget* tqparent)
+    : TQObject(tqparent)
     , m_menu(0)
     , m_url(url)
 {
diff --git a/cervisia/editwithmenu.h b/cervisia/editwithmenu.h
index b551ce89..88872621 100644
--- a/cervisia/editwithmenu.h
+++ b/cervisia/editwithmenu.h
@@ -30,12 +30,13 @@ namespace Cervisia
 {
 
 
-class EditWithMenu : public QObject
+class EditWithMenu : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    EditWithMenu(const KURL& url, TQWidget* parent);
+    EditWithMenu(const KURL& url, TQWidget* tqparent);
     TQPopupMenu* menu();
 
 private slots:
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 4eb9cca5..cb519b0b 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -40,7 +40,7 @@ static TQDateTime parseDate(const TQString& date, const TQString& _time, const T
 {
     // cvs history only prints hh:mm but parseDateISO8601 needs hh:mm:ss
     TQString time(_time);
-    if( time.contains(':') == 1 )
+    if( time.tqcontains(':') == 1 )
         time += ":00";
 
     TQDateTime dateTime;
@@ -50,14 +50,14 @@ static TQDateTime parseDate(const TQString& date, const TQString& _time, const T
 }
 
 
-class HistoryItem : public QListViewItem
+class HistoryItem : public TQListViewItem
 {
 public:
 
     enum { Date, Event, Author, Revision, File, Path };
 
-    HistoryItem(TQListView *parent, const TQDateTime& date)
-        : TQListViewItem(parent), m_date(date)
+    HistoryItem(TQListView *tqparent, const TQDateTime& date)
+        : TQListViewItem(tqparent), m_date(date)
     {}
 
     virtual int compare(TQListViewItem* i, int col, bool) const;
@@ -138,14 +138,14 @@ bool HistoryItem::isOther()
 }
 
 
-HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, false, TQString::null,
+HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, false, TQString(),
                   Close | Help, ButtonCode(0), true)
     , partConfig(cfg)
 {
     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);
@@ -237,7 +237,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
 
     setHelp("browsinghistory");
 
-    setWFlags(Qt::WDestructiveClose | getWFlags());
+    setWFlags(TQt::WDestructiveClose | getWFlags());
 
     TQSize size = configDialogSize(partConfig, "HistoryDialog");
     resize(size);
@@ -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/historydlg.h b/cervisia/historydlg.h
index 307250c6..7c0e4feb 100644
--- a/cervisia/historydlg.h
+++ b/cervisia/historydlg.h
@@ -35,9 +35,10 @@ class CvsService_stub;
 class HistoryDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    explicit HistoryDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit HistoryDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
     virtual ~HistoryDialog();
 
     bool parseHistory(CvsService_stub* cvsService);
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index 28b3078e..9b5df78f 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -57,12 +57,12 @@
 #include "patchoptiondlg.h"
 
 
-LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, false, TQString::null,
+LogDialog::LogDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, false, TQString(),
                   Ok | Apply | Close | Help | User1 | User2 | User3, Close, true,
                   KGuiItem(i18n("&Annotate")),
                   KGuiItem(i18n("&Diff"), "vcs_diff"),
-                  KGuiItem(i18n("&Find..."), "find"))
+                  KGuiItem(i18n("&Find..."), "tqfind"))
     , cvsService(0)
     , partConfig(cfg)
 {
@@ -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);
@@ -137,7 +137,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
 
         revbox[i] = new TQLabel(mainWidget);
         revbox[i]->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
-        grid->addWidget(revbox[i], 0, 1, Qt::AlignVCenter);
+        grid->addWidget(revbox[i], 0, 1, TQt::AlignVCenter);
 
         TQLabel *selectlabel = new TQLabel(i18n("Select by tag:"), mainWidget);
         grid->addWidget(selectlabel, 0, 2);
@@ -166,7 +166,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
 
         commentbox[i] = new TQTextEdit(mainWidget);
         commentbox[i]->setReadOnly(true);
-        commentbox[i]->setTextFormat(Qt::PlainText);
+        commentbox[i]->setTextFormat(TQt::PlainText);
         fm = commentbox[i]->fontMetrics();
         commentbox[i]->setMinimumHeight(2*fm.lineSpacing()+10);
         grid->addMultiCellWidget(commentbox[i], 2, 2, 1, 3);
@@ -199,7 +199,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
     setButtonGuiItem(Apply, KGuiItem(i18n("Create Patch...")));
     setHelp("browsinglogs");
 
-    setWFlags(Qt::WDestructiveClose | getWFlags());
+    setWFlags(TQt::WDestructiveClose | getWFlags());
 
     TQSize size = configDialogSize(partConfig, "LogDialog");
     resize(size);
@@ -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() )
@@ -262,8 +262,8 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName)
                     const TQString tag(strlist[0].simplifyWhiteSpace());
                     TQString branchpoint;
                     int pos1, pos2;
-                    if( (pos2 = rev.findRev('.')) > 0 &&
-                        (pos1 = rev.findRev('.', pos2-1)) > 0 &&
+                    if( (pos2 = rev.tqfindRev('.')) > 0 &&
+                        (pos1 = rev.tqfindRev('.', pos2-1)) > 0 &&
                         rev.mid(pos1+1, pos2-pos1-1) == "0" )
                     {
                         // For a branch tag 2.10.0.6, we want:
@@ -303,7 +303,7 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName)
                     // convert date into ISO format (YYYY-MM-DDTHH:MM:SS)
                     int len = strList[0].length();
                     TQString dateTimeStr = strList[0].right(len-6); // remove 'date: '
-                    dateTimeStr.replace('/', '-');
+                    dateTimeStr.tqreplace('/', '-');
 
                     TQString date = dateTimeStr.section(' ', 0, 0);
                     TQString time = dateTimeStr.section(' ', 1, 1);
@@ -338,8 +338,8 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName)
                     TQString branchrev;
                     int pos1, pos2;
                     // 1.60.x.y => revision belongs to branch 1.60.0.x
-                    if( (pos2 = rev.findRev('.')) > 0 &&
-                        (pos1 = rev.findRev('.', pos2-1)) > 0 )
+                    if( (pos2 = rev.tqfindRev('.')) > 0 &&
+                        (pos1 = rev.tqfindRev('.', pos2-1)) > 0 )
                         branchrev = rev.left(pos2);
 
                     // Build Cervisia::TagInfo for logInfo
@@ -380,8 +380,8 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName)
         }
     }
 
-    tagcombo[0]->insertItem(TQString::null);
-    tagcombo[1]->insertItem(TQString::null);
+    tagcombo[0]->insertItem(TQString());
+    tagcombo[1]->insertItem(TQString());
     TQPtrListIterator<LogDialogTagInfo> it(tags);
     for( ; it.current(); ++it )
     {
diff --git a/cervisia/logdlg.h b/cervisia/logdlg.h
index 50ecf7c7..2214b227 100644
--- a/cervisia/logdlg.h
+++ b/cervisia/logdlg.h
@@ -52,9 +52,10 @@ public:
 class LogDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    explicit LogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit LogDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
 
     virtual ~LogDialog();
 
diff --git a/cervisia/loginfo.cpp b/cervisia/loginfo.cpp
index b97ff1f0..8e6464d0 100644
--- a/cervisia/loginfo.cpp
+++ b/cervisia/loginfo.cpp
@@ -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/loginfo.h b/cervisia/loginfo.h
index 92c67312..e75df840 100644
--- a/cervisia/loginfo.h
+++ b/cervisia/loginfo.h
@@ -58,7 +58,7 @@ struct TagInfo
         Tag      = 1 << 2
     };
 
-    explicit TagInfo(const TQString& name = TQString::null, Type type = Tag);
+    explicit TagInfo(const TQString& name = TQString(), Type type = Tag);
 
     /**
      * @param prefixWithType prefix the string with the type of the tag
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index 833a2429..5b7bec74 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(", ")));
 }
 
 
@@ -78,7 +78,7 @@ TQString LogListViewItem::truncateLine(const TQString &s)
     int pos;
 
     TQString res = s.simplifyWhiteSpace();
-    if ( (pos = res.find('\n')) != -1 )
+    if ( (pos = res.tqfind('\n')) != -1 )
         res = res.left(pos) + "...";
 
     return res;
@@ -106,8 +106,8 @@ int LogListViewItem::compare(TQListViewItem* i, int col, bool ascending) const
 }
 
 
-LogListView::LogListView(KConfig& cfg, TQWidget *parent, const char *name)
-    : KListView(parent, name)
+LogListView::LogListView(KConfig& cfg, TQWidget *tqparent, const char *name)
+    : KListView(tqparent, name)
     , partConfig(cfg)
 {
     setAllColumnsShowFocus(true);
@@ -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"));
 }
 
 
@@ -169,7 +169,7 @@ void LogListView::contentsMousePressEvent(TQMouseEvent *e)
     // Retrieve revision
     const TQString revision = selItem->text(LogListViewItem::Revision);   
     
-    if ( e->button() == LeftButton )
+    if ( e->button() == Qt::LeftButton )
     {
         // If the control key was pressed, then we change revision B not A
         if( e->state() & ControlButton )
@@ -177,7 +177,7 @@ void LogListView::contentsMousePressEvent(TQMouseEvent *e)
         else
             emit revisionClicked(revision, false);
     }
-    else if ( e->button() == MidButton )
+    else if ( e->button() == Qt::MidButton )
         emit revisionClicked(revision, true);
 }
 
@@ -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/loglist.h b/cervisia/loglist.h
index 3c608ea8..1ec26bbc 100644
--- a/cervisia/loglist.h
+++ b/cervisia/loglist.h
@@ -39,9 +39,10 @@ struct LogInfo;
 class LogListView : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    explicit LogListView( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit LogListView( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
     virtual ~LogListView();
     
     void addRevision(const Cervisia::LogInfo& logInfo);
diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp
index f861c873..e97a5d68 100644
--- a/cervisia/logmessageedit.cpp
+++ b/cervisia/logmessageedit.cpp
@@ -26,8 +26,8 @@ using Cervisia::LogMessageEdit;
 #include <kaccel.h>
 
 
-LogMessageEdit::LogMessageEdit(TQWidget* parent)
-    : KTextEdit(parent)
+LogMessageEdit::LogMessageEdit(TQWidget* tqparent)
+    : KTextEdit(tqparent)
     , KCompletionBase()
     , m_completing(false)
     , m_completionStartPos(0)
@@ -69,14 +69,14 @@ void LogMessageEdit::setCompletedItems(const TQStringList&)
 
 void LogMessageEdit::keyPressEvent(TQKeyEvent* event)
 {
-    bool noModifier = (event->state() == NoButton ||
+    bool noModifier = (event->state() == Qt::NoButton ||
                        event->state() == ShiftButton ||
                        event->state() == Keypad);
 
     if( noModifier )
     {
         TQString keycode = event->text();
-        if( !keycode.isEmpty() && keycode.unicode()->isPrint() )
+        if( !keycode.isEmpty() && keycode.tqunicode()->isPrint() )
         {
             KTextEdit::keyPressEvent(event);
             tryCompletion();
@@ -132,8 +132,8 @@ void LogMessageEdit::keyPressEvent(TQKeyEvent* event)
     }
 
     // any other key (except modifiers) will end the text completion
-    if( event->key() != Qt::Key_Shift && event->key() != Qt::Key_Control &&
-        event->key() != Qt::Key_Alt   && event->key() != Qt::Key_Meta )
+    if( event->key() != TQt::Key_Shift && event->key() != TQt::Key_Control &&
+        event->key() != TQt::Key_Alt   && event->key() != TQt::Key_Meta )
     {
         m_completing = false;
         setCheckSpellingEnabled(true);
@@ -159,7 +159,7 @@ void LogMessageEdit::tryCompletion()
     if( paragraphText.at(index).isSpace() )
     {
         if( !m_completing )
-            m_completionStartPos = paragraphText.findRev(' ', index-1) + 1;
+            m_completionStartPos = paragraphText.tqfindRev(' ', index-1) + 1;
 
         int length = index - m_completionStartPos;
         TQString word = paragraphText.mid(m_completionStartPos, length);
diff --git a/cervisia/logmessageedit.h b/cervisia/logmessageedit.h
index c27865b6..4d5321ed 100644
--- a/cervisia/logmessageedit.h
+++ b/cervisia/logmessageedit.h
@@ -33,9 +33,10 @@ namespace Cervisia
 class LogMessageEdit : public KTextEdit, public KCompletionBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    explicit LogMessageEdit(TQWidget* parent);
+    explicit LogMessageEdit(TQWidget* tqparent);
 
     virtual void setCompletedText(const TQString& match);
     virtual void setCompletedItems(const TQStringList& items);
diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp
index 413180af..2f965baf 100644
--- a/cervisia/logplainview.cpp
+++ b/cervisia/logplainview.cpp
@@ -31,9 +31,9 @@
 using namespace Cervisia;
 
 
-LogPlainView::LogPlainView(TQWidget* parent, const char* name)
-    : KTextBrowser(parent, name)
-    , m_find(0)
+LogPlainView::LogPlainView(TQWidget* tqparent, const char* name)
+    : KTextBrowser(tqparent, name)
+    , m_tqfind(0)
     , m_findPos(0)
 {
     setNotifyClick(false);
@@ -42,7 +42,7 @@ LogPlainView::LogPlainView(TQWidget* parent, const char* name)
 
 LogPlainView::~LogPlainView()
 {
-    delete m_find; m_find = 0;
+    delete m_tqfind; m_tqfind = 0;
 }
 
 
@@ -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);
@@ -107,11 +107,11 @@ void LogPlainView::addRevision(const LogInfo& logInfo)
 
 void LogPlainView::searchText(int options, const TQString& pattern)
 {
-    m_find = new KFind(pattern, options, this);
+    m_tqfind = new KFind(pattern, options, this);
 
-    connect(m_find, TQT_SIGNAL(highlight(const TQString&, int, int)),
+    connect(m_tqfind, TQT_SIGNAL(highlight(const TQString&, int, int)),
             this, TQT_SLOT(searchHighlight(const TQString&, int, int)));
-    connect(m_find, TQT_SIGNAL(findNext()),
+    connect(m_tqfind, TQT_SIGNAL(findNext()),
            this, TQT_SLOT(findNext()));
 
     m_findPos = 0;
@@ -140,24 +140,24 @@ void LogPlainView::findNext()
 
     while( res == KFind::NoMatch && m_findPos < paragraphs() && m_findPos >= 0 )
     {
-        if( m_find->needData() )
+        if( m_tqfind->needData() )
         {
             TQString richText = text(m_findPos);
 
-            // replace <br/> with '\n'
-            richText.replace(breakLineTag, "\n");
+            // tqreplace <br/> with '\n'
+            richText.tqreplace(breakLineTag, "\n");
 
             // remove html tags from text
-            richText.replace(htmlTags, "");
+            richText.tqreplace(htmlTags, "");
 
-            m_find->setData(richText);
+            m_tqfind->setData(richText);
         }
 
-        res = m_find->find();
+        res = m_tqfind->find();
 
         if( res == KFind::NoMatch )
         {
-            if( m_find->options() & KFindDialog::FindBackwards )
+            if( m_tqfind->options() & KFindDialog::FindBackwards )
                 --m_findPos;
             else
                 ++m_findPos;
@@ -167,15 +167,15 @@ void LogPlainView::findNext()
     // reached the end?
     if( res == KFind::NoMatch )
     {
-        if( m_find->shouldRestart() )
+        if( m_tqfind->shouldRestart() )
         {
             m_findPos = 0;
             findNext();
         }
         else
         {
-            delete m_find;
-            m_find = 0;
+            delete m_tqfind;
+            m_tqfind = 0;
         }
     }
 }
diff --git a/cervisia/logplainview.h b/cervisia/logplainview.h
index 37e60f7b..90e60c69 100644
--- a/cervisia/logplainview.h
+++ b/cervisia/logplainview.h
@@ -34,9 +34,10 @@ struct LogInfo;
 class LogPlainView : public KTextBrowser
 {   
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    explicit LogPlainView(TQWidget* parent = 0, const char* name = 0);
+    explicit LogPlainView(TQWidget* tqparent = 0, const char* name = 0);
     ~LogPlainView();
 
     void addRevision(const Cervisia::LogInfo& logInfo);
@@ -55,7 +56,7 @@ protected:
     virtual void setSource(const TQString& name);
     
 private:
-    KFind* m_find;
+    KFind* m_tqfind;
     int    m_findPos;
 };
 
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index d0e8e6d2..9ae65930 100644
--- a/cervisia/logtree.cpp
+++ b/cervisia/logtree.cpp
@@ -59,8 +59,8 @@ public:
 };
 
 
-LogTreeView::LogTreeView(TQWidget *parent, const char *name)
-    : TQTable(parent, name)
+LogTreeView::LogTreeView(TQWidget *tqparent, const char *name)
+    : TQTable(tqparent, name)
 {
     if (!static_initialized)
     {
@@ -82,7 +82,7 @@ LogTreeView::LogTreeView(TQWidget *parent, const char *name)
     setLeftMargin(0);
     setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken );
     setBackgroundMode(PaletteBase);
-    setFocusPolicy(NoFocus);
+    setFocusPolicy(TQ_NoFocus);
 
     currentRow = -1;
     currentCol = -1;
@@ -105,8 +105,8 @@ void LogTreeView::addRevision(const Cervisia::LogInfo& logInfo)
 
     // find branch
     int pos1, pos2;
-    if ((pos2 = rev.findRev('.')) > 0 &&
-        (pos1 = rev.findRev('.', pos2-1)) > 0)
+    if ((pos2 = rev.tqfindRev('.')) > 0 &&
+        (pos1 = rev.tqfindRev('.', pos2-1)) > 0)
     {
         // e. g. for rev = 1.1.2.3 we have
         // branchrev = 1.1.2, branchpoint = 1.1
@@ -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);
 }
@@ -433,8 +433,8 @@ void LogTreeView::paintRevisionCell(TQPainter *p,
 
 void LogTreeView::contentsMousePressEvent(TQMouseEvent *e)
 {
-    if ( e->button() == MidButton ||
-         e->button() == LeftButton)
+    if ( e->button() == Qt::MidButton ||
+         e->button() == Qt::LeftButton)
     {
         int row = rowAt( e->pos().y() );
         int col = columnAt( e->pos().x() );
@@ -446,8 +446,8 @@ void LogTreeView::contentsMousePressEvent(TQMouseEvent *e)
             {
                 // Change selection for revision B if the middle mouse button or
                 // the left mouse button with the control key was pressed
-                bool changeRevB = (e->button() == MidButton) ||
-                                  (e->button() == LeftButton &&
+                bool changeRevB = (e->button() == Qt::MidButton) ||
+                                  (e->button() == Qt::LeftButton &&
                                    e->state() & ControlButton);
 
                 emit revisionClicked(it.current()->m_logInfo.m_revision, changeRevB);
diff --git a/cervisia/logtree.h b/cervisia/logtree.h
index 360a1a99..0180491d 100644
--- a/cervisia/logtree.h
+++ b/cervisia/logtree.h
@@ -41,12 +41,13 @@ typedef TQPtrList<LogTreeItem> LogTreeItemList;
 typedef TQPtrList<LogTreeConnection> LogTreeConnectionList;
 
 
-class LogTreeView : public QTable
+class LogTreeView : public TQTable
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    explicit LogTreeView( TQWidget *parent=0, const char *name=0 );
+    explicit LogTreeView( TQWidget *tqparent=0, const char *name=0 );
 
     void addRevision(const Cervisia::LogInfo& logInfo);
     void setSelectedPair(TQString selectionA, TQString selectionB);
@@ -55,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 e2b770c6..d0f015ed 100644
--- a/cervisia/mergedlg.cpp
+++ b/cervisia/mergedlg.cpp
@@ -34,21 +34,21 @@
 
 
 MergeDialog::MergeDialog(CvsService_stub* service,
-                         TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, true, i18n("CVS Merge"),
+                         TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, true, i18n("CVS Merge"),
                   Ok | Cancel, Ok, true),
       cvsService(service)
 {
     int const iComboBoxMinWidth(30 * fontMetrics().width('0'));
-    int const iWidgetIndent(style().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/mergedlg.h b/cervisia/mergedlg.h
index 47869b40..58327b74 100644
--- a/cervisia/mergedlg.h
+++ b/cervisia/mergedlg.h
@@ -34,10 +34,11 @@ class CvsService_stub;
 class MergeDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     MergeDialog( CvsService_stub* service,
-                 TQWidget *parent=0, const char *name=0 );
+                 TQWidget *tqparent=0, const char *name=0 );
 
     bool byBranch() const;
     TQString branch() const;
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index fe5e5682..a0eb35be 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;
@@ -74,7 +74,7 @@ static int FindWhiteSpace(const TQString& str, int index)
 
 static const TQStringList FetchBranchesAndTags(const TQString& searchedType,
                                               CvsService_stub* cvsService,
-                                              TQWidget* parent)
+                                              TQWidget* tqparent)
 {
     TQStringList branchOrTagList;
 
@@ -82,7 +82,7 @@ static const TQStringList FetchBranchesAndTags(const TQString& searchedType,
     if( !cvsService->ok() )
         return branchOrTagList;
 
-    ProgressDialog dlg(parent, "Status", job, TQString::null, i18n("CVS Status"));
+    ProgressDialog dlg(tqparent, "tqStatus", job, TQString(), i18n("CVS tqStatus"));
 
     if( dlg.execute() )
     {
@@ -95,14 +95,14 @@ static const TQStringList FetchBranchesAndTags(const TQString& searchedType,
                 continue;
             if( (wsPos = FindWhiteSpace(line, 2)) < 0 )
                 continue;
-            if( (bracketPos = line.find('(', wsPos + 1)) < 0 )
+            if( (bracketPos = line.tqfind('(', wsPos + 1)) < 0 )
                 continue;
-            if( (colonPos = line.find(':', bracketPos + 1)) < 0 )
+            if( (colonPos = line.tqfind(':', bracketPos + 1)) < 0 )
                 continue;
 
             const TQString tag  = line.mid(1, wsPos - 1);
             const TQString type = line.mid(bracketPos + 1, colonPos - bracketPos - 1);
-            if( type == searchedType && !branchOrTagList.contains(tag) )
+            if( type == searchedType && !branchOrTagList.tqcontains(tag) )
                 branchOrTagList.push_back(tag);
         }
 
@@ -122,7 +122,7 @@ bool Cervisia::IsValidTag(const TQString& tag)
 
     for( uint i = 1; i < tag.length(); ++i )
     {
-        if( !isgraph(tag[i].latin1()) || prohibitedChars.contains(tag[i]) )
+        if( !isgraph(tag[i].latin1()) || prohibitedChars.tqcontains(tag[i]) )
                 return false;
     }
 
@@ -142,7 +142,7 @@ TQString Cervisia::UserName()
         // 2. Try to retrieve the information from the system
         struct passwd* pw = getpwuid(getuid());
         if( !pw )
-            return TQString::null;
+            return TQString();
 
         char hostname[512];
         hostname[0] = '\0';
@@ -205,7 +205,7 @@ TQString Cervisia::NormalizeRepository(const TQString& repository)
 }
 
 
-bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* parent)
+bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* tqparent)
 {
     bool result = true;
 
@@ -214,8 +214,8 @@ bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* parent)
     // does the file already exist?
     if( fi.exists() )
     {
-        result = (KMessageBox::warningContinueCancel(parent,
-                  i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(fileName),
+        result = (KMessageBox::warningContinueCancel(tqparent,
+                  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);
     }
@@ -248,7 +248,7 @@ TQStringList splitLine(TQString line, char delim)
     TQStringList list;
 
     line = line.simplifyWhiteSpace();
-    while ((pos = line.find(delim)) != -1)
+    while ((pos = line.tqfind(delim)) != -1)
     {
         list.append(line.left(pos));
         line = line.mid(pos+1, line.length()-pos-1);
@@ -259,17 +259,17 @@ TQStringList splitLine(TQString line, char delim)
 }
 
 
-const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent)
+const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* tqparent)
 {
-    return FetchBranchesAndTags(TQString::fromLatin1("branch"), cvsService,
-                                parent);
+    return FetchBranchesAndTags(TQString::tqfromLatin1("branch"), cvsService,
+                                tqparent);
 }
 
 
-const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent)
+const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* tqparent)
 {
-    return FetchBranchesAndTags(TQString::fromLatin1("revision"), cvsService,
-                                parent);
+    return FetchBranchesAndTags(TQString::tqfromLatin1("revision"), cvsService,
+                                tqparent);
 }
 
 
@@ -292,7 +292,7 @@ TQString tempFileName(const TQString& suffix)
     if (!tempFiles)
         tempFiles = new TQStringList;
 
-    KTempFile f(TQString::null, suffix);
+    KTempFile f(TQString(), suffix);
     tempFiles->append(f.name());
     return f.name();
 }
@@ -309,12 +309,12 @@ int compareRevisions(const TQString& rev1, const TQString& rev2)
     int startPos2(0);
     while (startPos1 < length1 && startPos2 < length2)
     {
-        int pos1(rev1.find('.', startPos1));
+        int pos1(rev1.tqfind('.', startPos1));
         if (pos1 < 0)
             pos1 = length1;
         const int partLength1(pos1 - startPos1);
 
-        int pos2(rev2.find('.', startPos2));
+        int pos2(rev2.tqfind('.', startPos2));
         if (pos2 < 0)
             pos2 = length2;
         const int partLength2(pos2 - startPos2);
diff --git a/cervisia/misc.h b/cervisia/misc.h
index 803c8131..c3715cee 100644
--- a/cervisia/misc.h
+++ b/cervisia/misc.h
@@ -50,7 +50,7 @@ TQString UserName();
  */
 TQString NormalizeRepository(const TQString& repository);
 
-bool CheckOverwrite(const TQString& fileName, TQWidget* parent=0);
+bool CheckOverwrite(const TQString& fileName, TQWidget* tqparent=0);
 
 }
 
@@ -61,8 +61,8 @@ TQStringList splitLine(TQString, char delim=' ');
 TQString tempFileName(const TQString& suffix);
 void cleanupTempFiles();
 
-const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent);
-const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent);
+const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* tqparent);
+const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* tqparent);
 
 /**
  * Compares two revision numbers.
diff --git a/cervisia/patchoptiondlg.cpp b/cervisia/patchoptiondlg.cpp
index b764c57c..a65aea6c 100644
--- a/cervisia/patchoptiondlg.cpp
+++ b/cervisia/patchoptiondlg.cpp
@@ -28,8 +28,8 @@ using Cervisia::PatchOptionDialog;
 #include <klocale.h>
 
 
-PatchOptionDialog::PatchOptionDialog(TQWidget* parent, const char* name)
-    : KDialogBase(parent, name, true/*modal*/, TQString::null,
+PatchOptionDialog::PatchOptionDialog(TQWidget* tqparent, const char* name)
+    : KDialogBase(tqparent, name, true/*modal*/, TQString(),
                   Ok | Cancel | Help, Ok, true/*separator*/)
 {
     TQFrame* mainWidget = makeMainWidget();
diff --git a/cervisia/patchoptiondlg.h b/cervisia/patchoptiondlg.h
index a518b910..20afb4b7 100644
--- a/cervisia/patchoptiondlg.h
+++ b/cervisia/patchoptiondlg.h
@@ -34,9 +34,10 @@ namespace Cervisia
 class PatchOptionDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    explicit PatchOptionDialog(TQWidget* parent = 0, const char* name = 0);
+    explicit PatchOptionDialog(TQWidget* tqparent = 0, const char* name = 0);
     virtual ~PatchOptionDialog();
     
     TQString diffOptions() const;
diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp
index a7e34018..d77c25f2 100644
--- a/cervisia/progressdlg.cpp
+++ b/cervisia/progressdlg.cpp
@@ -52,10 +52,10 @@ struct ProgressDialog::Private
 };
 
 
-ProgressDialog::ProgressDialog(TQWidget* parent, const TQString& heading,
+ProgressDialog::ProgressDialog(TQWidget* tqparent, const TQString& heading,
                                const DCOPRef& job, const TQString& errorIndicator,
                                const TQString& caption)
-    : KDialogBase(parent, 0, true, caption, Cancel, Cancel, true)
+    : KDialogBase(tqparent, 0, true, caption, Cancel, Cancel, true)
     , DCOPObject()
     , d(new Private)
 {
@@ -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());
 }
 
 
@@ -252,7 +252,7 @@ void ProgressDialog::startGuiPart()
 void ProgressDialog::processOutput()
 {
     int pos;
-    while( (pos = d->buffer.find('\n')) != -1 )
+    while( (pos = d->buffer.tqfind('\n')) != -1 )
     {
         TQString item = d->buffer.left(pos);
         if( item.startsWith(d->errorId1) ||
diff --git a/cervisia/progressdlg.h b/cervisia/progressdlg.h
index feb7f8d9..6eb71d88 100644
--- a/cervisia/progressdlg.h
+++ b/cervisia/progressdlg.h
@@ -32,9 +32,10 @@ class ProgressDialog : public KDialogBase, public DCOPObject
 {
     K_DCOP
     Q_OBJECT
+//    TQ_OBJECT
 
 public:
-    ProgressDialog(TQWidget* parent, const TQString& heading, const DCOPRef& job,
+    ProgressDialog(TQWidget* tqparent, const TQString& heading, const DCOPRef& job,
                    const TQString& errorIndicator, const TQString& caption = "");
     ~ProgressDialog();
 
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index 2de8405f..b4456331 100644
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@@ -32,15 +32,15 @@
 #include "cvsjob_stub.h"
 
 
-ProtocolView::ProtocolView(const TQCString& appId, TQWidget *parent, const char *name)
-    : TQTextEdit(parent, name)
+ProtocolView::ProtocolView(const TQCString& appId, TQWidget *tqparent, const char *name)
+    : TQTextEdit(tqparent, name)
     , job(0)
     , m_isUpdateJob(false)
 {
     setReadOnly(true);
     setUndoRedoEnabled(false);
     setTabChangesFocus(true);
-    setTextFormat(Qt::LogText);
+    setTextFormat(TQt::LogText);
 
     KConfig *config = CervisiaPart::config();
     config->setGroup("LookAndFeel");
@@ -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");
     }
@@ -142,7 +142,7 @@ void ProtocolView::slotJobExited(bool normalExit, int exitStatus)
 void ProtocolView::processOutput()
 {
     int pos;
-    while ( (pos = buf.find('\n')) != -1)
+    while ( (pos = buf.tqfind('\n')) != -1)
 	{
 	    TQString line = buf.left(pos);
 	    if (!line.isEmpty())
@@ -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 b2e69669..aaf1e797 100644
--- a/cervisia/protocolview.h
+++ b/cervisia/protocolview.h
@@ -34,9 +34,10 @@ class ProtocolView : public TQTextEdit, public DCOPObject
 {
     K_DCOP
     Q_OBJECT
+//    TQ_OBJECT
 
 public:
-    explicit ProtocolView(const TQCString& appId, TQWidget *parent=0, const char *name=0);
+    explicit ProtocolView(const TQCString& appId, TQWidget *tqparent=0, const char *name=0);
     ~ProtocolView();
 
     bool startJob(bool isUpdateJob = false);
diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp
index d62557a9..b569b403 100644
--- a/cervisia/qttableview.cpp
+++ b/cervisia/qttableview.cpp
@@ -1,13 +1,13 @@
 /**********************************************************************
 ** $Id$
 **
-** Implementation of QtTableView class
+** Implementation of TQtTableView class
 **
 ** Created : 941115
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
-** This file contains a class moved out of the Qt GUI Toolkit API. It
+** This file contains a class moved out of the TQt GUI Toolkit API. It
 ** may be used, distributed and modified without limitation.
 **
 **********************************************************************/
@@ -33,31 +33,31 @@ enum ScrollBarDirtyFlags {
 };
 
 
-#define HSBEXT horizontalScrollBar()->sizeHint().height()
-#define VSBEXT verticalScrollBar()->sizeHint().width()
+#define HSBEXT horizontalScrollBar()->tqsizeHint().height()
+#define VSBEXT verticalScrollBar()->tqsizeHint().width()
 
 
-class QCornerSquare : public QWidget		// internal class
+class TQCornerSquare : public TQWidget		// internal class
 {
 public:
-    QCornerSquare( TQWidget *, const char* = 0 );
+    TQCornerSquare( TQWidget *, const char* = 0 );
     void paintEvent( TQPaintEvent * );
 };
 
-QCornerSquare::QCornerSquare( TQWidget *parent, const char *name )
-	: TQWidget( parent, name )
+TQCornerSquare::TQCornerSquare( TQWidget *tqparent, const char *name )
+	: TQWidget( tqparent, name )
 {
 }
 
-void QCornerSquare::paintEvent( TQPaintEvent * )
+void TQCornerSquare::paintEvent( TQPaintEvent * )
 {
 }
 
 
 // NOT REVISED
 /*!
-  \class QtTableView qttableview.h
-  \brief The QtTableView class provides an abstract base for tables.
+  \class TQtTableView qttableview.h
+  \brief The TQtTableView class provides an abstract base for tables.
 
   \obsolete
 
@@ -71,7 +71,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
   call to setTableFlags(), some table content manipulation and an
   implementation of paintCell().  Subclasses that need cells with
   variable width or height must reimplement cellHeight() and/or
-  cellWidth(). Use updateTableSize() to tell QtTableView when the
+  cellWidth(). Use updateTableSize() to tell TQtTableView when the
   width or height has changed.
 
   When you read this documentation, it is important to understand the
@@ -87,7 +87,7 @@ void QCornerSquare::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
@@ -114,17 +114,17 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
   more bugs than expected and our analysis indicates that the widget's
   very flexibility is the problem.  If TQScrollView or TQListBox can
   easily be made to do the job you need, we recommend subclassing
-  those widgets rather than QtTableView. In addition, TQScrollView makes
-  it easy to have child widgets inside tables, which QtTableView
+  those widgets rather than TQtTableView. In addition, TQScrollView makes
+  it easy to have child widgets inside tables, which TQtTableView
   doesn't support at all.
 
-  \sa QScrollView
+  \sa TQScrollView
   \link guibooks.html#fowler GUI Design Handbook: Table\endlink
 */
 
 
 /*!
-  Constructs a table view.  The \a parent, \a name and \f arguments
+  Constructs a table view.  The \a tqparent, \a name and \f arguments
   are passed to the TQFrame constructor.
 
   The \link setTableFlags() table flags\endlink are all cleared (set to 0).
@@ -134,7 +134,7 @@ void QCornerSquare::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
@@ -143,8 +143,8 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
 
 */
 
-QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f )
-    : TQFrame( parent, name, f )
+TQtTableView::TQtTableView( TQWidget *tqparent, const char *name, WFlags f )
+    : TQFrame( tqparent, name, f )
 {
     nRows		 = nCols      = 0;	// zero rows/cols
     xCellOffs		 = yCellOffs  = 0;	// zero offset
@@ -168,7 +168,7 @@ QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f )
   Destroys the table view.
 */
 
-QtTableView::~QtTableView()
+TQtTableView::~TQtTableView()
 {
     delete vScrollBar;
     delete hScrollBar;
@@ -182,7 +182,7 @@ QtTableView::~QtTableView()
   \sa setPalette()
 */
 
-void QtTableView::setBackgroundColor( const TQColor &c )
+void TQtTableView::setBackgroundColor( const TQColor &c )
 {
     TQWidget::setBackgroundColor( c );
 }
@@ -190,7 +190,7 @@ void QtTableView::setBackgroundColor( const TQColor &c )
 /*!\reimp
 */
 
-void QtTableView::setPalette( const TQPalette &p )
+void TQtTableView::setPalette( const TQPalette &p )
 {
     TQWidget::setPalette( p );
 }
@@ -198,7 +198,7 @@ void QtTableView::setPalette( const TQPalette &p )
 /*!\reimp
 */
 
-void QtTableView::show()
+void TQtTableView::show()
 {
     showOrHideScrollBars();
     TQWidget::show();
@@ -206,7 +206,7 @@ void QtTableView::show()
 
 
 /*!
-  \overload void QtTableView::repaint( bool erase )
+  \overload void TQtTableView::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
-  clearing and then repainting one cell at at time, it can make the
+  At present, TQtTableView is the only widget that reimplements \link
+  TQWidget::tqrepaint() tqrepaint()\endlink.	 It does this because by
+  clearing and then tqrepainting 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 TQtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
 {
     if ( !isVisible() || testWState(WState_BlockUpdates) )
 	return;
@@ -248,14 +248,14 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase )
 }
 
 /*!
-  \overload void QtTableView::repaint( const TQRect &r, bool erase )
+  \overload void TQtTableView::tqrepaint( const TQRect &r, bool erase )
   Replaints rectangle \a r. If \a erase is TRUE draws the background
   using the palette's background.
 */
 
 
 /*!
-  \fn int QtTableView::numRows() const
+  \fn int TQtTableView::numRows() const
   Returns the number of rows in the table.
   \sa numCols(), setNumRows()
 */
@@ -264,16 +264,16 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase )
   Sets the number of rows of the table to \a rows (must be non-negative).
   Does not change topCell().
 
-  The table repaints itself automatically if autoUpdate() is set.
+  The table tqrepaints itself automatically if autoUpdate() is set.
 
   \sa numCols(), setNumCols(), numRows()
 */
 
-void QtTableView::setNumRows( int rows )
+void TQtTableView::setNumRows( int rows )
 {
     if ( rows < 0 ) {
-#if defined(QT_CHECK_RANGE)
-	qWarning( "QtTableView::setNumRows: (%s) Negative argument %d.",
+#if defined(TQT_CHECK_RANGE)
+	qWarning( "TQtTableView::setNumRows: (%s) Negative argument %d.",
 		 name( "unnamed" ), rows );
 #endif
 	return;
@@ -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;
@@ -297,7 +297,7 @@ void QtTableView::setNumRows( int rows )
 }
 
 /*!
-  \fn int QtTableView::numCols() const
+  \fn int TQtTableView::numCols() const
   Returns the number of columns in the table.
   \sa numRows(), setNumCols()
 */
@@ -306,16 +306,16 @@ void QtTableView::setNumRows( int rows )
   Sets the number of columns of the table to \a cols (must be non-negative).
   Does not change leftCell().
 
-  The table repaints itself automatically if autoUpdate() is set.
+  The table tqrepaints itself automatically if autoUpdate() is set.
 
   \sa numCols(), numRows(), setNumRows()
 */
 
-void QtTableView::setNumCols( int cols )
+void TQtTableView::setNumCols( int cols )
 {
     if ( cols < 0 ) {
-#if defined(QT_CHECK_RANGE)
-	qWarning( "QtTableView::setNumCols: (%s) Negative argument %d.",
+#if defined(TQT_CHECK_RANGE)
+	qWarning( "TQtTableView::setNumCols: (%s) Negative argument %d.",
 		 name( "unnamed" ), cols );
 #endif
 	return;
@@ -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();
@@ -335,7 +335,7 @@ void QtTableView::setNumCols( int cols )
 
 
 /*!
-  \fn int QtTableView::topCell() const
+  \fn int TQtTableView::topCell() const
   Returns the index of the first row in the table that is visible in
   the view.  The index of the first row is 0.
   \sa leftCell(), setTopCell()
@@ -347,14 +347,14 @@ void QtTableView::setNumCols( int cols )
   \sa setYOffset(), setTopLeftCell(), setLeftCell()
 */
 
-void QtTableView::setTopCell( int row )
+void TQtTableView::setTopCell( int row )
 {
     setTopLeftCell( row, -1 );
     return;
 }
 
 /*!
-  \fn int QtTableView::leftCell() const
+  \fn int TQtTableView::leftCell() const
   Returns the index of the first column in the table that is visible in
   the view.  The index of the very leftmost column is 0.
   \sa topCell(), setLeftCell()
@@ -366,7 +366,7 @@ void QtTableView::setTopCell( int row )
   \sa setXOffset(), setTopLeftCell(), setTopCell()
 */
 
-void QtTableView::setLeftCell( int col )
+void TQtTableView::setLeftCell( int col )
 {
     setTopLeftCell( -1, col );
     return;
@@ -379,7 +379,7 @@ void QtTableView::setLeftCell( int col )
   \sa setLeftCell(), setTopCell(), setOffset()
 */
 
-void QtTableView::setTopLeftCell( int row, int col )
+void TQtTableView::setTopLeftCell( int row, int col )
 {
     int newX = xOffs;
     int newY = yOffs;
@@ -411,7 +411,7 @@ void QtTableView::setTopLeftCell( int row, int col )
 
 
 /*!
-  \fn int QtTableView::xOffset() const
+  \fn int TQtTableView::xOffset() const
 
   Returns the x coordinate in \e table coordinates of the pixel that is
   currently on the left edge of the view.
@@ -428,13 +428,13 @@ void QtTableView::setTopLeftCell( int row, int col )
   \sa xOffset(), setYOffset(), setOffset(), setLeftCell()
 */
 
-void QtTableView::setXOffset( int x )
+void TQtTableView::setXOffset( int x )
 {
     setOffset( x, yOffset() );
 }
 
 /*!
-  \fn int QtTableView::yOffset() const
+  \fn int TQtTableView::yOffset() const
 
   Returns the y coordinate in \e table coordinates of the pixel that is
   currently on the top edge of the view.
@@ -453,7 +453,7 @@ void QtTableView::setXOffset( int x )
   \sa yOffset(), setXOffset(), setOffset(), setTopCell()
 */
 
-void QtTableView::setYOffset( int y )
+void TQtTableView::setYOffset( int y )
 {
     setOffset( xOffset(), y );
 }
@@ -469,7 +469,7 @@ void QtTableView::setYOffset( int y )
   \sa xOffset(), yOffset(), setXOffset(), setYOffset(), setTopLeftCell()
 */
 
-void QtTableView::setOffset( int x, int y, bool updateScrBars )
+void TQtTableView::setOffset( int x, int y, bool updateScrBars )
 {
     if ( (!testTableFlags(Tbl_snapToHGrid) || xCellDelta == 0) &&
 	 (!testTableFlags(Tbl_snapToVGrid) || yCellDelta == 0) &&
@@ -541,7 +541,7 @@ void QtTableView::setOffset( int x, int y, bool updateScrBars )
 
 
 /*!
-  \overload int QtTableView::cellWidth() const
+  \overload int TQtTableView::cellWidth() const
 
   Returns the column width in pixels.	Returns 0 if the columns have
   variable widths.
@@ -559,7 +559,7 @@ void QtTableView::setOffset( int x, int y, bool updateScrBars )
   \sa setCellWidth(), cellHeight(), totalWidth(), updateTableSize()
 */
 
-int QtTableView::cellWidth( int )
+int TQtTableView::cellWidth( int )
 {
     return cellW;
 }
@@ -569,19 +569,19 @@ int QtTableView::cellWidth( int )
   Sets the width in pixels of the table cells to \a cellWidth.
 
   Setting it to 0 means that the column width is variable.  When
-  set to 0 (this is the default) QtTableView calls the virtual function
+  set to 0 (this is the default) TQtTableView calls the virtual function
   cellWidth() to get the width.
 
   \sa cellWidth(), setCellHeight(), totalWidth(), numCols()
 */
 
-void QtTableView::setCellWidth( int cellWidth )
+void TQtTableView::setCellWidth( int cellWidth )
 {
     if ( cellW == cellWidth )
 	return;
-#if defined(QT_CHECK_RANGE)
+#if defined(TQT_CHECK_RANGE)
     if ( cellWidth < 0 || cellWidth > SHRT_MAX ) {
-	qWarning( "QtTableView::setCellWidth: (%s) Argument out of range (%d)",
+	qWarning( "TQtTableView::setCellWidth: (%s) Argument out of range (%d)",
 		 name( "unnamed" ), cellWidth );
 	return;
     }
@@ -590,12 +590,12 @@ void QtTableView::setCellWidth( int cellWidth )
 
     updateScrollBars( horSteps | horRange );
     if ( autoUpdate() && isVisible() )
-	repaint();
+	tqrepaint();
 
 }
 
 /*!
-  \overload int QtTableView::cellHeight() const
+  \overload int TQtTableView::cellHeight() const
 
   Returns the row height, in pixels.  Returns 0 if the rows have
   variable heights.
@@ -614,7 +614,7 @@ void QtTableView::setCellWidth( int cellWidth )
   \sa setCellHeight(), cellWidth(), totalHeight()
 */
 
-int QtTableView::cellHeight( int )
+int TQtTableView::cellHeight( int )
 {
     return cellH;
 }
@@ -623,26 +623,26 @@ int QtTableView::cellHeight( int )
   Sets the height in pixels of the table cells to \a cellHeight.
 
   Setting it to 0 means that the row height is variable.  When set
-  to 0 (this is the default), QtTableView calls the virtual function
+  to 0 (this is the default), TQtTableView calls the virtual function
   cellHeight() to get the height.
 
   \sa cellHeight(), setCellWidth(), totalHeight(), numRows()
 */
 
-void QtTableView::setCellHeight( int cellHeight )
+void TQtTableView::setCellHeight( int cellHeight )
 {
     if ( cellH == cellHeight )
 	return;
-#if defined(QT_CHECK_RANGE)
+#if defined(TQT_CHECK_RANGE)
     if ( cellHeight < 0 || cellHeight > SHRT_MAX ) {
-	qWarning( "QtTableView::setCellHeight: (%s) Argument out of range (%d)",
+	qWarning( "TQtTableView::setCellHeight: (%s) Argument out of range (%d)",
 		 name( "unnamed" ), cellHeight );
 	return;
     }
 #endif
     cellH = (short)cellHeight;
     if ( autoUpdate() && isVisible() )
-	repaint();
+	tqrepaint();
     updateScrollBars( verSteps | verRange );
 }
 
@@ -658,7 +658,7 @@ void QtTableView::setCellHeight( int cellHeight )
 
   \sa cellWidth(), totalHeight() */
 
-int QtTableView::totalWidth()
+int TQtTableView::totalWidth()
 {
     if ( cellW ) {
 	return cellW*nCols;
@@ -682,7 +682,7 @@ int QtTableView::totalWidth()
   \sa cellHeight(), totalWidth()
 */
 
-int QtTableView::totalHeight()
+int TQtTableView::totalHeight()
 {
     if ( cellH ) {
 	return cellH*nRows;
@@ -696,7 +696,7 @@ int QtTableView::totalHeight()
 
 
 /*!
-  \fn uint QtTableView::tableFlags() const
+  \fn uint TQtTableView::tableFlags() const
 
   Returns the union of the table flags that are currently set.
 
@@ -704,7 +704,7 @@ int QtTableView::totalHeight()
 */
 
 /*!
-  \fn bool QtTableView::testTableFlags( uint f ) const
+  \fn bool TQtTableView::testTableFlags( uint f ) const
 
   Returns TRUE if any of the table flags in \a f are currently set,
   otherwise FALSE.
@@ -716,7 +716,7 @@ int QtTableView::totalHeight()
   Sets the table flags to \a f.
 
   If a flag setting changes the appearance of the table, the table is
-  repainted if - and only if - autoUpdate() is TRUE.
+  tqrepainted if - and only if - autoUpdate() is TRUE.
 
   The table flags are mostly single bits, though there are some multibit
   flags for convenience. Here is a complete list:
@@ -777,7 +777,7 @@ int QtTableView::totalHeight()
   \sa clearTableFlags(), testTableFlags(), tableFlags()
 */
 
-void QtTableView::setTableFlags( uint f )
+void TQtTableView::setTableFlags( uint f )
 {
     f = (f ^ tFlags) & f;			// clear flags already set
     tFlags |= f;
@@ -785,7 +785,7 @@ void QtTableView::setTableFlags( uint f )
     bool updateOn = autoUpdate();
     setAutoUpdate( FALSE );
 
-    uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH;
+    uint tqrepaintMask = Tbl_cutCellsV | Tbl_cutCellsH;
 
     if ( f & Tbl_vScrollBar ) {
 	setVerScrollBar( TRUE );
@@ -816,15 +816,15 @@ 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
+	    tqrepaintMask |= Tbl_snapToGrid;	// tqrepaint table
 	}
     }
 
     if ( updateOn ) {
 	setAutoUpdate( TRUE );
 	updateScrollBars();
-	if ( isVisible() && (f & repaintMask) )
-	    repaint();
+	if ( isVisible() && (f & tqrepaintMask) )
+	    tqrepaint();
     }
 
 }
@@ -843,7 +843,7 @@ void QtTableView::setTableFlags( uint f )
   \sa setTableFlags(), testTableFlags(), tableFlags()
 */
 
-void QtTableView::clearTableFlags( uint f )
+void TQtTableView::clearTableFlags( uint f )
 {
     f = (f ^ ~tFlags) & f;		// clear flags that are already 0
     tFlags &= ~f;
@@ -851,7 +851,7 @@ void QtTableView::clearTableFlags( uint f )
     bool updateOn = autoUpdate();
     setAutoUpdate( FALSE );
 
-    uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH;
+    uint tqrepaintMask = Tbl_cutCellsV | Tbl_cutCellsH;
 
     if ( f & Tbl_vScrollBar ) {
 	setVerScrollBar( FALSE );
@@ -863,7 +863,7 @@ void QtTableView::clearTableFlags( uint f )
 	int maxX = maxXOffset();
 	if ( xOffs > maxX ) {
 	    setOffset( maxX, yOffs );
-	    repaintMask |= Tbl_scrollLastHCell;
+	    tqrepaintMask |= Tbl_scrollLastHCell;
 	}
 	updateScrollBars( horRange );
     }
@@ -871,7 +871,7 @@ void QtTableView::clearTableFlags( uint f )
 	int maxY = maxYOffset();
 	if ( yOffs > maxY ) {
 	    setOffset( xOffs, maxY );
-	    repaintMask |= Tbl_scrollLastVCell;
+	    tqrepaintMask |= Tbl_scrollLastVCell;
 	}
 	updateScrollBars( verRange );
     }
@@ -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
+	    tqrepaintMask |= Tbl_smoothScrolling;		     // tqrepaint table
 	}
     }
     if ( f & Tbl_snapToHGrid ) {
@@ -892,15 +892,15 @@ void QtTableView::clearTableFlags( uint f )
     if ( updateOn ) {
 	setAutoUpdate( TRUE );
 	updateScrollBars();	     // returns immediately if nothing to do
-	if ( isVisible() && (f & repaintMask) )
-	    repaint();
+	if ( isVisible() && (f & tqrepaintMask) )
+	    tqrepaint();
     }
 
 }
 
 
 /*!
-  \fn bool QtTableView::autoUpdate() const
+  \fn bool TQtTableView::autoUpdate() const
 
   Returns TRUE if the view updates itself automatically whenever it
   is changed in some way.
@@ -915,23 +915,23 @@ 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 )
+void TQtTableView::setAutoUpdate( bool enable )
 {
     if ( isUpdatesEnabled() == enable )
 	return;
@@ -947,12 +947,12 @@ void QtTableView::setAutoUpdate( bool enable )
   Repaints the cell at row \a row, column \a col if it is inside the view.
 
   If \a erase is TRUE, the relevant part of the view is cleared to the
-  background color/pixmap before the contents are repainted.
+  background color/pixmap before the contents are tqrepainted.
 
   \sa isVisible()
 */
 
-void QtTableView::updateCell( int row, int col, bool erase )
+void TQtTableView::updateCell( int row, int col, bool erase )
 {
     int xPos, yPos;
     if ( !colXPos( col, &xPos ) )
@@ -962,12 +962,12 @@ 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 );
 }
 
 
 /*!
-  \fn TQRect QtTableView::cellUpdateRect() const
+  \fn TQRect TQtTableView::cellUpdateRect() const
 
   This function should be called only from the paintCell() function in
   subclasses. It returns the portion of a cell that actually needs to be
@@ -981,7 +981,7 @@ void QtTableView::updateCell( int row, int col, bool erase )
   frame, in \e widget coordinates.
 */
 
-TQRect QtTableView::viewRect() const
+TQRect TQtTableView::viewRect() const
 {
     return TQRect( frameWidth(), frameWidth(), viewWidth(), viewHeight() );
 }
@@ -997,7 +997,7 @@ TQRect QtTableView::viewRect() const
   \sa lastColVisible()
 */
 
-int QtTableView::lastRowVisible() const
+int TQtTableView::lastRowVisible() const
 {
     int cellMaxY;
     int row = findRawRow( maxViewY(), &cellMaxY );
@@ -1024,7 +1024,7 @@ int QtTableView::lastRowVisible() const
   \sa lastRowVisible()
 */
 
-int QtTableView::lastColVisible() const
+int TQtTableView::lastColVisible() const
 {
     int cellMaxX;
     int col = findRawCol( maxViewX(), &cellMaxX );
@@ -1046,7 +1046,7 @@ int QtTableView::lastColVisible() const
   \sa colIsVisible()
 */
 
-bool QtTableView::rowIsVisible( int row ) const
+bool TQtTableView::rowIsVisible( int row ) const
 {
     return rowYPos( row, 0 );
 }
@@ -1056,7 +1056,7 @@ bool QtTableView::rowIsVisible( int row ) const
   \sa rowIsVisible()
 */
 
-bool QtTableView::colIsVisible( int col ) const
+bool TQtTableView::colIsVisible( int col ) const
 {
     return colXPos( col, 0 );
 }
@@ -1068,11 +1068,11 @@ bool QtTableView::colIsVisible( int col ) const
   bottom left corner between the two scroll bars with an empty widget.
 */
 
-void QtTableView::coverCornerSquare( bool enable )
+void TQtTableView::coverCornerSquare( bool enable )
 {
     coveringCornerSquare = enable;
     if ( !cornerSquare && enable ) {
-	cornerSquare = new QCornerSquare( this );
+	cornerSquare = new TQCornerSquare( this );
 	Q_CHECK_PTR( cornerSquare );
 	cornerSquare->setGeometry( maxViewX() + frameWidth() + 1,
 				   maxViewY() + frameWidth() + 1,
@@ -1102,7 +1102,7 @@ void QtTableView::coverCornerSquare( bool enable )
   \link setTableFlags() Tbl_snapTo*Grid \endlink table flags.
 */
 
-void QtTableView::snapToGrid( bool horizontal, bool vertical )
+void TQtTableView::snapToGrid( bool horizontal, bool vertical )
 {
     int newXCell = -1;
     int newYCell = -1;
@@ -1132,7 +1132,7 @@ void QtTableView::snapToGrid( bool horizontal, bool vertical )
   scroll bar.
 */
 
-void QtTableView::horSbValue( int val )
+void TQtTableView::horSbValue( int val )
 {
     if ( horSliding ) {
 	horSliding = FALSE;
@@ -1152,7 +1152,7 @@ void QtTableView::horSbValue( int val )
   Scrolls the table smoothly horizontally even if \c Tbl_snapToHGrid is set.
 */
 
-void QtTableView::horSbSliding( int val )
+void TQtTableView::horSbSliding( int val )
 {
     if ( testTableFlags(Tbl_snapToHGrid) &&
 	 testTableFlags(Tbl_smoothHScrolling) ) {
@@ -1170,7 +1170,7 @@ void QtTableView::horSbSliding( int val )
   TQScrollBar::sliderReleased() signal.
 */
 
-void QtTableView::horSbSlidingDone( )
+void TQtTableView::horSbSlidingDone( )
 {
     if ( testTableFlags(Tbl_snapToHGrid) &&
 	 testTableFlags(Tbl_smoothHScrolling) )
@@ -1186,7 +1186,7 @@ void QtTableView::horSbSlidingDone( )
   scroll bar.
 */
 
-void QtTableView::verSbValue( int val )
+void TQtTableView::verSbValue( int val )
 {
     if ( verSliding ) {
 	verSliding = FALSE;
@@ -1206,7 +1206,7 @@ void QtTableView::verSbValue( int val )
   Scrolls the table smoothly vertically even if \c Tbl_snapToVGrid is set.
 */
 
-void QtTableView::verSbSliding( int val )
+void TQtTableView::verSbSliding( int val )
 {
     if ( testTableFlags(Tbl_snapToVGrid) &&
 	 testTableFlags(Tbl_smoothVScrolling) ) {
@@ -1224,7 +1224,7 @@ void QtTableView::verSbSliding( int val )
   TQScrollBar::sliderReleased() signal.
 */
 
-void QtTableView::verSbSlidingDone( )
+void TQtTableView::verSbSlidingDone( )
 {
     if ( testTableFlags(Tbl_snapToVGrid) &&
 	 testTableFlags(Tbl_smoothVScrolling) )
@@ -1239,12 +1239,12 @@ void QtTableView::verSbSlidingDone( )
   do so for each cell.
 */
 
-void QtTableView::setupPainter( TQPainter * )
+void TQtTableView::setupPainter( TQPainter * )
 {
 }
 
 /*!
-  \fn void QtTableView::paintCell( TQPainter *p, int row, int col )
+  \fn void TQtTableView::paintCell( TQPainter *p, int row, int col )
 
   This pure virtual function is called to paint the single cell at \a
   (row,col) using \a p, which is open when paintCell() is called and
@@ -1265,10 +1265,10 @@ void QtTableView::setupPainter( TQPainter * )
 /*!
   Handles paint events, \a e, for the table view.
 
-  Calls paintCell() for the cells that needs to be repainted.
+  Calls paintCell() for the cells that needs to be tqrepainted.
 */
 
-void QtTableView::paintEvent( TQPaintEvent *e )
+void TQtTableView::paintEvent( TQPaintEvent *e )
 {
     TQRect updateR = e->rect();			// update rectangle
     if ( sbDirty ) {
@@ -1279,7 +1279,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 
     TQPainter paint( this );
 
-    if ( !contentsRect().contains( updateR, TRUE  ) ) {// update frame ?
+    if ( !contentsRect().tqcontains( updateR, TRUE  ) ) {// update frame ?
 	drawFrame( &paint );
 	if ( updateR.left() < frameWidth() ) 		//###
 	    updateR.setLeft( frameWidth() );
@@ -1314,7 +1314,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
     TQRect winR = viewRect();
     TQRect cellR;
     TQRect cellUR;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     TQWMatrix matrix;
 #endif
 
@@ -1338,11 +1338,11 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 		if ( eraseInPaint )
 		    paint.eraseRect( cellUR );
 
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 		matrix.translate( xPos, yPos );
 		paint.setWorldMatrix( matrix );
 		if ( testTableFlags(Tbl_clipCellPainting) ||
-		     frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt
+		     frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt
 		    paint.setClipRect( cellUR );
 		    paintCell( &paint, row, col );
 		    paint.setClipping( FALSE );
@@ -1354,7 +1354,7 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 #else
 		paint.translate( xPos, yPos );
 		if ( testTableFlags(Tbl_clipCellPainting) ||
-		     frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt
+		     frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt
 		    paint.setClipRect( cellUR );
 		    paintCell( &paint, row, col );
 		    paint.setClipping( FALSE );
@@ -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
+    // inside the cells. So TQtTableView 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;
@@ -1407,20 +1407,20 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 
 /*!\reimp
 */
-void QtTableView::resizeEvent( TQResizeEvent * )
+void TQtTableView::resizeEvent( TQResizeEvent * )
 {
     updateScrollBars( horValue | verValue | horSteps | horGeometry | horRange |
 		      verSteps | verGeometry | verRange );
     showOrHideScrollBars();
     updateFrameSize();
-    int maxX = QMIN( xOffs, maxXOffset() );			// ### can be slow
-    int maxY = QMIN( yOffs, maxYOffset() );
+    int maxX = TQMIN( xOffs, maxXOffset() );			// ### can be slow
+    int maxY = TQMIN( yOffs, maxYOffset() );
     setOffset( maxX, maxY );
 }
 
-void QtTableView::wheelEvent( TQWheelEvent * e )
+void TQtTableView::wheelEvent( TQWheelEvent * e )
 {
-    if( e->orientation() == Vertical && vScrollBar && vScrollBar->isVisible() )
+    if( e->orientation() ==Qt::Vertical && vScrollBar && vScrollBar->isVisible() )
         TQApplication::sendEvent( vScrollBar, e );
 }
 
@@ -1428,9 +1428,9 @@ void QtTableView::wheelEvent( TQWheelEvent * e )
   Redraws all visible cells in the table view.
 */
 
-void QtTableView::updateView()
+void TQtTableView::updateView()
 {
-    repaint( viewRect() );
+    tqrepaint( viewRect() );
 }
 
 /*!
@@ -1439,18 +1439,18 @@ void QtTableView::updateView()
   values; use findRow() to translate to cell numbers.
 */
 
-TQScrollBar *QtTableView::verticalScrollBar() const
+TQScrollBar *TQtTableView::verticalScrollBar() const
 {
-    QtTableView *that = (QtTableView*)this; // semantic const
+    TQtTableView *that = (TQtTableView*)this; // semantic const
     if ( !vScrollBar ) {
-	TQScrollBar *sb = new TQScrollBar( TQScrollBar::Vertical, that );
-#ifndef QT_NO_CURSOR
+	TQScrollBar *sb = new TQScrollBar( Qt::Vertical, that );
+#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( NoFocus );
+	sb->setFocusPolicy( TQ_NoFocus );
 	connect( sb, TQT_SIGNAL(valueChanged(int)),
 		 TQT_SLOT(verSbValue(int)));
 	connect( sb, TQT_SIGNAL(sliderMoved(int)),
@@ -1470,16 +1470,16 @@ TQScrollBar *QtTableView::verticalScrollBar() const
   values; use findCol() to translate to cell numbers.
 */
 
-TQScrollBar *QtTableView::horizontalScrollBar() const
+TQScrollBar *TQtTableView::horizontalScrollBar() const
 {
-    QtTableView *that = (QtTableView*)this; // semantic const
+    TQtTableView *that = (TQtTableView*)this; // semantic const
     if ( !hScrollBar ) {
-	TQScrollBar *sb = new TQScrollBar( TQScrollBar::Horizontal, that );
-#ifndef QT_NO_CURSOR
+	TQScrollBar *sb = new TQScrollBar( Qt::Horizontal, that );
+#ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
-	sb->resize( sb->sizeHint() ); // width is irrelevant
-	sb->setFocusPolicy( NoFocus );
+	sb->resize( sb->tqsizeHint() ); // width is irrelevant
+	sb->setFocusPolicy( TQ_NoFocus );
 	Q_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
 	connect( sb, TQT_SIGNAL(valueChanged(int)),
@@ -1500,7 +1500,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
   setAutoUpdate() and the \link setTableFlags() table flags\endlink.
 */
 
-void QtTableView::setHorScrollBar( bool on, bool update )
+void TQtTableView::setHorScrollBar( bool on, bool update )
 {
     if ( on ) {
 	tFlags |= Tbl_hScrollBar;
@@ -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 )
@@ -1539,7 +1539,7 @@ void QtTableView::setHorScrollBar( bool on, bool update )
   setAutoUpdate() and the \link setTableFlags() table flags\endlink.
 */
 
-void QtTableView::setVerScrollBar( bool on, bool update )
+void TQtTableView::setVerScrollBar( bool on, bool update )
 {
     if ( on ) {
 	tFlags |= Tbl_vScrollBar;
@@ -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 )
@@ -1575,7 +1575,7 @@ void QtTableView::setVerScrollBar( bool on, bool update )
 
 
 
-int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY,
+int TQtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY,
 			    bool goOutsideView ) const
 {
     int r = -1;
@@ -1583,8 +1583,8 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY,
 	return r;
     if ( goOutsideView || yPos >= minViewY() && yPos <= maxViewY() ) {
 	if ( yPos < minViewY() ) {
-#if defined(QT_CHECK_RANGE)
-	    qWarning( "QtTableView::findRawRow: (%s) internal error: "
+#if defined(TQT_CHECK_RANGE)
+	    qWarning( "TQtTableView::findRawRow: (%s) internal error: "
 		     "yPos < minViewY() && goOutsideView "
 		     "not supported. (%d,%d)",
 		     name( "unnamed" ), yPos, yOffs );
@@ -1599,7 +1599,7 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY,
 		*cellMinY = r*cellH + minViewY() - yCellDelta;
 	    r += yCellOffs;			     // absolute cell index
 	} else {				     // variable cell height
-	    QtTableView *tw = (QtTableView *)this;
+	    TQtTableView *tw = (TQtTableView *)this;
 	    r	     = yCellOffs;
 	    int h    = minViewY() - yCellDelta; //##arnt3
 	    int oldH = h;
@@ -1622,7 +1622,7 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY,
 }
 
 
-int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX ,
+int TQtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX ,
 			    bool goOutsideView ) const
 {
     int c = -1;
@@ -1630,8 +1630,8 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX ,
 	return c;
     if ( goOutsideView || xPos >= minViewX() && xPos <= maxViewX() ) {
 	if ( xPos < minViewX() ) {
-#if defined(QT_CHECK_RANGE)
-	    qWarning( "QtTableView::findRawCol: (%s) internal error: "
+#if defined(TQT_CHECK_RANGE)
+	    qWarning( "TQtTableView::findRawCol: (%s) internal error: "
 		     "xPos < minViewX() && goOutsideView "
 		     "not supported. (%d,%d)",
 		     name( "unnamed" ), xPos, xOffs );
@@ -1646,7 +1646,7 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX ,
 		*cellMinX = c*cellW + minViewX() - xCellDelta;
 	    c += xCellOffs;			// absolute cell index
 	} else {				// variable cell width
-	    QtTableView *tw = (QtTableView *)this;
+	    TQtTableView *tw = (TQtTableView *)this;
 	    c	     = xCellOffs;
 	    int w    = minViewX() - xCellDelta; //##arnt3
 	    int oldW = w;
@@ -1676,7 +1676,7 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX ,
   \sa findCol(), rowYPos()
 */
 
-int QtTableView::findRow( int yPos ) const
+int TQtTableView::findRow( int yPos ) const
 {
     int cellMaxY;
     int row = findRawRow( yPos, &cellMaxY );
@@ -1696,7 +1696,7 @@ int QtTableView::findRow( int yPos ) const
   \sa findRow(), colXPos()
 */
 
-int QtTableView::findCol( int xPos ) const
+int TQtTableView::findCol( int xPos ) const
 {
     int cellMaxX;
     int col = findRawCol( xPos, &cellMaxX );
@@ -1718,7 +1718,7 @@ int QtTableView::findCol( int xPos ) const
   \sa colXPos(), findRow()
 */
 
-bool QtTableView::rowYPos( int row, int *yPos ) const
+bool TQtTableView::rowYPos( int row, int *yPos ) const
 {
     int y;
     if ( row >= yCellOffs ) {
@@ -1731,7 +1731,7 @@ bool QtTableView::rowYPos( int row, int *yPos ) const
 	    //##arnt3
 	    y = minViewY() - yCellDelta;	// y of leftmost cell in view
 	    int r = yCellOffs;
-	    QtTableView *tw = (QtTableView *)this;
+	    TQtTableView *tw = (TQtTableView *)this;
 	    int maxY = maxViewY();
 	    while ( r < row && y <= maxY )
 		y += tw->cellHeight( r++ );
@@ -1758,7 +1758,7 @@ bool QtTableView::rowYPos( int row, int *yPos ) const
   \sa rowYPos(), findCol()
 */
 
-bool QtTableView::colXPos( int col, int *xPos ) const
+bool TQtTableView::colXPos( int col, int *xPos ) const
 {
     int x;
     if ( col >= xCellOffs ) {
@@ -1771,7 +1771,7 @@ bool QtTableView::colXPos( int col, int *xPos ) const
 	    //##arnt3
 	    x = minViewX() - xCellDelta;	// x of uppermost cell in view
 	    int c = xCellOffs;
-	    QtTableView *tw = (QtTableView *)this;
+	    TQtTableView *tw = (TQtTableView *)this;
 	    int maxX = maxViewX();
 	    while ( c < col && x <= maxX )
 		x += tw->cellWidth( c++ );
@@ -1792,7 +1792,7 @@ bool QtTableView::colXPos( int col, int *xPos ) const
   down by \a yPixels pixels.  Both may be negative.
 
   \warning You might find that TQScrollView offers a higher-level of
-	functionality than using QtTableView and this function.
+	functionality than using TQtTableView and this function.
 
   This function is \e not the same as TQWidget::scroll(); in particular,
   the signs of \a xPixels and \a yPixels have the reverse semantics.
@@ -1801,7 +1801,7 @@ bool QtTableView::colXPos( int col, int *xPos ) const
   setLeftCell()
 */
 
-void QtTableView::scroll( int xPixels, int yPixels )
+void TQtTableView::scroll( int xPixels, int yPixels )
 {
     TQWidget::scroll( -xPixels, -yPixels, contentsRect() );
 }
@@ -1814,7 +1814,7 @@ void QtTableView::scroll( int xPixels, int yPixels )
   \sa maxViewY(), viewWidth(), contentsRect()
 */
 
-int QtTableView::minViewX() const
+int TQtTableView::minViewX() const
 {
     return frameWidth();
 }
@@ -1827,7 +1827,7 @@ int QtTableView::minViewX() const
   \sa maxViewX(), viewHeight(), contentsRect()
 */
 
-int QtTableView::minViewY() const
+int TQtTableView::minViewY() const
 {
     return frameWidth();
 }
@@ -1841,7 +1841,7 @@ int QtTableView::minViewY() const
   \sa maxViewY(), viewWidth(), contentsRect()
 */
 
-int QtTableView::maxViewX() const
+int TQtTableView::maxViewX() const
 {
     return width() - 1 - frameWidth()
         - (tFlags & Tbl_vScrollBar ? VSBEXT
@@ -1857,7 +1857,7 @@ int QtTableView::maxViewX() const
   \sa maxViewX(), viewHeight(), contentsRect()
 */
 
-int QtTableView::maxViewY() const
+int TQtTableView::maxViewY() const
 {
     return height() - 1 - frameWidth()
         - (tFlags & Tbl_hScrollBar ? HSBEXT
@@ -1873,7 +1873,7 @@ int QtTableView::maxViewY() const
   \sa minViewX() maxViewX(), viewHeight(), contentsRect() viewRect()
 */
 
-int QtTableView::viewWidth() const
+int TQtTableView::viewWidth() const
 {
     return maxViewX() - minViewX() + 1;
 }
@@ -1887,13 +1887,13 @@ int QtTableView::viewWidth() const
   \sa minViewY() maxViewY() viewWidth() contentsRect() viewRect()
 */
 
-int QtTableView::viewHeight() const
+int TQtTableView::viewHeight() const
 {
     return maxViewY() - minViewY() + 1;
 }
 
 
-void QtTableView::doAutoScrollBars()
+void TQtTableView::doAutoScrollBars()
 {
     int viewW = width()	 - frameWidth() - minViewX();
     int viewH = height() - frameWidth() - minViewY();
@@ -1947,7 +1947,7 @@ void QtTableView::doAutoScrollBars()
 
 
 /*!
-  \fn void QtTableView::updateScrollBars()
+  \fn void TQtTableView::updateScrollBars()
 
   Updates the scroll bars' contents and presence to match the table's
   state.  Generally, you should not need to call this.
@@ -1962,7 +1962,7 @@ void QtTableView::doAutoScrollBars()
   \sa setTableFlags()
 */
 
-void QtTableView::updateScrollBars( uint f )
+void TQtTableView::updateScrollBars( uint f )
 {
     sbDirty = sbDirty | f;
     if ( inSbUpdate )
@@ -1999,7 +1999,7 @@ void QtTableView::updateScrollBars( uint f )
 
 	if ( sbDirty & horSteps ) {
 	    if ( cellW )
-		hScrollBar->setSteps( QMIN(cellW,viewWidth()/2), viewWidth() );
+		hScrollBar->setSteps( TQMIN(cellW,viewWidth()/2), viewWidth() );
 	    else
 		hScrollBar->setSteps( 16, viewWidth() );
 	}
@@ -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();
     }
@@ -2023,7 +2023,7 @@ void QtTableView::updateScrollBars( uint f )
 
 	if ( sbDirty & verSteps ) {
 	    if ( cellH )
-		vScrollBar->setSteps( QMIN(cellH,viewHeight()/2), viewHeight() );
+		vScrollBar->setSteps( TQMIN(cellH,viewHeight()/2), viewHeight() );
 	    else
 		vScrollBar->setSteps( 16, viewHeight() );  // fttb! ###
 	}
@@ -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();
     }
@@ -2048,7 +2048,7 @@ void QtTableView::updateScrollBars( uint f )
 }
 
 
-void QtTableView::updateFrameSize()
+void TQtTableView::updateFrameSize()
 {
     int rw = width()  - ( testTableFlags(Tbl_vScrollBar) ?
                           VSBEXT : 0 );
@@ -2065,9 +2065,9 @@ void QtTableView::updateFrameSize()
 	setFrameRect( TQRect(0,0,rw,rh) );
 
 	if ( rw != fw )
-	    update( QMIN(fw,rw) - frameWidth() - 2, 0, frameWidth()+4, rh );
+	    update( TQMIN(fw,rw) - frameWidth() - 2, 0, frameWidth()+4, rh );
 	if ( rh != fh )
-	    update( 0, QMIN(fh,rh) - frameWidth() - 2, rw, frameWidth()+4 );
+	    update( 0, TQMIN(fh,rh) - frameWidth() - 2, rw, frameWidth()+4 );
     }
 }
 
@@ -2081,7 +2081,7 @@ void QtTableView::updateFrameSize()
   \sa maxColOffset(), maxYOffset(), totalWidth()
 */
 
-int QtTableView::maxXOffset()
+int TQtTableView::maxXOffset()
 {
     int tw = totalWidth();
     int maxOffs;
@@ -2127,7 +2127,7 @@ int QtTableView::maxXOffset()
   \sa maxRowOffset(), maxXOffset(), totalHeight()
 */
 
-int QtTableView::maxYOffset()
+int TQtTableView::maxYOffset()
 {
     int th = totalHeight();
     int maxOffs;
@@ -2174,7 +2174,7 @@ int QtTableView::maxYOffset()
   \sa maxXOffset(), maxRowOffset()
 */
 
-int QtTableView::maxColOffset()
+int TQtTableView::maxColOffset()
 {
     int mx = maxXOffset();
     if ( cellW )
@@ -2200,7 +2200,7 @@ int QtTableView::maxColOffset()
   \sa maxYOffset(), maxColOffset()
 */
 
-int QtTableView::maxRowOffset()
+int TQtTableView::maxRowOffset()
 {
     int my = maxYOffset();
     if ( cellH )
@@ -2216,7 +2216,7 @@ int QtTableView::maxRowOffset()
 }
 
 
-void QtTableView::showOrHideScrollBars()
+void TQtTableView::showOrHideScrollBars()
 {
     if ( !autoUpdate() )
 	return;
@@ -2257,10 +2257,10 @@ 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()
+void TQtTableView::updateTableSize()
 {
     bool updateOn = autoUpdate();
     setAutoUpdate( FALSE );
diff --git a/cervisia/qttableview.h b/cervisia/qttableview.h
index 00b49c8d..cfddade0 100644
--- a/cervisia/qttableview.h
+++ b/cervisia/qttableview.h
@@ -1,45 +1,46 @@
 /**********************************************************************
 ** $Id$
 **
-** Definition of QtTableView class
+** Definition of TQtTableView class
 **
 ** Created : 941115
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
-** This file contains a class moved out of the Qt GUI Toolkit API. It
+** This file contains a class moved out of the TQt GUI Toolkit API. It
 ** may be used, distributed and modified without limitation.
 **
 **********************************************************************/
 
-#ifndef QTTABLEVIEW_H
-#define QTTABLEVIEW_H
+#ifndef TQTTABLEVIEW_H
+#define TQTTABLEVIEW_H
 
-#ifndef QT_H
+#ifndef TQT_H
 #include "tqframe.h"
-#endif // QT_H
+#endif // TQT_H
 
-#ifndef QT_NO_QTTABLEVIEW
+#ifndef TQT_NO_TQTTABLEVIEW
 
 class TQScrollBar;
-class QCornerSquare;
+class TQCornerSquare;
 
 
-class QtTableView : public QFrame
+class TQtTableView : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     virtual void setBackgroundColor( const TQColor & );
     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 );
-   ~QtTableView();
+    TQtTableView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 );
+   ~TQtTableView();
 
     int		numRows()	const;
     virtual void setNumRows( int );
@@ -78,8 +79,8 @@ protected:
 
     void	updateCell( int row, int column, bool erase=TRUE );
 
-    QRect	cellUpdateRect() const;
-    QRect	viewRect()	 const;
+    TQRect	cellUpdateRect() const;
+    TQRect	viewRect()	 const;
 
     int		lastRowVisible() const;
     int		lastColVisible() const;
@@ -163,16 +164,16 @@ private:
     uint	inSbUpdate		: 1;
 
     uint	tFlags;
-    QRect	cellUpdateR;
+    TQRect	cellUpdateR;
 
     TQScrollBar *vScrollBar;
     TQScrollBar *hScrollBar;
-    QCornerSquare *cornerSquare;
+    TQCornerSquare *cornerSquare;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
-    QtTableView( const QtTableView & );
-    QtTableView &operator=( const QtTableView & );
+#if defined(TQ_DISABLE_COPY)
+    TQtTableView( const TQtTableView & );
+    TQtTableView &operator=( const TQtTableView & );
 #endif
 };
 
@@ -201,52 +202,52 @@ const uint Tbl_snapToVGrid	= 0x00010000;
 const uint Tbl_snapToGrid	= 0x00018000;
 
 
-inline int QtTableView::numRows() const
+inline int TQtTableView::numRows() const
 { return nRows; }
 
-inline int QtTableView::numCols() const
+inline int TQtTableView::numCols() const
 { return nCols; }
 
-inline int QtTableView::topCell() const
+inline int TQtTableView::topCell() const
 { return yCellOffs; }
 
-inline int QtTableView::leftCell() const
+inline int TQtTableView::leftCell() const
 { return xCellOffs; }
 
-inline int QtTableView::xOffset() const
+inline int TQtTableView::xOffset() const
 { return xOffs; }
 
-inline int QtTableView::yOffset() const
+inline int TQtTableView::yOffset() const
 { return yOffs; }
 
-inline int QtTableView::cellHeight() const
+inline int TQtTableView::cellHeight() const
 { return cellH; }
 
-inline int QtTableView::cellWidth() const
+inline int TQtTableView::cellWidth() const
 { return cellW; }
 
-inline uint QtTableView::tableFlags() const
+inline uint TQtTableView::tableFlags() const
 { return tFlags; }
 
-inline bool QtTableView::testTableFlags( uint f ) const
+inline bool TQtTableView::testTableFlags( uint f ) const
 { return (tFlags & f) != 0; }
 
-inline TQRect QtTableView::cellUpdateRect() const
+inline TQRect TQtTableView::cellUpdateRect() const
 { return cellUpdateR; }
 
-inline bool QtTableView::autoUpdate() const
+inline bool TQtTableView::autoUpdate() const
 { return isUpdatesEnabled(); }
 
-inline void QtTableView::repaint( bool erase )
-{ repaint( 0, 0, width(), height(), erase ); }
+inline void TQtTableView::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 TQtTableView::tqrepaint( const TQRect &r, bool erase )
+{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); }
 
-inline void QtTableView::updateScrollBars()
+inline void TQtTableView::updateScrollBars()
 { updateScrollBars( 0 ); }
 
 
-#endif // QT_NO_QTTABLEVIEW
+#endif // TQT_NO_TQTTABLEVIEW
 
-#endif // QTTABLEVIEW_H
+#endif // TQTTABLEVIEW_H
diff --git a/cervisia/repositories.cpp b/cervisia/repositories.cpp
index 7f52a39d..c8da2857 100644
--- a/cervisia/repositories.cpp
+++ b/cervisia/repositories.cpp
@@ -59,7 +59,7 @@ static TQStringList readCvsPassFile()
 		{
 		    int pos;
 		    TQString line = stream.readLine();
-		    if ( (pos = line.find(' ')) != -1)
+		    if ( (pos = line.tqfind(' ')) != -1)
 		    {
 			if (line[0] != '/')	// old format
                             list.append(line.left(pos));
@@ -88,7 +88,7 @@ static TQStringList readCvsntPassFile()
         {
             const TQString line(stream.readLine());
 
-            const int pos(line.find("=A"));
+            const int pos(line.tqfind("=A"));
             if (pos >= 0)
                 list.append(line.left(pos));
         }
@@ -117,7 +117,7 @@ TQStringList Repositories::readConfigFile()
 
     // Some people actually use CVSROOT, so we add it here
     char *env;
-    if ( (env = ::getenv("CVSROOT")) != 0 && !list.contains(env))
+    if ( (env = ::getenv("CVSROOT")) != 0 && !list.tqcontains(env))
         list.append(env);
 
     return list;
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index a30a13ce..d152b1b0 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -40,7 +40,7 @@
 class RepositoryListItem : public KListViewItem
 {
 public:
-    RepositoryListItem(KListView* parent, const TQString& repo, bool loggedin);
+    RepositoryListItem(KListView* tqparent, const TQString& repo, bool loggedin);
     
     void setRsh(const TQString& rsh);
     void setServer(const TQString& server) { m_server = server; }
@@ -56,7 +56,7 @@ public:
     {
         TQString str = text(1);
         return (str.startsWith("ext (") ? str.mid(5, str.length()-6) 
-                                        : TQString::null);
+                                        : TQString());
     }
     TQString server() const { return m_server; }
     int compression() const
@@ -85,9 +85,9 @@ static bool LoginNeeded(const TQString& repository)
 }
 
 
-RepositoryListItem::RepositoryListItem(KListView* parent, const TQString& repo, 
+RepositoryListItem::RepositoryListItem(KListView* tqparent, const TQString& repo, 
                                        bool loggedin)
-    : KListViewItem(parent)
+    : KListViewItem(tqparent)
     , m_isLoggedIn(loggedin)
 {
     setText(0, repo);
@@ -105,7 +105,7 @@ void RepositoryListItem::setRsh(const TQString& rsh)
         method = "pserver";
     else if( repo.startsWith(":sspi:") )
         method = "sspi";
-    else if( repo.contains(':') )
+    else if( repo.tqcontains(':') )
     {
         method = "ext";
         if( !rsh.isEmpty() )
@@ -141,20 +141,20 @@ 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);
 }
 
 
 RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
-                                   TQWidget* parent, const char* name)
-    : KDialogBase(parent, name, true, i18n("Configure Access to Repositories"),
+                                   TQWidget* tqparent, const char* name)
+    : KDialogBase(tqparent, name, true, i18n("Configure Access to Repositories"),
                   Ok | Cancel | Help, Ok, true)
     , m_partConfig(cfg)
     , m_cvsService(cvsService)
@@ -170,7 +170,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
     m_repoList->addColumn(i18n("Repository"));
     m_repoList->addColumn(i18n("Method"));
     m_repoList->addColumn(i18n("Compression"));
-    m_repoList->addColumn(i18n("Status"));
+    m_repoList->addColumn(i18n("tqStatus"));
     m_repoList->setFocus();
 
     connect(m_repoList, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
@@ -178,7 +178,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
     connect(m_repoList, TQT_SIGNAL(selectionChanged()),
             this,       TQT_SLOT(slotSelectionChanged()));
 
-    KButtonBox* actionbox = new KButtonBox(mainWidget, KButtonBox::Vertical);
+    KButtonBox* actionbox = new KButtonBox(mainWidget, Qt::Vertical);
     TQPushButton* addbutton = actionbox->addButton(i18n("&Add..."));
     m_modifyButton = actionbox->addButton(i18n("&Modify..."));
     m_removeButton = actionbox->addButton(i18n("&Remove"));
@@ -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);
@@ -222,7 +222,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
 
     setHelp("accessing-repository");
 
-    setWFlags(Qt::WDestructiveClose | getWFlags());
+    setWFlags(TQt::WDestructiveClose | getWFlags());
 
     TQSize size = configDialogSize(m_partConfig, "RepositoryDialog");
     resize(size);
@@ -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());
@@ -319,7 +319,7 @@ void RepositoryDialog::slotOk()
 
 void RepositoryDialog::slotAddClicked()
 {
-    AddRepositoryDialog dlg(m_partConfig, TQString::null, this);
+    AddRepositoryDialog dlg(m_partConfig, TQString(), this);
     // default compression level
     dlg.setCompression(-1);
     if( dlg.exec() )
@@ -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());
@@ -501,4 +501,4 @@ void RepositoryDialog::writeRepositoryData(RepositoryListItem* item)
 
 #include "repositorydlg.moc"
 
-// kate: space-indent on; indent-width 4; replace-tabs on;
+// kate: space-indent on; indent-width 4; tqreplace-tabs on;
diff --git a/cervisia/repositorydlg.h b/cervisia/repositorydlg.h
index 9fd7cc3c..3dc7d2f5 100644
--- a/cervisia/repositorydlg.h
+++ b/cervisia/repositorydlg.h
@@ -36,10 +36,11 @@ class RepositoryListItem;
 class RepositoryDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
-                     TQWidget* parent = 0, const char* name = 0);
+                     TQWidget* tqparent = 0, const char* name = 0);
     virtual ~RepositoryDialog();
 
     void readConfigFile();
@@ -74,4 +75,4 @@ private:
 #endif
 
 
-// kate: space-indent on; indent-width 4; replace-tabs on;
+// kate: space-indent on; indent-width 4; tqreplace-tabs on;
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index 8fce2ee7..5bf34db3 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -68,11 +68,11 @@ public:
         // already reach end of text on previous call
         if( m_endPos < 0 )
         {
-            m_currentLine = TQString::null;
+            m_currentLine = TQString();
             return m_currentLine;
         }
         
-        m_endPos = m_text.find('\n', m_startPos);
+        m_endPos = m_text.tqfind('\n', m_startPos);
         
         int length    = m_endPos - m_startPos + 1;
         m_currentLine = m_text.mid(m_startPos, length);
@@ -95,8 +95,8 @@ private:
 }
 
 
-ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, false, TQString::null,
+ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, false, TQString(),
                   Close | Help | User1 | User2, Close, true,
                   KStdGuiItem::saveAs(), KStdGuiItem::save())
     , markeditem(-1)
@@ -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(TQSplitter::Vertical, mainWidget);
+    TQSplitter *vertSplitter = new TQSplitter(Qt::Vertical, mainWidget);
 
-    TQSplitter *splitter = new TQSplitter(TQSplitter::Horizontal, vertSplitter);
+    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()) );
@@ -187,7 +187,7 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
 
     setHelp("resolvingconflicts");
 
-    setWFlags(Qt::WDestructiveClose | getWFlags());
+    setWFlags(TQt::WDestructiveClose | getWFlags());
 
     TQSize size = configDialogSize(partConfig, "ResolveDialog");
     resize(size);
@@ -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;
   
@@ -369,7 +369,7 @@ TQString ResolveDialog::readFile()
 {
     TQFile f(fname);
     if( !f.open(IO_ReadOnly) )
-        return TQString::null;
+        return TQString();
 
     TQTextStream stream(&f);
     TQTextCodec* codec = DetectCodec(fname);
@@ -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/resolvedlg.h b/cervisia/resolvedlg.h
index 461d8461..4f169847 100644
--- a/cervisia/resolvedlg.h
+++ b/cervisia/resolvedlg.h
@@ -38,11 +38,12 @@ class ResolveItem;
 class ResolveDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum ChooseType { ChA, ChB, ChAB, ChBA, ChEdit };
 
-    explicit ResolveDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
+    explicit ResolveDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
     virtual ~ResolveDialog();
 
     bool parseFile(const TQString &name);
diff --git a/cervisia/resolvedlg_p.cpp b/cervisia/resolvedlg_p.cpp
index 1023465a..f5bbdf2f 100644
--- a/cervisia/resolvedlg_p.cpp
+++ b/cervisia/resolvedlg_p.cpp
@@ -22,8 +22,8 @@ using namespace Cervisia;
 #include <ktextedit.h>
 
 
-ResolveEditorDialog::ResolveEditorDialog(KConfig& cfg, TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, true, TQString::null,
+ResolveEditorDialog::ResolveEditorDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, true, TQString(),
                   Ok | Cancel, Ok, true)
     , m_partConfig(cfg)
 {
diff --git a/cervisia/resolvedlg_p.h b/cervisia/resolvedlg_p.h
index 680da0a6..463561c2 100644
--- a/cervisia/resolvedlg_p.h
+++ b/cervisia/resolvedlg_p.h
@@ -33,7 +33,7 @@ namespace Cervisia
 class ResolveEditorDialog : public KDialogBase
 {
 public:
-    explicit ResolveEditorDialog(KConfig& cfg, TQWidget* parent=0, const char* name=0);
+    explicit ResolveEditorDialog(KConfig& cfg, TQWidget* tqparent=0, const char* name=0);
     virtual ~ResolveEditorDialog();
 
     void setContent(const TQString& text);
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index 1d50b6c1..ba08273a 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -52,14 +52,14 @@ 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);
     }
 }
 
 
-FontButton::FontButton( const TQString &text, TQWidget *parent, const char *name )
-    : TQPushButton(text, parent, name)
+FontButton::FontButton( const TQString &text, TQWidget *tqparent, const char *name )
+    : TQPushButton(text, tqparent, name)
 {
     connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseFont()) );
 }
@@ -73,15 +73,15 @@ void FontButton::chooseFont()
         return;
 
     setFont(newFont);
-    repaint(false);
+    tqrepaint(false);
 }
 
 
-SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *name )
+SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *tqparent, const char *name )
     : KDialogBase(KDialogBase::IconList, i18n("Configure Cervisia"),
       KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help,
       KDialogBase::Ok,
-      parent, name, true)
+      tqparent, name, true)
 {
     config = conf;
 
@@ -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();
@@ -234,26 +234,26 @@ void SettingsDialog::done(int res)
  */
 void SettingsDialog::addGeneralPage()
 {
-    TQFrame* generalPage = addPage(i18n("General"), TQString::null,
+    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();
 }
 
 
@@ -262,8 +262,8 @@ void SettingsDialog::addGeneralPage()
  */
 void SettingsDialog::addDiffPage()
 {
-    TQGrid *diffPage = addGridPage(2, TQGrid::Horizontal, i18n("Diff Viewer"),
-                                  TQString::null, LoadIcon("vcs_diff"));
+    TQGrid *diffPage = addGridPage(2, Qt::Horizontal, i18n("Diff Viewer"),
+                                  TQString(), LoadIcon("vcs_diff"));
 
     TQLabel *contextlabel = new TQLabel( i18n("&Number of context lines in diff dialog:"), diffPage );
     contextedit = new KIntNumInput( 0, diffPage );
@@ -293,13 +293,13 @@ void SettingsDialog::addDiffPage()
  */
 void SettingsDialog::addStatusPage()
 {
-    TQVBox* statusPage = addVBoxPage(i18n("Status"), TQString::null,
+    TQVBox* statusPage = addVBoxPage(i18n("tqStatus"), TQString(),
                                     LoadIcon("fork"));
 
     remotestatusbox = new TQCheckBox(i18n("When opening a sandbox from a &remote repository,\n"
-                                         "start a File->Status command automatically"), statusPage);
+                                         "start a File->tqStatus command automatically"), statusPage);
     localstatusbox = new TQCheckBox(i18n("When opening a sandbox from a &local repository,\n"
-                                        "start a File->Status command automatically"), statusPage);
+                                        "start a File->tqStatus command automatically"), statusPage);
 
     // dummy widget to take up the vertical space
     new TQWidget(statusPage);
@@ -311,7 +311,7 @@ void SettingsDialog::addStatusPage()
  */
 void SettingsDialog::addAdvancedPage()
 {
-    TQVBox* frame = addVBoxPage(i18n("Advanced"), TQString::null,
+    TQVBox* frame = addVBoxPage(i18n("Advanced"), TQString(),
                                LoadIcon("configure"));
 
     m_advancedPage = new AdvancedPage(frame);
@@ -325,7 +325,7 @@ void SettingsDialog::addAdvancedPage()
  */
 void SettingsDialog::addLookAndFeelPage()
 {
-    TQVBox* lookPage = addVBoxPage(i18n("Appearance"), TQString::null,
+    TQVBox* lookPage = addVBoxPage(i18n("Appearance"), TQString(),
                                   LoadIcon("looknfeel"));
 
     TQGroupBox* fontGroupBox = new TQGroupBox(4, Qt::Vertical, i18n("Fonts"),
@@ -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.h b/cervisia/settingsdlg.h
index 190840d9..ad189bde 100644
--- a/cervisia/settingsdlg.h
+++ b/cervisia/settingsdlg.h
@@ -35,12 +35,13 @@ class KURLRequester;
 class AdvancedPage;
 
 
-class FontButton : public QPushButton
+class FontButton : public TQPushButton
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FontButton( const TQString &text, TQWidget *parent=0, const char *name=0 );
+    FontButton( const TQString &text, TQWidget *tqparent=0, const char *name=0 );
 
 private slots:
     void chooseFont();
@@ -50,9 +51,10 @@ private slots:
 class SettingsDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SettingsDialog( KConfig *conf, TQWidget *parent=0, const char *name=0 );
+    SettingsDialog( KConfig *conf, TQWidget *tqparent=0, const char *name=0 );
     virtual ~SettingsDialog();
 
 protected slots:
diff --git a/cervisia/settingsdlg_advanced.ui b/cervisia/settingsdlg_advanced.ui
index 232c2678..1e129e04 100644
--- a/cervisia/settingsdlg_advanced.ui
+++ b/cervisia/settingsdlg_advanced.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AdvancedPage</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>advancedPage</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -26,14 +26,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>31</width>
                     <height>41</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>timeoutLbl</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <cstring>kcfg_Timeout</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>compressionLbl</cstring>
             </property>
@@ -55,7 +55,7 @@
                 <cstring>kcfg_Compression</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>kcfg_UseSshAgent</cstring>
             </property>
@@ -87,7 +87,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="0"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/cervisia/stringmatcher.cpp b/cervisia/stringmatcher.cpp
index 6e70a6e0..189ee925 100644
--- a/cervisia/stringmatcher.cpp
+++ b/cervisia/stringmatcher.cpp
@@ -43,7 +43,7 @@ namespace
 
 bool StringMatcher::match(const TQString& text) const
 {
-    if (m_exactPatterns.find(text) != m_exactPatterns.end())
+    if (m_exactPatterns.tqfind(text) != m_exactPatterns.end())
     {
         return true;
     }
@@ -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 7dc3df0c..3563c381 100644
--- a/cervisia/tagdlg.cpp
+++ b/cervisia/tagdlg.cpp
@@ -35,8 +35,8 @@
 using Cervisia::TagDialog;
 
 TagDialog::TagDialog(ActionType action, CvsService_stub* service,
-                     TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, true, TQString::null,
+                     TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, true, TQString(),
                   Ok | Cancel | Help, Ok, true),
       act(action),
       cvsService(service),
@@ -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/tagdlg.h b/cervisia/tagdlg.h
index cd9edcda..57d720bf 100644
--- a/cervisia/tagdlg.h
+++ b/cervisia/tagdlg.h
@@ -36,12 +36,13 @@ namespace Cervisia
 class TagDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum ActionType { Create, Delete };
     
     TagDialog( ActionType action, CvsService_stub* service,
-               TQWidget *parent=0, const char *name=0 );
+               TQWidget *tqparent=0, const char *name=0 );
 
     bool branchTag() const;
     bool forceTag() const;
diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp
index 728945ca..efc5108e 100644
--- a/cervisia/tooltip.cpp
+++ b/cervisia/tooltip.cpp
@@ -49,8 +49,8 @@ void ToolTip::maybeTip(const TQPoint& pos)
     {
         text = truncateLines(text,
                              font(),
-                             parentWidget()->mapToGlobal(pos),
-                             KGlobalSettings::desktopGeometry(parentWidget()));
+                             tqparentWidget()->mapToGlobal(pos),
+                             KGlobalSettings::desktopGeometry(tqparentWidget()));
         tip(rect, text);
     }
 }
@@ -66,18 +66,18 @@ TQString truncateLines(const TQString&      text,
     const TQChar newLine('\n');
 
     const int lineSpacing(fm.lineSpacing());
-    const int numberOfLines(text.contains(newLine) + 1);
+    const int numberOfLines(text.tqcontains(newLine) + 1);
     const int maxNumberOfLines(size.height() / lineSpacing);
 
     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);
 }
 
 
@@ -94,12 +94,12 @@ TQString truncateLines(const TQString& text,
                        - desktopGeometry.top() - 10);
 
     // calculate the tooltip's size
-    const TQSimpleRichText layoutedText(text, font);
+    const TQSimpleRichText tqlayoutedText(text, font);
 
     // only if the tooltip's size is bigger in x- and y-direction the text must
     // be truncated otherwise the tip is moved to a position where it fits
-    return  ((layoutedText.widthUsed() > maxWidth)
-             && (layoutedText.height() > maxHeight))
+    return  ((tqlayoutedText.widthUsed() > maxWidth)
+             && (tqlayoutedText.height() > maxHeight))
         ? truncateLines(text, TQFontMetrics(font), TQSize(maxWidth, maxHeight))
         : text;
 }
diff --git a/cervisia/tooltip.h b/cervisia/tooltip.h
index f6a47999..1036af5b 100644
--- a/cervisia/tooltip.h
+++ b/cervisia/tooltip.h
@@ -34,15 +34,16 @@ namespace Cervisia
  * - no more need to subclass just connect to the signal queryToolTip()
  * - truncate too large tooltip texts.
  */
-class ToolTip : public TQObject, public QToolTip
+class ToolTip : public TQObject, public TQToolTip
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
     /**
      * @param widget The widget you want to add tooltips to. It's also used as
-     * parent for the TQObject. So you don't have to free an instance of this
+     * tqparent for the TQObject. So you don't have to free an instance of this
      * class yourself.
      */
     explicit ToolTip(TQWidget* widget);
@@ -54,9 +55,9 @@ signals:
      * wants to display anythink it must set a valid tooltip rectangle and a
      * non empty text.
      *
-     * @param pos The position of the tooltip in the parent widget's coordinate system.
+     * @param pos The position of the tooltip in the tqparent widget's coordinate system.
      *
-     * @param rect The rectangle in the parent widget's coordinate system where the
+     * @param rect The rectangle in the tqparent widget's coordinate system where the
      * tooltip is valid.
      *
      * @param text The tooltip text.
diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp
index 4cd4367c..71e88ebe 100644
--- a/cervisia/updatedlg.cpp
+++ b/cervisia/updatedlg.cpp
@@ -34,21 +34,21 @@
 
 
 UpdateDialog::UpdateDialog(CvsService_stub* service,
-                           TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, true, i18n("CVS Update"),
+                           TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, true, i18n("CVS Update"),
                   Ok | Cancel, Ok, true),
       cvsService(service)
 {
     int const iComboBoxMinWidth(40 * fontMetrics().width('0'));
-    int const iWidgetIndent(style().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/updatedlg.h b/cervisia/updatedlg.h
index de7b7354..883342b4 100644
--- a/cervisia/updatedlg.h
+++ b/cervisia/updatedlg.h
@@ -35,10 +35,11 @@ class CvsService_stub;
 class UpdateDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     UpdateDialog( CvsService_stub* service,
-                  TQWidget *parent=0, const char *name=0 );
+                  TQWidget *tqparent=0, const char *name=0 );
 
     bool byTag() const;
     TQString tag() const;
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 710eabd8..62e691ee 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -35,11 +35,11 @@
 
 
 using Cervisia::Entry;
-using Cervisia::EntryStatus;
+using Cervisia::EntrytqStatus;
 
 
-UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
-    : KListView(parent, name),
+UpdateView::UpdateView(KConfig& partConfig, TQWidget *tqparent, const char *name)
+    : KListView(tqparent, name),
       m_partConfig(partConfig),
       m_unfoldingTree(false)
 {
@@ -49,7 +49,7 @@ UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
 
     addColumn(i18n("File Name"), 280);
     addColumn(i18n("File Type"), 180);
-    addColumn(i18n("Status"), 90);
+    addColumn(i18n("tqStatus"), 90);
     addColumn(i18n("Revision"), 70);
     addColumn(i18n("Tag/Date"), 90);
     addColumn(i18n("Timestamp"), 120);
@@ -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"));
 }
 
 
@@ -191,9 +191,9 @@ bool UpdateView::isUnfoldingTree() const
 void UpdateView::replaceItem(TQListViewItem* oldItem,
                              TQListViewItem* newItem)
 {
-    const int index(relevantSelection.find(oldItem));
+    const int index(relevantSelection.tqfind(oldItem));
     if (index >= 0)
-        relevantSelection.replace(index, newItem);
+        relevantSelection.tqreplace(index, newItem);
 }
 
 
@@ -208,8 +208,8 @@ void UpdateView::unfoldSelectedFolders()
 
     // setup name of selected folder
     TQString selectedItem = selection.first();
-    if( selectedItem.contains('/') )
-        selectedItem.remove(0, selectedItem.findRev('/')+1);
+    if( selectedItem.tqcontains('/') )
+        selectedItem.remove(0, selectedItem.tqfindRev('/')+1);
 
     // avoid flicker
     const bool updatesEnabled = isUpdatesEnabled();
@@ -234,7 +234,7 @@ void UpdateView::unfoldSelectedFolders()
                     dirItem->maybeScanDir(recursive);
 
                     // scanning can take some time so keep the gui alive
-                    qApp->processEvents();
+                    tqApp->processEvents();
                 }
 
                 dirItem->setOpen(!isUnfolded);
@@ -254,7 +254,7 @@ void UpdateView::unfoldSelectedFolders()
                     dirItem->maybeScanDir(recursive);
 
                     // scanning can take some time so keep the gui alive
-                    qApp->processEvents();
+                    tqApp->processEvents();
                 }
 
                 dirItem->setOpen(!isUnfolded);
@@ -305,7 +305,7 @@ void UpdateView::unfoldTree()
                 dirItem->maybeScanDir(recursive);
 
                 // scanning can take some time so keep the gui alive
-                qApp->processEvents();
+                tqApp->processEvents();
             }
 
             dirItem->setOpen(true);
@@ -333,7 +333,7 @@ void UpdateView::foldTree()
     while (TQListViewItem* item = it.current())
     {
         // don't close the top level directory
-        if (isDirItem(item) && item->parent())
+        if (isDirItem(item) && item->tqparent())
             item->setOpen(false);
 
         ++it;
@@ -500,8 +500,8 @@ void UpdateView::syncSelection()
         UpdateDirItem* dirItem(0);
         if (isDirItem(item))
             dirItem = static_cast<UpdateDirItem*>(item);
-        else if (TQListViewItem* parentItem = item->parent())
-            dirItem = static_cast<UpdateDirItem*>(parentItem);
+        else if (TQListViewItem* tqparentItem = item->tqparent())
+            dirItem = static_cast<UpdateDirItem*>(tqparentItem);
 
         if (dirItem)
             setDirItems.insert(dirItem);
@@ -518,7 +518,7 @@ void UpdateView::syncSelection()
         dirItem->syncWithDirectory();
         dirItem->syncWithEntries();
 
-        qApp->processEvents();
+        tqApp->processEvents();
     }
 
     TQApplication::restoreOverrideCursor();
@@ -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 d583b16b..ecf5fcf4 100644
--- a/cervisia/updateview.h
+++ b/cervisia/updateview.h
@@ -35,6 +35,7 @@ class KConfig;
 class UpdateView : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
 
@@ -42,7 +43,7 @@ public:
                   NoRemoved=4, NoNotInCVS=8 , NoEmptyDirectories = 16 };
     enum Action { Add, Remove, Update, UpdateNoAct, Commit };
     
-    explicit UpdateView(KConfig& partConfig, TQWidget *parent=0, const char *name=0);
+    explicit UpdateView(KConfig& partConfig, TQWidget *tqparent=0, const char *name=0);
 
     virtual ~UpdateView();
 
@@ -85,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 582c9aae..efa83593 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -39,7 +39,7 @@
 
 
 using Cervisia::Entry;
-using Cervisia::EntryStatus;
+using Cervisia::EntrytqStatus;
 
 
 // ------------------------------------------------------------------------------
@@ -51,16 +51,16 @@ TQString UpdateItem::dirPath() const
 {
     TQString path;
 
-    const UpdateItem* item = static_cast<UpdateItem*>(parent());
+    const UpdateItem* item = static_cast<UpdateItem*>(tqparent());
     while (item)
     {
-        const UpdateItem* parentItem = static_cast<UpdateItem*>(item->parent());
-        if (parentItem)
+        const UpdateItem* tqparentItem = static_cast<UpdateItem*>(item->tqparent());
+        if (tqparentItem)
         {
             path.prepend(item->m_entry.m_name + TQDir::separator());
         }
 
-        item = parentItem;
+        item = tqparentItem;
     }
 
     return path;
@@ -70,7 +70,7 @@ TQString UpdateItem::dirPath() const
 TQString UpdateItem::filePath() const
 {
     // the filePath of the root item is '.'
-    return parent() ? dirPath() + m_entry.m_name : TQChar('.');
+    return tqparent() ? dirPath() + m_entry.m_name : TQChar('.');
 }
 
 
@@ -79,9 +79,9 @@ TQString UpdateItem::filePath() const
 // ------------------------------------------------------------------------------
 
 
-UpdateDirItem::UpdateDirItem(UpdateDirItem* parent,
+UpdateDirItem::UpdateDirItem(UpdateDirItem* tqparent,
                              const Entry& entry)
-    : UpdateItem(parent, entry),
+    : UpdateItem(tqparent, entry),
       m_opened(false)
 {
     setExpandable(true);
@@ -89,9 +89,9 @@ UpdateDirItem::UpdateDirItem(UpdateDirItem* parent,
 }
 
 
-UpdateDirItem::UpdateDirItem(UpdateView* parent,
+UpdateDirItem::UpdateDirItem(UpdateView* tqparent,
                              const Entry& entry)
-    : UpdateItem(parent, entry),
+    : UpdateItem(tqparent, entry),
       m_opened(false)
 {
     setExpandable(true);
@@ -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);
@@ -175,10 +175,10 @@ void UpdateDirItem::scanDirectory()
 
     const CvsDir dir(path);
 
-    const QFileInfoList *files = dir.entryInfoList();
+    const TQFileInfoList *files = dir.entryInfoList();
     if (files)
     {
-        QFileInfoListIterator it(*files);
+        TQFileInfoListIterator it(*files);
         for (; it.current(); ++it)
         {
             Entry entry;
@@ -217,7 +217,7 @@ UpdateFileItem* UpdateDirItem::createFileItem(const Entry& entry)
 
 UpdateItem* UpdateDirItem::insertItem(UpdateItem* item)
 {
-    QPair<TMapItemsByName::iterator, bool> result
+    TQPair<TMapItemsByName::iterator, bool> result
         = m_itemsByName.insert(TMapItemsByName::value_type(item->entry().m_name, item));
     if (!result.second)
     {
@@ -245,15 +245,15 @@ UpdateItem* UpdateDirItem::insertItem(UpdateItem* item)
 
 UpdateItem* UpdateDirItem::findItem(const TQString& name) const
 {
-    const TMapItemsByName::const_iterator it = m_itemsByName.find(name);
+    const TMapItemsByName::const_iterator it = m_itemsByName.tqfind(name);
 
     return (it != m_itemsByName.end()) ? *it : 0;
 }
 
-// Qt-3.3.8 changed the parsing in TQDateTime::fromString() but introduced
+// TQt-3.3.8 changed the parsing in TQDateTime::fromString() but introduced
 // a bug which leads to the problem that days with 1 digit will incorrectly being
 // parsed as day 0 - which is invalid.
-// workaround with the implementation from Qt-3.3.6
+// workaround with the implementation from TQt-3.3.6
 TQDateTime parseDateTime(const TQString &s)
 {
         static const char * const qt_shortMonthNames[] = {
@@ -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.tqfind( 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();
@@ -337,7 +337,7 @@ void UpdateDirItem::syncWithEntries()
                 const TQString options(line.section('/', 4, 4));
                 entry.m_tag = line.section('/', 5, 5);
 
-                const bool isBinary(options.find("-kb") >= 0);
+                const bool isBinary(options.tqfind("-kb") >= 0);
 
                 // file date in local time
                 entry.m_dateTime = TQFileInfo(path + entry.m_name).lastModified();
@@ -349,13 +349,13 @@ void UpdateDirItem::syncWithEntries()
                     entry.m_status = Cervisia::LocallyRemoved;
                     rev.remove(0, 1);
                 }
-                else if (timestamp.find('+') >= 0)
+                else if (timestamp.tqfind('+') >= 0)
                 {
                     entry.m_status = Cervisia::Conflict;
                 }
                 else
                 {
-                    // workaround Qt-3.3.8 bug with our own function (see function above)
+                    // workaround TQt-3.3.8 bug with our own function (see function above)
                     // const TQDateTime date(TQDateTime::fromString(timestamp)); // UTC Time
                     const TQDateTime date(parseDateTime(timestamp)); // UTC Time
                     TQDateTime fileDateUTC;
@@ -392,8 +392,8 @@ void UpdateDirItem::syncWithDirectory()
             // is file removed?
             if (!dir.exists(it.key()))
             {
-                fileItem->setStatus(Cervisia::Removed);
-                fileItem->setRevTag(TQString::null, TQString::null);
+                fileItem->settqStatus(Cervisia::Removed);
+                fileItem->setRevTag(TQString(), TQString());
             }
         }
     }
@@ -494,21 +494,21 @@ TQString UpdateDirItem::text(int column) const
 // ------------------------------------------------------------------------------
 
 
-UpdateFileItem::UpdateFileItem(UpdateDirItem* parent, const Entry& entry)
-    : UpdateItem(parent, entry),
+UpdateFileItem::UpdateFileItem(UpdateDirItem* tqparent, const Entry& entry)
+    : UpdateItem(tqparent, entry),
       m_undefined(false)
 {
 }
 
 
-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 0b24ca85..83bd0efc 100644
--- a/cervisia/updateview_items.h
+++ b/cervisia/updateview_items.h
@@ -38,20 +38,20 @@ class Visitor;
 UpdateDirItem* findOrCreateDirItem(const TQString&, UpdateDirItem*);
 
 
-class UpdateItem : public QListViewItem
+class UpdateItem : public TQListViewItem
 {
 public:
 
-    UpdateItem(UpdateView* parent, const Cervisia::Entry& entry)
-        : TQListViewItem(parent), m_entry(entry) {}
-    UpdateItem(UpdateItem* parent, const Cervisia::Entry& entry)
-        : TQListViewItem(parent), m_entry(entry) {}
+    UpdateItem(UpdateView* tqparent, const Cervisia::Entry& entry)
+        : TQListViewItem(tqparent), m_entry(entry) {}
+    UpdateItem(UpdateItem* tqparent, const Cervisia::Entry& entry)
+        : TQListViewItem(tqparent), m_entry(entry) {}
 
     const Cervisia::Entry& entry() const { return m_entry; }
 
     // Returns the path (relative to the repository).
-    // TQString::null for the root item and its (direct) children.
-    // If it's not TQString::null it ends with '/'.
+    // TQString() for the root item and its (direct) tqchildren.
+    // If it's not TQString() it ends with '/'.
     TQString dirPath() const;
 
     // Returns the file name, including the path (relative to the repository)
@@ -73,12 +73,12 @@ public:
 
     enum { Name };
 
-    UpdateDirItem(UpdateView* parent, const Cervisia::Entry& entry);
-    UpdateDirItem(UpdateDirItem* parent, const Cervisia::Entry& entry);
+    UpdateDirItem(UpdateView* tqparent, const Cervisia::Entry& entry);
+    UpdateDirItem(UpdateDirItem* tqparent, const Cervisia::Entry& entry);
 
     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,9 +119,9 @@ 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);
+    UpdateFileItem(UpdateDirItem* tqparent, const Cervisia::Entry& entry);
 
     bool undefinedState() const
     { return m_undefined; }
@@ -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..74e7f41b 100644
--- a/cervisia/updateview_visitors.cpp
+++ b/cervisia/updateview_visitors.cpp
@@ -47,14 +47,14 @@ 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)
+    // - it has no tqparent (top level item)
     const bool visible(!m_invisibleDirItems.count(item)
                        || !item->wasScanned()
                        || !(m_filter & UpdateView::NoEmptyDirectories)
-                       || !item->parent());
+                       || !item->tqparent());
 
     // only set invisible as TQListViewItem::setVisible() is recursive
     // and so maybe overrides the state applied by the filter
@@ -81,7 +81,7 @@ void ApplyFilterVisitor::visit(UpdateFileItem* item)
 
 void ApplyFilterVisitor::markAllParentsAsVisible(UpdateItem* item)
 {
-    while ((item = static_cast<UpdateDirItem*>(item->parent())))
+    while ((item = static_cast<UpdateDirItem*>(item->tqparent())))
     {
         TItemSet::iterator it = m_invisibleDirItems.find(item);
         if (it != m_invisibleDirItems.end())
@@ -90,7 +90,7 @@ void ApplyFilterVisitor::markAllParentsAsVisible(UpdateItem* item)
         }
         else
         {
-            // if this item isn't in the map anymore all parents
+            // if this item isn't in the map anymore all tqparents
             // are already removed too
             break;
         }
diff --git a/cervisia/watchdlg.cpp b/cervisia/watchdlg.cpp
index 1ea42da6..2e1fc74e 100644
--- a/cervisia/watchdlg.cpp
+++ b/cervisia/watchdlg.cpp
@@ -28,45 +28,45 @@
 #include <klocale.h>
 
 
-WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name)
-    : KDialogBase(parent, name, true, TQString::null,
+WatchDialog::WatchDialog(ActionType action, TQWidget *tqparent, const char *name)
+    : KDialogBase(tqparent, name, true, TQString(),
                   Ok | Cancel | Help, Ok, true)
 {
     setCaption( (action==Add)? i18n("CVS Watch Add") : i18n("CVS Watch Remove") );
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
-    TQLabel *textlabel = new QLabel
+    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/watchdlg.h b/cervisia/watchdlg.h
index ea7e9b39..3189d676 100644
--- a/cervisia/watchdlg.h
+++ b/cervisia/watchdlg.h
@@ -35,7 +35,7 @@ public:
     enum ActionType { Add, Remove };
     enum Events { None=0, All=1, Commits=2, Edits=4, Unedits=8 };
 
-    explicit WatchDialog( ActionType action, TQWidget *parent=0, const char *name=0 );
+    explicit WatchDialog( ActionType action, TQWidget *tqparent=0, const char *name=0 );
 
     Events events() const;
 
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index 157f154b..ea42f053 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -30,14 +30,14 @@
 #include "progressdlg.h"
 
 
-WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
-    : KDialogBase(parent, name, false, TQString::null,
+WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* tqparent, const char* name)
+    : KDialogBase(tqparent, name, false, TQString(),
                   Close, ButtonCode(0), true)
     , partConfig(cfg)
 {
     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,9 +57,9 @@ 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(Qt::WDestructiveClose | getWFlags());
+    setWFlags(TQt::WDestructiveClose | getWFlags());
 
     TQSize size = configDialogSize(partConfig, "WatchersDialog");
     resize(size);
@@ -103,15 +103,15 @@ bool WatchersDialog::parseWatchers(CvsService_stub* cvsService,
         table->setText(numRows, 1, list[1]);
 
         TQCheckTableItem* item = new TQCheckTableItem(table, "");
-        item->setChecked(list.contains("edit"));
+        item->setChecked(list.tqcontains("edit"));
         table->setItem(numRows, 2, item);
 
         item = new TQCheckTableItem(table, "");
-        item->setChecked(list.contains("unedit"));
+        item->setChecked(list.tqcontains("unedit"));
         table->setItem(numRows, 3, item);
 
         item = new TQCheckTableItem(table, "");
-        item->setChecked(list.contains("commit"));
+        item->setChecked(list.tqcontains("commit"));
         table->setItem(numRows, 4, item);
 
         ++numRows;
diff --git a/cervisia/watchersdlg.h b/cervisia/watchersdlg.h
index fff50d88..9cfb023a 100644
--- a/cervisia/watchersdlg.h
+++ b/cervisia/watchersdlg.h
@@ -31,7 +31,7 @@ class CvsService_stub;
 class WatchersDialog : public KDialogBase
 {
 public:
-    explicit WatchersDialog(KConfig& cfg, TQWidget* parent = 0,
+    explicit WatchersDialog(KConfig& cfg, TQWidget* tqparent = 0,
                             const char* name = 0);
     virtual ~WatchersDialog();