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

4 files changed, 20 insertions, 18 deletions

diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp
index 22c701f1..08f5d19f 100644
--- a/lib/interfaces/extras/kdevcompileroptions.cpp
+++ b/lib/interfaces/extras/kdevcompileroptions.cpp
@@ -1,7 +1,7 @@
 #include "kdevcompileroptions.h"
 
-KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name )
-        :TQObject(parent, name)
+KDevCompilerOptions::KDevCompilerOptions( TQObject * tqparent, const char * name )
+        :TQObject(tqparent, name)
 {
 }
 
diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h
index bac7e16e..15d9a066 100644
--- a/lib/interfaces/extras/kdevcompileroptions.h
+++ b/lib/interfaces/extras/kdevcompileroptions.h
@@ -34,7 +34,7 @@ Used by build systems to give users a compiler options configuration dialog.
 
 Common use case:
 @code
-static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
+static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *tqparent )
 {
     KService::Ptr service = KService::serviceByDesktopName( name );
     if ( !service )
@@ -49,7 +49,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
     if (prop.isValid())
         args = TQStringList::split(" ", prop.toString());
 
-    TQObject *obj = factory->create(parent, service->name().latin1(),
+    TQObject *obj = factory->create(tqparent, service->name().latin1(),
                                    "KDevCompilerOptions", args);
 
     if (!obj->inherits("KDevCompilerOptions"))
@@ -60,21 +60,22 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
 }
 
 ...
-KDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent);
+KDevCompilerOptions *plugin = createCompilerOptions(compilerName, tqparent);
 TQString flags = ""; //old compiler flags
 if ( plugin )
 {
-    flags = plugin->exec( parent, flags ); //new compiler flags are returned
+    flags = plugin->exec( tqparent, flags ); //new compiler flags are returned
     delete plugin;
 }
 @endcode
 */
-class KDevCompilerOptions : public QObject
+class KDevCompilerOptions : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KDevCompilerOptions( TQObject *parent=0, const char *name=0 );
+    KDevCompilerOptions( TQObject *tqparent=0, const char *name=0 );
 
     /**
      * Opens a dialog which allows the user to configure the
@@ -82,9 +83,9 @@ public:
      * will be set from the flags argument of this method.
      * After the dialog is accepted, the new settings will
      * be returned as a string. If the dialog was cancelled,
-     * TQString::null is returned.
+     * TQString() is returned.
      */
-    virtual TQString exec(TQWidget *parent, const TQString &flags) = 0;
+    virtual TQString exec(TQWidget *tqparent, const TQString &flags) = 0;
 };
 
 #endif
diff --git a/lib/interfaces/extras/kdevvcsintegrator.cpp b/lib/interfaces/extras/kdevvcsintegrator.cpp
index 5a6ab429..cb3cb263 100644
--- a/lib/interfaces/extras/kdevvcsintegrator.cpp
+++ b/lib/interfaces/extras/kdevvcsintegrator.cpp
@@ -18,8 +18,8 @@
 */
 #include "kdevvcsintegrator.h"
 
-KDevVCSIntegrator::KDevVCSIntegrator(TQObject *parent, const char *name)
-    :TQObject(parent, name)
+KDevVCSIntegrator::KDevVCSIntegrator(TQObject *tqparent, const char *name)
+    :TQObject(tqparent, name)
 {
 }
 
diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h
index 260f2a20..e13798e2 100644
--- a/lib/interfaces/extras/kdevvcsintegrator.h
+++ b/lib/interfaces/extras/kdevvcsintegrator.h
@@ -35,7 +35,7 @@ VCS Integration Dialog.
 Usually it is created as:
 @code
 class MyVCSDialog: public TQWidget, public VCSDialog {
-    MyVCSDialog(TQWidget *parent = 0, const char *name = 0);
+    MyVCSDialog(TQWidget *tqparent = 0, const char *name = 0);
     virtual void accept() { ... }
     virtual void init(const TQString &projectName, const TQString &projectLocation) { ... }
     virtual TQWidget *self() {
@@ -52,8 +52,8 @@ public:
     virtual void accept() = 0;
     /**Init integration dialog with the project name and location.*/
     virtual void init(const TQString &projectName, const TQString &projectLocation) = 0;
-    /**Reimplement to return an actual integration widget. Use QWidgets for that, not
-    QDialogs because integrator dialogs are usually have parent containers.*/
+    /**Reimplement to return an actual integration widget. Use TQWidgets for that, not
+    TQDialogs because integrator dialogs are usually have tqparent containers.*/
     virtual TQWidget *self() = 0;
 };
 
@@ -64,13 +64,14 @@ It can, for example, perform checkout or import operations.
 */
 class KDevVCSIntegrator: public TQObject {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0);
+    KDevVCSIntegrator(TQObject *tqparent = 0, const char *name = 0);
 
     /**Reimplement to return a dialog to fetch the project from VCS.*/
-    virtual VCSDialog *fetcher(TQWidget *parent) = 0;
+    virtual VCSDialog *fetcher(TQWidget *tqparent) = 0;
     /**Reimplement to return a dialog to integrate the project into VCS.*/
-    virtual VCSDialog *integrator(TQWidget *parent) = 0;
+    virtual VCSDialog *integrator(TQWidget *tqparent) = 0;
 };
 
 #endif