rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp
index ae45803..44e620a 100644
--- a/src/svnfrontend/mergedlg_impl.cpp
+++ b/src/svnfrontend/mergedlg_impl.cpp
@@ -31,8 +31,8 @@
 #include <tqcheckbox.h>
 #include <tqvbox.h>
 
-MergeDlg_impl::MergeDlg_impl(TQWidget *tqparent, const char *name,bool src1,bool src2,bool out)
-    :MergeDlg(tqparent, name)
+MergeDlg_impl::MergeDlg_impl(TQWidget *parent, const char *name,bool src1,bool src2,bool out)
+    :MergeDlg(parent, name)
 {
     m_SrcOneInput->setMode(KFile::Directory|KFile::File);
     if (!src1) {
@@ -181,10 +181,10 @@ Rangeinput_impl::revision_range MergeDlg_impl::getRange()const
  */
 bool MergeDlg_impl::getMergeRange(Rangeinput_impl::revision_range&range,bool*force,bool*recursive,bool*ignorerelated,bool*dry,
     bool*useExternal,
-    TQWidget*tqparent,const char*name)
+    TQWidget*parent,const char*name)
 {
     MergeDlg_impl*ptr = 0;
-    KDialogBase dlg(tqparent,name,true,i18n("Enter merge range"),
+    KDialogBase dlg(parent,name,true,i18n("Enter merge range"),
             KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help,
             KDialogBase::Ok,true);
     dlg.setHelp("merging-items","kdesvn");