summaryrefslogtreecommitdiffstats
path: root/src/svnfrontend/mergedlg_impl.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commitc6b29717327388357badda064ef1ced71932406e (patch)
tree5d0dadae0d00c60e0773be4e8ee5a60a47615342 /src/svnfrontend/mergedlg_impl.h
parent93f9fda465964160b66d9252d2cf9b4c284eab50 (diff)
downloadtdesvn-c6b29717327388357badda064ef1ced71932406e.tar.gz
tdesvn-c6b29717327388357badda064ef1ced71932406e.zip
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
Diffstat (limited to 'src/svnfrontend/mergedlg_impl.h')
-rw-r--r--src/svnfrontend/mergedlg_impl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/svnfrontend/mergedlg_impl.h b/src/svnfrontend/mergedlg_impl.h
index 1a2df6f..8fc82b9 100644
--- a/src/svnfrontend/mergedlg_impl.h
+++ b/src/svnfrontend/mergedlg_impl.h
@@ -27,7 +27,7 @@ class MergeDlg_impl: public MergeDlg {
Q_OBJECT
TQ_OBJECT
public:
- MergeDlg_impl(TQWidget *tqparent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true);
+ MergeDlg_impl(TQWidget *parent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true);
virtual ~MergeDlg_impl();
bool recursive()const;
@@ -46,7 +46,7 @@ public:
void setDest(const TQString&);
static bool getMergeRange(Rangeinput_impl::revision_range&range,
- bool*force,bool*recursive,bool*ignorerelated,bool*dry,bool*useExternal,TQWidget*tqparent=0,const char*name=0);
+ bool*force,bool*recursive,bool*ignorerelated,bool*dry,bool*useExternal,TQWidget*parent=0,const char*name=0);
protected slots:
virtual void externDisplayToggled(bool);