summaryrefslogtreecommitdiffstats
path: root/src/svnfrontend/mergedlg_impl.h
diff options
context:
space:
mode:
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);