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

5 files changed, 17 insertions, 15 deletions

diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp
index bc7c0988..ec9802c9 100644
--- a/vcs/perforce/integrator/perforceintegrator.cpp
+++ b/vcs/perforce/integrator/perforceintegrator.cpp
@@ -28,10 +28,10 @@ static const KDevPluginInfo data("kdevperforceintegrator");
 typedef KDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory;
 K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) )
 
-PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name,
+PerforceIntegrator::PerforceIntegrator(TQObject* tqparent, const char* name,
     const TQStringList // args
                                        )
-    :KDevVCSIntegrator(parent, name)
+    :KDevVCSIntegrator(tqparent, name)
 {
 }
 
@@ -39,15 +39,15 @@ PerforceIntegrator::~PerforceIntegrator()
 {
 }
 
-VCSDialog* PerforceIntegrator::fetcher(TQWidget* // parent
+VCSDialog* PerforceIntegrator::fetcher(TQWidget* // tqparent
                                        )
 {
     return 0;
 }
 
-VCSDialog* PerforceIntegrator::integrator(TQWidget* parent)
+VCSDialog* PerforceIntegrator::integrator(TQWidget* tqparent)
 {
-    PFIntegratorDlg *dlg = new PFIntegratorDlg(parent);
+    PFIntegratorDlg *dlg = new PFIntegratorDlg(tqparent);
     return dlg;
 }
 
diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h
index 1d047826..b76f8de8 100644
--- a/vcs/perforce/integrator/perforceintegrator.h
+++ b/vcs/perforce/integrator/perforceintegrator.h
@@ -27,12 +27,13 @@
 class PerforceIntegrator : public KDevVCSIntegrator
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PerforceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    PerforceIntegrator(TQObject* tqparent, const char* name, const TQStringList args = TQStringList());
     ~PerforceIntegrator();
 
-    virtual VCSDialog* fetcher(TQWidget* parent);
-    virtual VCSDialog* integrator(TQWidget* parent);
+    virtual VCSDialog* fetcher(TQWidget* tqparent);
+    virtual VCSDialog* integrator(TQWidget* tqparent);
 
 };
 
diff --git a/vcs/perforce/integrator/pfintegratordlg.cpp b/vcs/perforce/integrator/pfintegratordlg.cpp
index 8685b2f4..90e66923 100644
--- a/vcs/perforce/integrator/pfintegratordlg.cpp
+++ b/vcs/perforce/integrator/pfintegratordlg.cpp
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #include "pfintegratordlg.h"
 
-PFIntegratorDlg::PFIntegratorDlg(TQWidget *parent, const char *name)
-    :PFIntegratorDlgBase(parent, name)
+PFIntegratorDlg::PFIntegratorDlg(TQWidget *tqparent, const char *name)
+    :PFIntegratorDlgBase(tqparent, name)
 {
 }
 
diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h
index 750795b6..a4f515bf 100644
--- a/vcs/perforce/integrator/pfintegratordlg.h
+++ b/vcs/perforce/integrator/pfintegratordlg.h
@@ -25,8 +25,9 @@
 
 class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    PFIntegratorDlg(TQWidget *parent = 0, const char *name = 0);
+    PFIntegratorDlg(TQWidget *tqparent = 0, const char *name = 0);
     
     virtual void accept();
     virtual void init(const TQString &projectName, const TQString &projectLocation);
diff --git a/vcs/perforce/integrator/pfintegratordlgbase.ui b/vcs/perforce/integrator/pfintegratordlgbase.ui
index 5b12a70f..8a5795a8 100644
--- a/vcs/perforce/integrator/pfintegratordlgbase.ui
+++ b/vcs/perforce/integrator/pfintegratordlgbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>PFIntegratorDlgBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PFIntegratorDlgBase</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>435</height>
@@ -43,5 +43,5 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>