summaryrefslogtreecommitdiffstats
path: root/vcs/subversion/svn_mergewidget.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:56:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:56:07 +0000
commitd6f8bbb45b267065a6907e71ff9c98bb6d161241 (patch)
treed109539636691d7b03036ca1c0ed29dbae6577cf /vcs/subversion/svn_mergewidget.h
parent3331a47a9cad24795c7440ee8107143ce444ef34 (diff)
downloadtdevelop-d6f8bbb45b267065a6907e71ff9c98bb6d161241.tar.gz
tdevelop-d6f8bbb45b267065a6907e71ff9c98bb6d161241.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1157658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'vcs/subversion/svn_mergewidget.h')
-rw-r--r--vcs/subversion/svn_mergewidget.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h
index db905626..abaaea88 100644
--- a/vcs/subversion/svn_mergewidget.h
+++ b/vcs/subversion/svn_mergewidget.h
@@ -33,7 +33,7 @@ class SvnMergeDialog : public SvnMergeOptionDialogBase
{
Q_OBJECT
public:
- SvnMergeDialog( const KURL &wcTarget, QWidget *parent = NULL );
+ SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL );
virtual ~SvnMergeDialog();
KURL source1();