From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 14 Jun 2011 16:45:05 +0000
Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 vcs/clearcase/integrator/ccintegratordlg.cpp     |  4 ++--
 vcs/clearcase/integrator/ccintegratordlg.h       |  3 ++-
 vcs/clearcase/integrator/ccintegratordlgbase.ui  |  8 ++++----
 vcs/clearcase/integrator/clearcaseintegrator.cpp | 10 +++++-----
 vcs/clearcase/integrator/clearcaseintegrator.h   |  7 ++++---
 5 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'vcs/clearcase/integrator')

diff --git a/vcs/clearcase/integrator/ccintegratordlg.cpp b/vcs/clearcase/integrator/ccintegratordlg.cpp
index 8e89cf94..3f6f8d0e 100644
--- a/vcs/clearcase/integrator/ccintegratordlg.cpp
+++ b/vcs/clearcase/integrator/ccintegratordlg.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "ccintegratordlg.h"
 
-CCIntegratorDlg::CCIntegratorDlg(TQWidget *parent, const char *name)
-    :CCIntegratorDlgBase(parent, name)
+CCIntegratorDlg::CCIntegratorDlg(TQWidget *tqparent, const char *name)
+    :CCIntegratorDlgBase(tqparent, name)
 {
 }
 
diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h
index bbb23955..37d73885 100644
--- a/vcs/clearcase/integrator/ccintegratordlg.h
+++ b/vcs/clearcase/integrator/ccintegratordlg.h
@@ -25,8 +25,9 @@
 
 class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    CCIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
+    CCIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0);
     
     virtual void accept();
     virtual void init(const TQString &projectName, const TQString &projectLocation);
diff --git a/vcs/clearcase/integrator/ccintegratordlgbase.ui b/vcs/clearcase/integrator/ccintegratordlgbase.ui
index ae961a9f..bafb8a96 100644
--- a/vcs/clearcase/integrator/ccintegratordlgbase.ui
+++ b/vcs/clearcase/integrator/ccintegratordlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CCIntegratorDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CCIntegratorDlgBase</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -34,7 +34,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>437</height>
@@ -43,5 +43,5 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp
index 4e8c1a0b..d076abc9 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.cpp
+++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp
@@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevclearcaseintegrator");
 typedef KDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) )
 
-ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name,
+ClearcaseIntegrator::ClearcaseIntegrator(TQObject* tqparent, const char* name,
     const TQStringList // args
                                          )
-    :KDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(tqparent, name)
 {
 }
 
@@ -39,15 +39,15 @@ ClearcaseIntegrator::~ClearcaseIntegrator()
 {
 }
 
-VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // parent
+VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // tqparent
                                         )
 {
     return 0;
 }
 
-VCSDialog* ClearcaseIntegrator::integrator(TQWidget* parent)
+VCSDialog* ClearcaseIntegrator::integrator(TQWidget* tqparent)
 {
-    CCIntegratorDlg *dlg = new CCIntegratorDlg(parent);
+    CCIntegratorDlg *dlg = new CCIntegratorDlg(tqparent);
     return dlg;
 }
 
diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h
index 385f1976..197638bf 100644
--- a/vcs/clearcase/integrator/clearcaseintegrator.h
+++ b/vcs/clearcase/integrator/clearcaseintegrator.h
@@ -27,12 +27,13 @@
 class ClearcaseIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    ClearcaseIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~ClearcaseIntegrator();
 
-    virtual VCSDialog* fetcher(TQWidget* parent);
-    virtual VCSDialog* integrator(TQWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* tqparent);
+    virtual VCSDialog* integrator(TQWidget* tqparent);
 
 };
 
-- 
cgit v1.2.1