Port kdesvn to TQt4

This enables compilation under both Qt3 and Qt4


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

1 files changed, 9 insertions, 8 deletions

diff --git a/src/svnfrontend/mergedlg_impl.h b/src/svnfrontend/mergedlg_impl.h
index 90dc3d8..1a2df6f 100644
--- a/src/svnfrontend/mergedlg_impl.h
+++ b/src/svnfrontend/mergedlg_impl.h
@@ -25,8 +25,9 @@
 
 class MergeDlg_impl: public MergeDlg {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    MergeDlg_impl(QWidget *parent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true);
+    MergeDlg_impl(TQWidget *tqparent = 0, const char *name = 0,bool src1=true,bool src2=true,bool out=true);
     virtual ~MergeDlg_impl();
 
     bool recursive()const;
@@ -35,17 +36,17 @@ public:
     bool dryrun()const;
     bool useExtern()const;
 
-    QString Src1()const;
-    QString Src2()const;
-    QString Dest()const;
+    TQString Src1()const;
+    TQString Src2()const;
+    TQString Dest()const;
     Rangeinput_impl::revision_range getRange()const;
 
-    void setSrc1(const QString&);
-    void setSrc2(const QString&);
-    void setDest(const QString&);
+    void setSrc1(const TQString&);
+    void setSrc2(const TQString&);
+    void setDest(const TQString&);
 
     static bool getMergeRange(Rangeinput_impl::revision_range&range,
-        bool*force,bool*recursive,bool*ignorerelated,bool*dry,bool*useExternal,QWidget*parent=0,const char*name=0);
+        bool*force,bool*recursive,bool*ignorerelated,bool*dry,bool*useExternal,TQWidget*tqparent=0,const char*name=0);
 protected slots:
     virtual void externDisplayToggled(bool);