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

10 files changed, 54 insertions, 49 deletions

diff --git a/lib/interfaces/extensions/Mainpage.dox b/lib/interfaces/extensions/Mainpage.dox
index d306a1e8..5906ccfe 100644
--- a/lib/interfaces/extensions/Mainpage.dox
+++ b/lib/interfaces/extensions/Mainpage.dox
@@ -38,8 +38,8 @@ those should be loaded at a time. This can be accomplished by:
   @code
   class KDevMyExtension: public KDevPlugin {
   public:
-      KDevMyExtension(const KDevPluginInfo *info, QObject* parent, const char* name)
-          :KDevPlugin(info, parent, name) {}
+      KDevMyExtension(const KDevPluginInfo *info, QObject* tqparent, const char* name)
+          :KDevPlugin(info, tqparent, name) {}
       
       virtual void doSomething() = 0;
   };
diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h
index 52dd5a1e..2ce7090b 100644
--- a/lib/interfaces/extensions/codebrowserfrontend.h
+++ b/lib/interfaces/extensions/codebrowserfrontend.h
@@ -27,10 +27,11 @@ namespace Extensions {
 
 class KDevCodeBrowserFrontend  : public KDevPlugin {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
-        KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-            :KDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {}
+        KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 )
+            :KDevPlugin(info, tqparent, name ? name : "CodeBrowserFrontend") {}
         
         ///Used by the quickopen-plugin to notify extensions that it jumped to a searched item
         virtual bool jumpedToItem( ItemDom item ) = 0;
diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h
index 4f17154d..bd6dc559 100644
--- a/lib/interfaces/extensions/kdevappfrontend.h
+++ b/lib/interfaces/extensions/kdevappfrontend.h
@@ -57,6 +57,7 @@ if (apf) {
 class KDevAppFrontend : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**Constructor.
@@ -65,11 +66,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevAppFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :KDevPlugin(info, parent, name ? name : "KDevAppFrontend") {}
+    KDevAppFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 )
+        :KDevPlugin(info, tqparent, name ? name : "KDevAppFrontend") {}
 
     /**@return Whether the application is currently running.*/
     virtual bool isRunning() = 0;
diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h
index b3f5e080..fd11b993 100644
--- a/lib/interfaces/extensions/kdevcreatefile.h
+++ b/lib/interfaces/extensions/kdevcreatefile.h
@@ -54,7 +54,7 @@ public:
 
   public:
     /**The status of a file.*/
-    enum Status {
+    enum tqStatus {
         STATUS_OK                /**<File was successfuly created.*/,
         STATUS_CANCELED          /**<File was not created due to user intervention.*/,
         STATUS_NOTCREATED        /**<File was not created due to error.*/,
@@ -105,7 +105,7 @@ public:
     there are several file templates for each extension.*/
     TQString subtype;
     /**Current status.*/
-    Status status;
+    tqStatus status;
     /**true if the file should be added to a project.*/
     bool addToProject;
   };
@@ -119,14 +119,14 @@ public:
   plugin information in various places like "about application" dialog, plugin selector
   dialog, etc. Plugin does not take ownership on info object, also its lifetime should
   be equal to the lifetime of the plugin.
-  @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+  @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
   interface. Otherwise the plugin will not be constructed.
   @param name The internal name which identifies the plugin.*/
-  KDevCreateFile(const KDevPluginInfo *info, TQObject * parent = 0, const char * name = 0)
-      :KDevPlugin(info, parent, name) {}
+  KDevCreateFile(const KDevPluginInfo *info, TQObject * tqparent = 0, const char * name = 0)
+      :KDevPlugin(info, tqparent, name) {}
 
   /**Creates a new file, within or without the project.
-  Supply as much information as you know. Leave what you don't know as TQString::null.
+  Supply as much information as you know. Leave what you don't know as TQString().
   The user will be prompted as necessary for the missing information, and the
   file created, and added to the project as necessary.
   @param ext File extension (type).
@@ -135,10 +135,10 @@ public:
   @param subtype The subtype, pass this only if an extension is not enough to find the
   file template.
   @return @ref CreatedFile instance with information about file and file creation process.*/
-  virtual CreatedFile createNewFile(TQString ext = TQString::null,
-                     TQString dir = TQString::null,
-                     TQString name = TQString::null,
-                     TQString subtype = TQString::null) = 0;
+  virtual CreatedFile createNewFile(TQString ext = TQString(),
+                     TQString dir = TQString(),
+                     TQString name = TQString(),
+                     TQString subtype = TQString()) = 0;
 
 
 };
diff --git a/lib/interfaces/extensions/kdevdifffrontend.cpp b/lib/interfaces/extensions/kdevdifffrontend.cpp
index 745703e4..a3af79d4 100644
--- a/lib/interfaces/extensions/kdevdifffrontend.cpp
+++ b/lib/interfaces/extensions/kdevdifffrontend.cpp
@@ -21,8 +21,8 @@
 #include "kdevdifffrontend.h"
 
 
-KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    : KDevPlugin(info, parent, name ? name : "KDevDiffFrontend")
+KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *tqparent, const char *name)
+    : KDevPlugin(info, tqparent, name ? name : "KDevDiffFrontend")
 {
 }
 
diff --git a/lib/interfaces/extensions/kdevdifffrontend.h b/lib/interfaces/extensions/kdevdifffrontend.h
index ecf360ad..b1158cb4 100644
--- a/lib/interfaces/extensions/kdevdifffrontend.h
+++ b/lib/interfaces/extensions/kdevdifffrontend.h
@@ -55,11 +55,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevDiffFrontend( const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") {}
+    KDevDiffFrontend( const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 )
+        :KDevPlugin(info, tqparent, name ? name : "KDevDiffFrontend") {}
 
     /**Displays the patch.
     @param diff A string which contains a patch in unified format.*/
diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h
index 96749bd2..cc136536 100644
--- a/lib/interfaces/extensions/kdevmakefrontend.h
+++ b/lib/interfaces/extensions/kdevmakefrontend.h
@@ -53,6 +53,7 @@ if (mf) {
 class KDevMakeFrontend : public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -62,11 +63,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevMakeFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 )
-        :KDevPlugin(info, parent, name ? name : "KDevMakeFrontend") {}
+    KDevMakeFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 )
+        :KDevPlugin(info, tqparent, name ? name : "KDevMakeFrontend") {}
 
     /**@return The widget where the make output is shown.*/
     virtual TQWidget* widget() { return 0L; }
diff --git a/lib/interfaces/extensions/kdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h
index 09c7bb1b..e66e01b3 100644
--- a/lib/interfaces/extensions/kdevquickopen.h
+++ b/lib/interfaces/extensions/kdevquickopen.h
@@ -16,8 +16,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVQUICKOPEN_H
-#define KDEVQUICKOPEN_H
+#ifndef KDEVTQUICKOPEN_H
+#define KDEVTQUICKOPEN_H
 
 #include <kdevplugin.h>
 #include <kurl.h>
@@ -51,11 +51,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name)
-        :KDevPlugin(info, parent, name) {}
+    KDevQuickOpen(const KDevPluginInfo *info, TQObject* tqparent, const char* name)
+        :KDevPlugin(info, tqparent, name) {}
 
     /**Shows the file selection dialog.
     @param text A list of urls to open.*/
@@ -81,8 +81,8 @@ public:
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KDEVQUICKOPEN_H
-#define KDEVQUICKOPEN_H
+#ifndef KDEVTQUICKOPEN_H
+#define KDEVTQUICKOPEN_H
 
 #include <kdevplugin.h>
 #include <kurl.h>
@@ -116,11 +116,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name)
-        :KDevPlugin(info, parent, name) {}
+    KDevQuickOpen(const KDevPluginInfo *info, TQObject* tqparent, const char* name)
+        :KDevPlugin(info, tqparent, name) {}
 
     /**Shows the file selection dialog.
     @param text A list of urls to open.*/
diff --git a/lib/interfaces/extensions/kdevsourceformatter.h b/lib/interfaces/extensions/kdevsourceformatter.h
index 5ca33079..0542fbf1 100644
--- a/lib/interfaces/extensions/kdevsourceformatter.h
+++ b/lib/interfaces/extensions/kdevsourceformatter.h
@@ -51,11 +51,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevSourceFormatter(const KDevPluginInfo *info, TQObject* parent, const char* name)
-        :KDevPlugin(info, parent, name) {}
+    KDevSourceFormatter(const KDevPluginInfo *info, TQObject* tqparent, const char* name)
+        :KDevPlugin(info, tqparent, name) {}
 
     /**Formats the source.
     @param text A string with a code.
diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h
index 9b0571b8..63656c9e 100644
--- a/lib/interfaces/extensions/kdevversioncontrol.h
+++ b/lib/interfaces/extensions/kdevversioncontrol.h
@@ -135,6 +135,7 @@ if (vcs) {
 class KDevVersionControl: public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**Constructs a VCS plugin.
@@ -143,11 +144,11 @@ public:
     plugin information in various places like "about application" dialog, plugin selector
     dialog, etc. Plugin does not take ownership on info object, also its lifetime should
     be equal to the lifetime of the plugin.
-    @param parent The parent object for the plugin. Parent object must implement @ref KDevApi
+    @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi
     interface. Otherwise the plugin will not be constructed.
     @param name The internal name which identifies the plugin.*/
-    KDevVersionControl(const KDevPluginInfo *info, TQObject *parent, const char *name )
-        :KDevPlugin(info, parent, name ) {}
+    KDevVersionControl(const KDevPluginInfo *info, TQObject *tqparent, const char *name )
+        :KDevPlugin(info, tqparent, name ) {}
 
     /**Creates a new project in the passed path @p dir. This should instantiate
     VCS infrastructure and import a project into the VCS in that directory.
@@ -181,22 +182,23 @@ signals:
 /**
 Basic interface for providing info on file registered in a version control repository repository.
 */
-class KDevVCSFileInfoProvider: public QObject
+class KDevVCSFileInfoProvider: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructor.
-    @param parent The parent VCS plugin.
+    @param tqparent The tqparent VCS plugin.
     @param name The name of a provider object.*/
-    KDevVCSFileInfoProvider(KDevVersionControl *parent, const char *name)
-        : TQObject( parent, name ), m_owner(parent) {}
+    KDevVCSFileInfoProvider(KDevVersionControl *tqparent, const char *name)
+        : TQObject( tqparent, name ), m_owner(tqparent) {}
 
     /**Gets the status for local files in the specified directory:
     the info are collected locally so they are necessarily in sync with the repository
 
     This is a <b>synchronous operation</b> (blocking).
     @param dirPath The relative (to project dir) directory path to stat.
-    @return Status for all <b>registered</b> files.*/
+    @return tqStatus for all <b>registered</b> files.*/
     virtual const VCSFileInfoMap *status(const TQString &dirPath) = 0;
 
     /**Starts a request for directory status to the remote repository.
@@ -208,18 +210,18 @@ public:
     @param dirPath The (relative to project directory) directory which status you are asking for.
     @param callerData The pointer to some data you want the provider will return
     to you when it has done.
-    @param recursive If false, retrieve information only for dirPath's immediate children.
+    @param recursive If false, retrieve information only for dirPath's immediate tqchildren.
     @param checkRepos If true, contact remote repository and augment repository's status.
     If false, retrieve only for local modification information.
     @return true if the request has been successfully started, false otherwise.*/
-    virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0;
+    virtual bool requesttqStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ) = 0;
 
 signals:
     /**Emitted when the status request to remote repository has finished.
     @param fileInfoMap The status for <b>registered in repository</b> files.
     @param callerData The pointer to some data you want the provider will return
     to you when it has done
-    @see requestStatus for to find out when this signal should be used.*/
+    @see requesttqStatus for to find out when this signal should be used.*/
     void statusReady(const VCSFileInfoMap &fileInfoMap, void *callerData);
 
 protected: