rename the following methods:

tqparent parent
tqmask mask


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

72 files changed, 155 insertions, 155 deletions

diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp
index 8af207a5..73c41d12 100644
--- a/cervisia/addremovedlg.cpp
+++ b/cervisia/addremovedlg.cpp
@@ -30,8 +30,8 @@
 #include <klocale.h>
 
 
-AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* tqparent, const char* name)
-    : KDialogBase(tqparent, name, true, TQString(),
+AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char* name)
+    : KDialogBase(parent, name, true, TQString(),
                   Ok | Cancel | Help, Ok, true)
 {
     setCaption( (action==Add)?       i18n("CVS Add") :
diff --git a/cervisia/addremovedlg.h b/cervisia/addremovedlg.h
index b40452e6..e18547f2 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* tqparent=0, const char* name=0);
+    explicit AddRemoveDialog(ActionType action, TQWidget* parent=0, const char* name=0);
 
     void setFileList(const TQStringList& files);
 
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index 0da05021..e451fca0 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -33,8 +33,8 @@
 
 
 AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo, 
-                                         TQWidget* tqparent, const char* name)
-    : KDialogBase(tqparent, name, true, i18n("Add Repository"),
+                                         TQWidget* parent, const char* name)
+    : KDialogBase(parent, name, true, i18n("Add Repository"),
                   Ok | Cancel, Ok, true)
     , partConfig(cfg)
 {
diff --git a/cervisia/addrepositorydlg.h b/cervisia/addrepositorydlg.h
index 3e18c6d6..6704f517 100644
--- a/cervisia/addrepositorydlg.h
+++ b/cervisia/addrepositorydlg.h
@@ -36,7 +36,7 @@ class AddRepositoryDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    AddRepositoryDialog(KConfig& cfg, const TQString& repo, TQWidget* tqparent = 0,
+    AddRepositoryDialog(KConfig& cfg, const TQString& repo, TQWidget* parent = 0,
                          const char* name = 0);
     virtual ~AddRepositoryDialog();
 
diff --git a/cervisia/annotatedlg.cpp b/cervisia/annotatedlg.cpp
index e40a26bd..b1a0977c 100644
--- a/cervisia/annotatedlg.cpp
+++ b/cervisia/annotatedlg.cpp
@@ -23,8 +23,8 @@
 #include "annotateview.h"
 
 
-AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, false, TQString(),
+AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, false, TQString(),
                   Close | Help, Close, true)
     , partConfig(cfg)
 {
diff --git a/cervisia/annotatedlg.h b/cervisia/annotatedlg.h
index f0360e73..d9ba0317 100644
--- a/cervisia/annotatedlg.h
+++ b/cervisia/annotatedlg.h
@@ -39,7 +39,7 @@ class AnnotateDialog : public KDialogBase
 {
 public:
 
-    explicit AnnotateDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+    explicit AnnotateDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
 
     virtual ~AnnotateDialog();
 
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index c3b4634a..f3d80605 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -36,7 +36,7 @@ class AnnotateViewItem : public TQListViewItem
 public:
     enum { LineNumberColumn, AuthorColumn, ContentColumn };
 
-    AnnotateViewItem(AnnotateView *tqparent, const LogInfo& logInfo,
+    AnnotateViewItem(AnnotateView *parent, 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 *tqparent, const LogInfo& logInfo,
+AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, const LogInfo& logInfo,
                                    const TQString &content, bool odd, int linenumber)
-    : TQListViewItem(tqparent)
+    : TQListViewItem(parent)
     , m_logInfo(logInfo)
     , m_content(content)
     , m_odd(odd)
@@ -140,8 +140,8 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col
   caused by a bug in TQHeader::adjustHeaderSize() in TQt <= 3.0.4.
 */
 
-AnnotateView::AnnotateView(KConfig &cfg, TQWidget *tqparent, const char *name)
-    : TQListView(tqparent, name, WRepaintNoErase | WResizeNoErase)
+AnnotateView::AnnotateView(KConfig &cfg, TQWidget *parent, const char *name)
+    : TQListView(parent, name, WRepaintNoErase | WResizeNoErase)
 {
     setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
     setAllColumnsShowFocus(true);
diff --git a/cervisia/annotateview.h b/cervisia/annotateview.h
index acaafe24..e4c78b58 100644
--- a/cervisia/annotateview.h
+++ b/cervisia/annotateview.h
@@ -41,7 +41,7 @@ class AnnotateView : public TQListView
 
 public:
 
-    explicit AnnotateView( KConfig &cfg, TQWidget *tqparent=0, const char *name=0 );
+    explicit AnnotateView( KConfig &cfg, TQWidget *parent=0, const char *name=0 );
 
     void addLine(const Cervisia::LogInfo& logInfo, const TQString& content,
                  bool odd);
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 108a4fda..dea2bab8 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -81,8 +81,8 @@ using Cervisia::TagDialog;
 K_EXPORT_COMPONENT_FACTORY( libcervisiapart, CervisiaFactory )
 
 CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
-                            TQObject *tqparent, const char *name, const TQStringList& /*args*/ )
-    : KParts::ReadOnlyPart( tqparent, name )
+                            TQObject *parent, const char *name, const TQStringList& /*args*/ )
+    : KParts::ReadOnlyPart( parent, name )
     , hasRunningJob( false )
     , opt_hideFiles( false )
     , opt_hideUpToDate( false )
@@ -1931,7 +1931,7 @@ void CervisiaBrowserExtension::setPropertiesActionEnabled(bool enabled)
 
 void CervisiaBrowserExtension::properties()
 {
-    static_cast<CervisiaPart*>(tqparent())->slotFileProperties();
+    static_cast<CervisiaPart*>(parent())->slotFileProperties();
 }
 
 // Local Variables:
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index 337529e0..b802e8ad 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -57,7 +57,7 @@ class CervisiaPart : public KParts::ReadOnlyPart
 
 public:
     CervisiaPart( TQWidget *parentWidget, const char *widgetName,
-                  TQObject *tqparent, const char *name=0, const TQStringList& args = TQStringList());
+                  TQObject *parent, const char *name=0, const TQStringList& args = TQStringList());
     virtual ~CervisiaPart();
 
     /**
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index edaa3b6f..9d00a8e8 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -40,8 +40,8 @@ static inline TQString DateStringISO8601()
 ChangeLogDialog::Options *ChangeLogDialog::options = 0;
 
 
-ChangeLogDialog::ChangeLogDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, true, i18n("Edit ChangeLog"),
+ChangeLogDialog::ChangeLogDialog(KConfig& cfg, TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, true, i18n("Edit ChangeLog"),
                   Ok | Cancel, Ok, true)
     , partConfig(cfg)
 {
diff --git a/cervisia/changelogdlg.h b/cervisia/changelogdlg.h
index 54e36e87..ee7b8fc4 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 *tqparent=0, const char *name=0 );
+    explicit ChangeLogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
 
     virtual ~ChangeLogDialog();
 
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index f6ed66e8..9be04dd4 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* tqparent,
+                               ActionType action, TQWidget* parent,
                                const char* name)
-    : KDialogBase(tqparent, name, true, TQString(),
+    : KDialogBase(parent, name, true, TQString(),
                   Ok | Cancel | Help, Ok, true)
     , act(action)
     , partConfig(cfg)
diff --git a/cervisia/checkoutdlg.h b/cervisia/checkoutdlg.h
index 4e6d3b73..a6a8d70e 100644
--- a/cervisia/checkoutdlg.h
+++ b/cervisia/checkoutdlg.h
@@ -41,7 +41,7 @@ public:
     enum ActionType { Checkout, Import };
     
     CheckoutDialog( KConfig& cfg, CvsService_stub* service, ActionType action,
-                    TQWidget *tqparent=0, const char *name=0 );
+                    TQWidget *parent=0, const char *name=0 );
 
     TQString workingDirectory() const;
     TQString repository() const;
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index ff9fb144..a2e587f3 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -39,8 +39,8 @@
 class CommitListItem : public TQCheckListItem
 {
 public:
-    CommitListItem(TQListView* tqparent, const TQString& text, const TQString fileName)
-        : TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox)
+    CommitListItem(TQListView* parent, const TQString& text, const TQString fileName)
+        : TQCheckListItem(parent, text, TQCheckListItem::CheckBox)
         , m_fileName(fileName)
     {
     }
@@ -53,8 +53,8 @@ private:
 
 
 CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
-                           TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, true, i18n("CVS Commit"),
+                           TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, true, i18n("CVS Commit"),
                   Ok | Cancel | Help | User1, Ok, true)
     , partConfig(cfg)
     , cvsService(service)
diff --git a/cervisia/commitdlg.h b/cervisia/commitdlg.h
index 7ee5ee1b..2cc32846 100644
--- a/cervisia/commitdlg.h
+++ b/cervisia/commitdlg.h
@@ -40,7 +40,7 @@ class CommitDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    CommitDialog( KConfig& cfg, CvsService_stub* service, TQWidget *tqparent=0, 
+    CommitDialog( KConfig& cfg, CvsService_stub* service, TQWidget *parent=0, 
                   const char *name=0 );
 
     virtual ~CommitDialog();
diff --git a/cervisia/cvsinitdlg.cpp b/cervisia/cvsinitdlg.cpp
index f6be89d6..cf0b4641 100644
--- a/cervisia/cvsinitdlg.cpp
+++ b/cervisia/cvsinitdlg.cpp
@@ -32,8 +32,8 @@
 using Cervisia::CvsInitDialog;
 
 
-CvsInitDialog::CvsInitDialog(TQWidget* tqparent, const char* name)
-    : KDialogBase(tqparent, name, true, i18n("Create New Repository (cvs init)"),
+CvsInitDialog::CvsInitDialog(TQWidget* parent, const char* name)
+    : KDialogBase(parent, 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 f36d8742..e2d057cc 100644
--- a/cervisia/cvsinitdlg.h
+++ b/cervisia/cvsinitdlg.h
@@ -35,7 +35,7 @@ class CvsInitDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    CvsInitDialog(TQWidget* tqparent = 0, const char* name = 0);
+    CvsInitDialog(TQWidget* parent = 0, const char* name = 0);
 
     TQString directory() const;
    
diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp
index 6c6845f6..e263219b 100644
--- a/cervisia/cvsservice/sshagent.cpp
+++ b/cervisia/cvsservice/sshagent.cpp
@@ -36,8 +36,8 @@ TQString SshAgent::m_authSock   = TQString();
 TQString SshAgent::m_pid        = TQString();
 
 
-SshAgent::SshAgent(TQObject* tqparent, const char* name)
-    : TQObject(tqparent, name)
+SshAgent::SshAgent(TQObject* parent, const char* name)
+    : TQObject(parent, name)
 {
 }
 
diff --git a/cervisia/cvsservice/sshagent.h b/cervisia/cvsservice/sshagent.h
index e14bc0ae..65daaba6 100644
--- a/cervisia/cvsservice/sshagent.h
+++ b/cervisia/cvsservice/sshagent.h
@@ -34,7 +34,7 @@ class SshAgent : public TQObject
   TQ_OBJECT
 
 public:
-    SshAgent(TQObject* tqparent = 0, const char* name = 0);
+    SshAgent(TQObject* parent = 0, const char* name = 0);
     ~SshAgent();
 
     bool querySshAgent();
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index 1de5e48f..8d7ed8c8 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -41,8 +41,8 @@
 #include "diffview.h"
 
 
-DiffDialog::DiffDialog(KConfig& cfg, TQWidget *tqparent, const char *name, bool modal)
-    : KDialogBase(tqparent, name, modal, TQString(),
+DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool modal)
+    : KDialogBase(parent, name, modal, TQString(),
                   Close | Help | User1, Close, true, KStdGuiItem::saveAs())
     , partConfig(cfg)
 {
@@ -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-
-    // tqparent for the calling routines
+    // parent for the calling routines
 
     TQString extdiff = partConfig.readPathEntry("ExternalDiff");
     if (!extdiff.isEmpty())
diff --git a/cervisia/diffdlg.h b/cervisia/diffdlg.h
index eec4bee4..4539a915 100644
--- a/cervisia/diffdlg.h
+++ b/cervisia/diffdlg.h
@@ -41,7 +41,7 @@ class DiffDialog : public KDialogBase
 
 public:
 
-    explicit DiffDialog( KConfig& config, TQWidget *tqparent=0, const char *name=0, 
+    explicit DiffDialog( KConfig& config, TQWidget *parent=0, const char *name=0, 
                          bool modal=false );
 
     virtual ~DiffDialog();
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 7c77ec6e..554e6d3f 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 *tqparent, const char *name )
-    : QtTableView(tqparent, name, WRepaintNoErase)
+                    TQWidget *parent, const char *name )
+    : QtTableView(parent, name, WRepaintNoErase)
     , partConfig(cfg)
 {
     setNumRows(0);
@@ -388,8 +388,8 @@ void DiffView::wheelEvent(TQWheelEvent *e)
 }
 
 
-DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *tqparent, const char *name)
-    : TQFrame(tqparent, name)
+DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *parent, const char *name)
+    : TQFrame(parent, name)
 {
     tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
 
diff --git a/cervisia/diffview.h b/cervisia/diffview.h
index a0bee44a..2a2b998b 100644
--- a/cervisia/diffview.h
+++ b/cervisia/diffview.h
@@ -48,7 +48,7 @@ public:
     enum DiffType { Change, Insert, Delete, Neutral, Unchanged, Separator };
 
     DiffView( KConfig& cfg, bool withlinenos, bool withmarker,
-              TQWidget *tqparent=0, const char *name=0 );
+              TQWidget *parent=0, const char *name=0 );
 
     void setPartner(DiffView *other);
 
@@ -108,7 +108,7 @@ class DiffZoomWidget : public TQFrame
   TQ_OBJECT
 
 public:
-    DiffZoomWidget(KConfig& cfg, TQWidget *tqparent=0, const char *name=0);
+    DiffZoomWidget(KConfig& cfg, TQWidget *parent=0, const char *name=0);
     ~DiffZoomWidget();
 
     void setDiffView(DiffView *view);
diff --git a/cervisia/editwithmenu.cpp b/cervisia/editwithmenu.cpp
index b91283e8..d7d1044a 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* tqparent)
-    : TQObject(tqparent)
+EditWithMenu::EditWithMenu(const KURL& url, TQWidget* parent)
+    : TQObject(parent)
     , m_menu(0)
     , m_url(url)
 {
diff --git a/cervisia/editwithmenu.h b/cervisia/editwithmenu.h
index 88872621..199170be 100644
--- a/cervisia/editwithmenu.h
+++ b/cervisia/editwithmenu.h
@@ -36,7 +36,7 @@ class EditWithMenu : public TQObject
   TQ_OBJECT
 
 public:
-    EditWithMenu(const KURL& url, TQWidget* tqparent);
+    EditWithMenu(const KURL& url, TQWidget* parent);
     TQPopupMenu* menu();
 
 private slots:
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index b200002d..1eb3b6ee 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -56,8 +56,8 @@ public:
 
     enum { Date, Event, Author, Revision, File, Path };
 
-    HistoryItem(TQListView *tqparent, const TQDateTime& date)
-        : TQListViewItem(tqparent), m_date(date)
+    HistoryItem(TQListView *parent, const TQDateTime& date)
+        : TQListViewItem(parent), m_date(date)
     {}
 
     virtual int compare(TQListViewItem* i, int col, bool) const;
@@ -138,8 +138,8 @@ bool HistoryItem::isOther()
 }
 
 
-HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, false, TQString(),
+HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, false, TQString(),
                   Close | Help, ButtonCode(0), true)
     , partConfig(cfg)
 {
diff --git a/cervisia/historydlg.h b/cervisia/historydlg.h
index 7c0e4feb..d1a8fc3d 100644
--- a/cervisia/historydlg.h
+++ b/cervisia/historydlg.h
@@ -38,7 +38,7 @@ class HistoryDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    explicit HistoryDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+    explicit HistoryDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
     virtual ~HistoryDialog();
 
     bool parseHistory(CvsService_stub* cvsService);
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index b357493b..84954778 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -57,8 +57,8 @@
 #include "patchoptiondlg.h"
 
 
-LogDialog::LogDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, false, TQString(),
+LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, false, TQString(),
                   Ok | Apply | Close | Help | User1 | User2 | User3, Close, true,
                   KGuiItem(i18n("&Annotate")),
                   KGuiItem(i18n("&Diff"), "vcs_diff"),
diff --git a/cervisia/logdlg.h b/cervisia/logdlg.h
index 2214b227..3e6d3b66 100644
--- a/cervisia/logdlg.h
+++ b/cervisia/logdlg.h
@@ -55,7 +55,7 @@ class LogDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    explicit LogDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+    explicit LogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
 
     virtual ~LogDialog();
 
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index 39254ebc..439ba36f 100644
--- a/cervisia/loglist.cpp
+++ b/cervisia/loglist.cpp
@@ -106,8 +106,8 @@ int LogListViewItem::compare(TQListViewItem* i, int col, bool ascending) const
 }
 
 
-LogListView::LogListView(KConfig& cfg, TQWidget *tqparent, const char *name)
-    : KListView(tqparent, name)
+LogListView::LogListView(KConfig& cfg, TQWidget *parent, const char *name)
+    : KListView(parent, name)
     , partConfig(cfg)
 {
     setAllColumnsShowFocus(true);
diff --git a/cervisia/loglist.h b/cervisia/loglist.h
index 1ec26bbc..87aa245b 100644
--- a/cervisia/loglist.h
+++ b/cervisia/loglist.h
@@ -42,7 +42,7 @@ class LogListView : public KListView
   TQ_OBJECT
     
 public:
-    explicit LogListView( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+    explicit LogListView( KConfig& cfg, TQWidget *parent=0, const char *name=0 );
     virtual ~LogListView();
     
     void addRevision(const Cervisia::LogInfo& logInfo);
diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp
index 633981d6..90b0d405 100644
--- a/cervisia/logmessageedit.cpp
+++ b/cervisia/logmessageedit.cpp
@@ -26,8 +26,8 @@ using Cervisia::LogMessageEdit;
 #include <kaccel.h>
 
 
-LogMessageEdit::LogMessageEdit(TQWidget* tqparent)
-    : KTextEdit(tqparent)
+LogMessageEdit::LogMessageEdit(TQWidget* parent)
+    : KTextEdit(parent)
     , KCompletionBase()
     , m_completing(false)
     , m_completionStartPos(0)
diff --git a/cervisia/logmessageedit.h b/cervisia/logmessageedit.h
index 4d5321ed..04d90ad9 100644
--- a/cervisia/logmessageedit.h
+++ b/cervisia/logmessageedit.h
@@ -36,7 +36,7 @@ class LogMessageEdit : public KTextEdit, public KCompletionBase
   TQ_OBJECT
 
 public:
-    explicit LogMessageEdit(TQWidget* tqparent);
+    explicit LogMessageEdit(TQWidget* parent);
 
     virtual void setCompletedText(const TQString& match);
     virtual void setCompletedItems(const TQStringList& items);
diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp
index ad541f90..44754cd4 100644
--- a/cervisia/logplainview.cpp
+++ b/cervisia/logplainview.cpp
@@ -31,8 +31,8 @@
 using namespace Cervisia;
 
 
-LogPlainView::LogPlainView(TQWidget* tqparent, const char* name)
-    : KTextBrowser(tqparent, name)
+LogPlainView::LogPlainView(TQWidget* parent, const char* name)
+    : KTextBrowser(parent, name)
     , m_find(0)
     , m_findPos(0)
 {
diff --git a/cervisia/logplainview.h b/cervisia/logplainview.h
index 606ccf08..4b9cbaf6 100644
--- a/cervisia/logplainview.h
+++ b/cervisia/logplainview.h
@@ -37,7 +37,7 @@ class LogPlainView : public KTextBrowser
   TQ_OBJECT
 
 public:
-    explicit LogPlainView(TQWidget* tqparent = 0, const char* name = 0);
+    explicit LogPlainView(TQWidget* parent = 0, const char* name = 0);
     ~LogPlainView();
 
     void addRevision(const Cervisia::LogInfo& logInfo);
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index bda58b89..88684312 100644
--- a/cervisia/logtree.cpp
+++ b/cervisia/logtree.cpp
@@ -59,8 +59,8 @@ public:
 };
 
 
-LogTreeView::LogTreeView(TQWidget *tqparent, const char *name)
-    : TQTable(tqparent, name)
+LogTreeView::LogTreeView(TQWidget *parent, const char *name)
+    : TQTable(parent, name)
 {
     if (!static_initialized)
     {
diff --git a/cervisia/logtree.h b/cervisia/logtree.h
index 0180491d..f1af28b9 100644
--- a/cervisia/logtree.h
+++ b/cervisia/logtree.h
@@ -47,7 +47,7 @@ class LogTreeView : public TQTable
   TQ_OBJECT
 
 public:
-    explicit LogTreeView( TQWidget *tqparent=0, const char *name=0 );
+    explicit LogTreeView( TQWidget *parent=0, const char *name=0 );
 
     void addRevision(const Cervisia::LogInfo& logInfo);
     void setSelectedPair(TQString selectionA, TQString selectionB);
diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp
index d0f015ed..be371c62 100644
--- a/cervisia/mergedlg.cpp
+++ b/cervisia/mergedlg.cpp
@@ -34,8 +34,8 @@
 
 
 MergeDialog::MergeDialog(CvsService_stub* service,
-                         TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, true, i18n("CVS Merge"),
+                         TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, true, i18n("CVS Merge"),
                   Ok | Cancel, Ok, true),
       cvsService(service)
 {
diff --git a/cervisia/mergedlg.h b/cervisia/mergedlg.h
index 58327b74..25289224 100644
--- a/cervisia/mergedlg.h
+++ b/cervisia/mergedlg.h
@@ -38,7 +38,7 @@ class MergeDialog : public KDialogBase
 
 public:
     MergeDialog( CvsService_stub* service,
-                 TQWidget *tqparent=0, const char *name=0 );
+                 TQWidget *parent=0, const char *name=0 );
 
     bool byBranch() const;
     TQString branch() const;
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index 779fbe98..9adda71a 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -74,7 +74,7 @@ static int FindWhiteSpace(const TQString& str, int index)
 
 static const TQStringList FetchBranchesAndTags(const TQString& searchedType,
                                               CvsService_stub* cvsService,
-                                              TQWidget* tqparent)
+                                              TQWidget* parent)
 {
     TQStringList branchOrTagList;
 
@@ -82,7 +82,7 @@ static const TQStringList FetchBranchesAndTags(const TQString& searchedType,
     if( !cvsService->ok() )
         return branchOrTagList;
 
-    ProgressDialog dlg(tqparent, "tqStatus", job, TQString(), i18n("CVS tqStatus"));
+    ProgressDialog dlg(parent, "tqStatus", job, TQString(), i18n("CVS tqStatus"));
 
     if( dlg.execute() )
     {
@@ -205,7 +205,7 @@ TQString Cervisia::NormalizeRepository(const TQString& repository)
 }
 
 
-bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* tqparent)
+bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* parent)
 {
     bool result = true;
 
@@ -214,7 +214,7 @@ bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* tqparent)
     // does the file already exist?
     if( fi.exists() )
     {
-        result = (KMessageBox::warningContinueCancel(tqparent,
+        result = (KMessageBox::warningContinueCancel(parent,
                   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);
@@ -259,17 +259,17 @@ TQStringList splitLine(TQString line, char delim)
 }
 
 
-const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* tqparent)
+const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent)
 {
     return FetchBranchesAndTags(TQString::tqfromLatin1("branch"), cvsService,
-                                tqparent);
+                                parent);
 }
 
 
-const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* tqparent)
+const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent)
 {
     return FetchBranchesAndTags(TQString::tqfromLatin1("revision"), cvsService,
-                                tqparent);
+                                parent);
 }
 
 
diff --git a/cervisia/misc.h b/cervisia/misc.h
index c3715cee..803c8131 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* tqparent=0);
+bool CheckOverwrite(const TQString& fileName, TQWidget* parent=0);
 
 }
 
@@ -61,8 +61,8 @@ TQStringList splitLine(TQString, char delim=' ');
 TQString tempFileName(const TQString& suffix);
 void cleanupTempFiles();
 
-const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* tqparent);
-const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* tqparent);
+const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent);
+const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent);
 
 /**
  * Compares two revision numbers.
diff --git a/cervisia/patchoptiondlg.cpp b/cervisia/patchoptiondlg.cpp
index a65aea6c..6516528f 100644
--- a/cervisia/patchoptiondlg.cpp
+++ b/cervisia/patchoptiondlg.cpp
@@ -28,8 +28,8 @@ using Cervisia::PatchOptionDialog;
 #include <klocale.h>
 
 
-PatchOptionDialog::PatchOptionDialog(TQWidget* tqparent, const char* name)
-    : KDialogBase(tqparent, name, true/*modal*/, TQString(),
+PatchOptionDialog::PatchOptionDialog(TQWidget* parent, const char* name)
+    : KDialogBase(parent, name, true/*modal*/, TQString(),
                   Ok | Cancel | Help, Ok, true/*separator*/)
 {
     TQFrame* mainWidget = makeMainWidget();
diff --git a/cervisia/patchoptiondlg.h b/cervisia/patchoptiondlg.h
index 20afb4b7..583664a3 100644
--- a/cervisia/patchoptiondlg.h
+++ b/cervisia/patchoptiondlg.h
@@ -37,7 +37,7 @@ class PatchOptionDialog : public KDialogBase
   TQ_OBJECT
     
 public:
-    explicit PatchOptionDialog(TQWidget* tqparent = 0, const char* name = 0);
+    explicit PatchOptionDialog(TQWidget* parent = 0, const char* name = 0);
     virtual ~PatchOptionDialog();
     
     TQString diffOptions() const;
diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp
index ca3c975c..abf23d1a 100644
--- a/cervisia/progressdlg.cpp
+++ b/cervisia/progressdlg.cpp
@@ -52,10 +52,10 @@ struct ProgressDialog::Private
 };
 
 
-ProgressDialog::ProgressDialog(TQWidget* tqparent, const TQString& heading,
+ProgressDialog::ProgressDialog(TQWidget* parent, const TQString& heading,
                                const DCOPRef& job, const TQString& errorIndicator,
                                const TQString& caption)
-    : KDialogBase(tqparent, 0, true, caption, Cancel, Cancel, true)
+    : KDialogBase(parent, 0, true, caption, Cancel, Cancel, true)
     , DCOPObject()
     , d(new Private)
 {
diff --git a/cervisia/progressdlg.h b/cervisia/progressdlg.h
index 6eb71d88..5d20d2a7 100644
--- a/cervisia/progressdlg.h
+++ b/cervisia/progressdlg.h
@@ -35,7 +35,7 @@ class ProgressDialog : public KDialogBase, public DCOPObject
 //    TQ_OBJECT
 
 public:
-    ProgressDialog(TQWidget* tqparent, const TQString& heading, const DCOPRef& job,
+    ProgressDialog(TQWidget* parent, const TQString& heading, const DCOPRef& job,
                    const TQString& errorIndicator, const TQString& caption = "");
     ~ProgressDialog();
 
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index f091ba80..eb248cc1 100644
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@@ -32,8 +32,8 @@
 #include "cvsjob_stub.h"
 
 
-ProtocolView::ProtocolView(const TQCString& appId, TQWidget *tqparent, const char *name)
-    : TQTextEdit(tqparent, name)
+ProtocolView::ProtocolView(const TQCString& appId, TQWidget *parent, const char *name)
+    : TQTextEdit(parent, name)
     , job(0)
     , m_isUpdateJob(false)
 {
diff --git a/cervisia/protocolview.h b/cervisia/protocolview.h
index aaf1e797..42995d85 100644
--- a/cervisia/protocolview.h
+++ b/cervisia/protocolview.h
@@ -37,7 +37,7 @@ class ProtocolView : public TQTextEdit, public DCOPObject
 //    TQ_OBJECT
 
 public:
-    explicit ProtocolView(const TQCString& appId, TQWidget *tqparent=0, const char *name=0);
+    explicit ProtocolView(const TQCString& appId, TQWidget *parent=0, const char *name=0);
     ~ProtocolView();
 
     bool startJob(bool isUpdateJob = false);
diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp
index f50005df..a9e8a9fd 100644
--- a/cervisia/qttableview.cpp
+++ b/cervisia/qttableview.cpp
@@ -44,8 +44,8 @@ public:
     void paintEvent( TQPaintEvent * );
 };
 
-TQCornerSquare::TQCornerSquare( TQWidget *tqparent, const char *name )
-	: TQWidget( tqparent, name )
+TQCornerSquare::TQCornerSquare( TQWidget *parent, const char *name )
+	: TQWidget( parent, name )
 {
 }
 
@@ -124,7 +124,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
 
 
 /*!
-  Constructs a table view.  The \a tqparent, \a name and \f arguments
+  Constructs a table view.  The \a parent, \a name and \f arguments
   are passed to the TQFrame constructor.
 
   The \link setTableFlags() table flags\endlink are all cleared (set to 0).
@@ -143,8 +143,8 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
 
 */
 
-QtTableView::QtTableView( TQWidget *tqparent, const char *name, WFlags f )
-    : TQFrame( tqparent, name, f )
+QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f )
+    : TQFrame( parent, name, f )
 {
     nRows		 = nCols      = 0;	// zero rows/cols
     xCellOffs		 = yCellOffs  = 0;	// zero offset
diff --git a/cervisia/qttableview.h b/cervisia/qttableview.h
index 2c306ed8..49e4b139 100644
--- a/cervisia/qttableview.h
+++ b/cervisia/qttableview.h
@@ -39,7 +39,7 @@ public:
     void	tqrepaint( const TQRect &, bool erase=TRUE );
 
 protected:
-    QtTableView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 );
+    QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
    ~QtTableView();
 
     int		numRows()	const;
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index b5d50e1b..1ebce85f 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -40,7 +40,7 @@
 class RepositoryListItem : public KListViewItem
 {
 public:
-    RepositoryListItem(KListView* tqparent, const TQString& repo, bool loggedin);
+    RepositoryListItem(KListView* parent, const TQString& repo, bool loggedin);
     
     void setRsh(const TQString& rsh);
     void setServer(const TQString& server) { m_server = server; }
@@ -85,9 +85,9 @@ static bool LoginNeeded(const TQString& repository)
 }
 
 
-RepositoryListItem::RepositoryListItem(KListView* tqparent, const TQString& repo, 
+RepositoryListItem::RepositoryListItem(KListView* parent, const TQString& repo, 
                                        bool loggedin)
-    : KListViewItem(tqparent)
+    : KListViewItem(parent)
     , m_isLoggedIn(loggedin)
 {
     setText(0, repo);
@@ -153,8 +153,8 @@ void RepositoryListItem::changeLoginStatusColumn()
 
 
 RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
-                                   TQWidget* tqparent, const char* name)
-    : KDialogBase(tqparent, name, true, i18n("Configure Access to Repositories"),
+                                   TQWidget* parent, const char* name)
+    : KDialogBase(parent, name, true, i18n("Configure Access to Repositories"),
                   Ok | Cancel | Help, Ok, true)
     , m_partConfig(cfg)
     , m_cvsService(cvsService)
diff --git a/cervisia/repositorydlg.h b/cervisia/repositorydlg.h
index dde4fee6..bd567e5b 100644
--- a/cervisia/repositorydlg.h
+++ b/cervisia/repositorydlg.h
@@ -40,7 +40,7 @@ class RepositoryDialog : public KDialogBase
 
 public:
     RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
-                     TQWidget* tqparent = 0, const char* name = 0);
+                     TQWidget* parent = 0, const char* name = 0);
     virtual ~RepositoryDialog();
 
     void readConfigFile();
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index 3665c9ba..fd3e7d9a 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -95,8 +95,8 @@ private:
 }
 
 
-ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, false, TQString(),
+ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, false, TQString(),
                   Close | Help | User1 | User2, Close, true,
                   KStdGuiItem::saveAs(), KStdGuiItem::save())
     , markeditem(-1)
diff --git a/cervisia/resolvedlg.h b/cervisia/resolvedlg.h
index 4f169847..7d25b741 100644
--- a/cervisia/resolvedlg.h
+++ b/cervisia/resolvedlg.h
@@ -43,7 +43,7 @@ class ResolveDialog : public KDialogBase
 public:
     enum ChooseType { ChA, ChB, ChAB, ChBA, ChEdit };
 
-    explicit ResolveDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 );
+    explicit ResolveDialog( KConfig& cfg, TQWidget *parent=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 f5bbdf2f..b353c9f4 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 *tqparent, const char *name)
-    : KDialogBase(tqparent, name, true, TQString(),
+ResolveEditorDialog::ResolveEditorDialog(KConfig& cfg, TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, true, TQString(),
                   Ok | Cancel, Ok, true)
     , m_partConfig(cfg)
 {
diff --git a/cervisia/resolvedlg_p.h b/cervisia/resolvedlg_p.h
index 463561c2..680da0a6 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* tqparent=0, const char* name=0);
+    explicit ResolveEditorDialog(KConfig& cfg, TQWidget* parent=0, const char* name=0);
     virtual ~ResolveEditorDialog();
 
     void setContent(const TQString& text);
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index ba08273a..8551a7e9 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -58,8 +58,8 @@ namespace
 }
 
 
-FontButton::FontButton( const TQString &text, TQWidget *tqparent, const char *name )
-    : TQPushButton(text, tqparent, name)
+FontButton::FontButton( const TQString &text, TQWidget *parent, const char *name )
+    : TQPushButton(text, parent, name)
 {
     connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseFont()) );
 }
@@ -77,11 +77,11 @@ void FontButton::chooseFont()
 }
 
 
-SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *tqparent, const char *name )
+SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *name )
     : KDialogBase(KDialogBase::IconList, i18n("Configure Cervisia"),
       KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help,
       KDialogBase::Ok,
-      tqparent, name, true)
+      parent, name, true)
 {
     config = conf;
 
diff --git a/cervisia/settingsdlg.h b/cervisia/settingsdlg.h
index ad189bde..9f36a46b 100644
--- a/cervisia/settingsdlg.h
+++ b/cervisia/settingsdlg.h
@@ -41,7 +41,7 @@ class FontButton : public TQPushButton
   TQ_OBJECT
 
 public:
-    FontButton( const TQString &text, TQWidget *tqparent=0, const char *name=0 );
+    FontButton( const TQString &text, TQWidget *parent=0, const char *name=0 );
 
 private slots:
     void chooseFont();
@@ -54,7 +54,7 @@ class SettingsDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    SettingsDialog( KConfig *conf, TQWidget *tqparent=0, const char *name=0 );
+    SettingsDialog( KConfig *conf, TQWidget *parent=0, const char *name=0 );
     virtual ~SettingsDialog();
 
 protected slots:
diff --git a/cervisia/tagdlg.cpp b/cervisia/tagdlg.cpp
index 3563c381..3d8b9516 100644
--- a/cervisia/tagdlg.cpp
+++ b/cervisia/tagdlg.cpp
@@ -35,8 +35,8 @@
 using Cervisia::TagDialog;
 
 TagDialog::TagDialog(ActionType action, CvsService_stub* service,
-                     TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, true, TQString(),
+                     TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, true, TQString(),
                   Ok | Cancel | Help, Ok, true),
       act(action),
       cvsService(service),
diff --git a/cervisia/tagdlg.h b/cervisia/tagdlg.h
index 57d720bf..8e0ff1b5 100644
--- a/cervisia/tagdlg.h
+++ b/cervisia/tagdlg.h
@@ -42,7 +42,7 @@ public:
     enum ActionType { Create, Delete };
     
     TagDialog( ActionType action, CvsService_stub* service,
-               TQWidget *tqparent=0, const char *name=0 );
+               TQWidget *parent=0, const char *name=0 );
 
     bool branchTag() const;
     bool forceTag() const;
diff --git a/cervisia/tooltip.h b/cervisia/tooltip.h
index 1036af5b..26e617bf 100644
--- a/cervisia/tooltip.h
+++ b/cervisia/tooltip.h
@@ -43,7 +43,7 @@ public:
 
     /**
      * @param widget The widget you want to add tooltips to. It's also used as
-     * tqparent for the TQObject. So you don't have to free an instance of this
+     * parent for the TQObject. So you don't have to free an instance of this
      * class yourself.
      */
     explicit ToolTip(TQWidget* widget);
@@ -55,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 tqparent widget's coordinate system.
+     * @param pos The position of the tooltip in the parent widget's coordinate system.
      *
-     * @param rect The rectangle in the tqparent widget's coordinate system where the
+     * @param rect The rectangle in the parent 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 71e88ebe..55243796 100644
--- a/cervisia/updatedlg.cpp
+++ b/cervisia/updatedlg.cpp
@@ -34,8 +34,8 @@
 
 
 UpdateDialog::UpdateDialog(CvsService_stub* service,
-                           TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, true, i18n("CVS Update"),
+                           TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, true, i18n("CVS Update"),
                   Ok | Cancel, Ok, true),
       cvsService(service)
 {
diff --git a/cervisia/updatedlg.h b/cervisia/updatedlg.h
index 883342b4..59582974 100644
--- a/cervisia/updatedlg.h
+++ b/cervisia/updatedlg.h
@@ -39,7 +39,7 @@ class UpdateDialog : public KDialogBase
 
 public:
     UpdateDialog( CvsService_stub* service,
-                  TQWidget *tqparent=0, const char *name=0 );
+                  TQWidget *parent=0, const char *name=0 );
 
     bool byTag() const;
     TQString tag() const;
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 50f7825a..ae2ae61b 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -38,8 +38,8 @@ using Cervisia::Entry;
 using Cervisia::EntrytqStatus;
 
 
-UpdateView::UpdateView(KConfig& partConfig, TQWidget *tqparent, const char *name)
-    : KListView(tqparent, name),
+UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
+    : KListView(parent, name),
       m_partConfig(partConfig),
       m_unfoldingTree(false)
 {
@@ -333,7 +333,7 @@ void UpdateView::foldTree()
     while (TQListViewItem* item = it.current())
     {
         // don't close the top level directory
-        if (isDirItem(item) && item->tqparent())
+        if (isDirItem(item) && item->parent())
             item->setOpen(false);
 
         ++it;
@@ -500,7 +500,7 @@ void UpdateView::syncSelection()
         UpdateDirItem* dirItem(0);
         if (isDirItem(item))
             dirItem = static_cast<UpdateDirItem*>(item);
-        else if (TQListViewItem* parentItem = item->tqparent())
+        else if (TQListViewItem* parentItem = item->parent())
             dirItem = static_cast<UpdateDirItem*>(parentItem);
 
         if (dirItem)
diff --git a/cervisia/updateview.h b/cervisia/updateview.h
index ecf5fcf4..181cf739 100644
--- a/cervisia/updateview.h
+++ b/cervisia/updateview.h
@@ -43,7 +43,7 @@ public:
                   NoRemoved=4, NoNotInCVS=8 , NoEmptyDirectories = 16 };
     enum Action { Add, Remove, Update, UpdateNoAct, Commit };
     
-    explicit UpdateView(KConfig& partConfig, TQWidget *tqparent=0, const char *name=0);
+    explicit UpdateView(KConfig& partConfig, TQWidget *parent=0, const char *name=0);
 
     virtual ~UpdateView();
 
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index a29ca153..4e07c1ab 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -51,10 +51,10 @@ TQString UpdateItem::dirPath() const
 {
     TQString path;
 
-    const UpdateItem* item = static_cast<UpdateItem*>(tqparent());
+    const UpdateItem* item = static_cast<UpdateItem*>(parent());
     while (item)
     {
-        const UpdateItem* parentItem = static_cast<UpdateItem*>(item->tqparent());
+        const UpdateItem* parentItem = static_cast<UpdateItem*>(item->parent());
         if (parentItem)
         {
             path.prepend(item->m_entry.m_name + TQDir::separator());
@@ -70,7 +70,7 @@ TQString UpdateItem::dirPath() const
 TQString UpdateItem::filePath() const
 {
     // the filePath of the root item is '.'
-    return tqparent() ? dirPath() + m_entry.m_name : TQChar('.');
+    return parent() ? dirPath() + m_entry.m_name : TQChar('.');
 }
 
 
@@ -79,9 +79,9 @@ TQString UpdateItem::filePath() const
 // ------------------------------------------------------------------------------
 
 
-UpdateDirItem::UpdateDirItem(UpdateDirItem* tqparent,
+UpdateDirItem::UpdateDirItem(UpdateDirItem* parent,
                              const Entry& entry)
-    : UpdateItem(tqparent, entry),
+    : UpdateItem(parent, entry),
       m_opened(false)
 {
     setExpandable(true);
@@ -89,9 +89,9 @@ UpdateDirItem::UpdateDirItem(UpdateDirItem* tqparent,
 }
 
 
-UpdateDirItem::UpdateDirItem(UpdateView* tqparent,
+UpdateDirItem::UpdateDirItem(UpdateView* parent,
                              const Entry& entry)
-    : UpdateItem(tqparent, entry),
+    : UpdateItem(parent, entry),
       m_opened(false)
 {
     setExpandable(true);
@@ -494,8 +494,8 @@ TQString UpdateDirItem::text(int column) const
 // ------------------------------------------------------------------------------
 
 
-UpdateFileItem::UpdateFileItem(UpdateDirItem* tqparent, const Entry& entry)
-    : UpdateItem(tqparent, entry),
+UpdateFileItem::UpdateFileItem(UpdateDirItem* parent, const Entry& entry)
+    : UpdateItem(parent, entry),
       m_undefined(false)
 {
 }
diff --git a/cervisia/updateview_items.h b/cervisia/updateview_items.h
index 83bd0efc..ca26930f 100644
--- a/cervisia/updateview_items.h
+++ b/cervisia/updateview_items.h
@@ -42,10 +42,10 @@ class UpdateItem : public TQListViewItem
 {
 public:
 
-    UpdateItem(UpdateView* tqparent, const Cervisia::Entry& entry)
-        : TQListViewItem(tqparent), m_entry(entry) {}
-    UpdateItem(UpdateItem* tqparent, const Cervisia::Entry& entry)
-        : TQListViewItem(tqparent), m_entry(entry) {}
+    UpdateItem(UpdateView* parent, const Cervisia::Entry& entry)
+        : TQListViewItem(parent), m_entry(entry) {}
+    UpdateItem(UpdateItem* parent, const Cervisia::Entry& entry)
+        : TQListViewItem(parent), m_entry(entry) {}
 
     const Cervisia::Entry& entry() const { return m_entry; }
 
@@ -73,8 +73,8 @@ public:
 
     enum { Name };
 
-    UpdateDirItem(UpdateView* tqparent, const Cervisia::Entry& entry);
-    UpdateDirItem(UpdateDirItem* tqparent, const Cervisia::Entry& entry);
+    UpdateDirItem(UpdateView* parent, const Cervisia::Entry& entry);
+    UpdateDirItem(UpdateDirItem* parent, const Cervisia::Entry& entry);
 
     void syncWithDirectory();
     void syncWithEntries();
@@ -121,7 +121,7 @@ public:
 
     enum { Name, MimeType, tqStatus, Revision, TagOrDate, Timestamp };
 
-    UpdateFileItem(UpdateDirItem* tqparent, const Cervisia::Entry& entry);
+    UpdateFileItem(UpdateDirItem* parent, const Cervisia::Entry& entry);
 
     bool undefinedState() const
     { return m_undefined; }
diff --git a/cervisia/updateview_visitors.cpp b/cervisia/updateview_visitors.cpp
index 0da6940b..8232d98c 100644
--- a/cervisia/updateview_visitors.cpp
+++ b/cervisia/updateview_visitors.cpp
@@ -50,11 +50,11 @@ void ApplyFilterVisitor::postVisit(UpdateDirItem* item)
     // - it has visible tqchildren
     // - it is not opened
     // - empty directories are not hidden
-    // - it has no tqparent (top level item)
+    // - it has no parent (top level item)
     const bool visible(!m_invisibleDirItems.count(item)
                        || !item->wasScanned()
                        || !(m_filter & UpdateView::NoEmptyDirectories)
-                       || !item->tqparent());
+                       || !item->parent());
 
     // 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->tqparent())))
+    while ((item = static_cast<UpdateDirItem*>(item->parent())))
     {
         TItemSet::iterator it = m_invisibleDirItems.find(item);
         if (it != m_invisibleDirItems.end())
diff --git a/cervisia/watchdlg.cpp b/cervisia/watchdlg.cpp
index 2e1fc74e..607dbd46 100644
--- a/cervisia/watchdlg.cpp
+++ b/cervisia/watchdlg.cpp
@@ -28,8 +28,8 @@
 #include <klocale.h>
 
 
-WatchDialog::WatchDialog(ActionType action, TQWidget *tqparent, const char *name)
-    : KDialogBase(tqparent, name, true, TQString(),
+WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name)
+    : KDialogBase(parent, name, true, TQString(),
                   Ok | Cancel | Help, Ok, true)
 {
     setCaption( (action==Add)? i18n("CVS Watch Add") : i18n("CVS Watch Remove") );
diff --git a/cervisia/watchdlg.h b/cervisia/watchdlg.h
index 3189d676..ea7e9b39 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 *tqparent=0, const char *name=0 );
+    explicit WatchDialog( ActionType action, TQWidget *parent=0, const char *name=0 );
 
     Events events() const;
 
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index 73165762..afe9e7a3 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -30,8 +30,8 @@
 #include "progressdlg.h"
 
 
-WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* tqparent, const char* name)
-    : KDialogBase(tqparent, name, false, TQString(),
+WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
+    : KDialogBase(parent, name, false, TQString(),
                   Close, ButtonCode(0), true)
     , partConfig(cfg)
 {
diff --git a/cervisia/watchersdlg.h b/cervisia/watchersdlg.h
index 9cfb023a..fff50d88 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* tqparent = 0,
+    explicit WatchersDialog(KConfig& cfg, TQWidget* parent = 0,
                             const char* name = 0);
     virtual ~WatchersDialog();