From d6f8bbb45b267065a6907e71ff9c98bb6d161241 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 31 Jul 2010 19:56:07 +0000
Subject: Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1157658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 vcs/subversion/svn_mergewidget.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vcs/subversion/svn_mergewidget.h')

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();
-- 
cgit v1.2.3