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

46 files changed, 198 insertions, 177 deletions

diff --git a/lib/interfaces/KDevCoreIface.h b/lib/interfaces/KDevCoreIface.h
index 5603e0f5..9fb34d13 100644
--- a/lib/interfaces/KDevCoreIface.h
+++ b/lib/interfaces/KDevCoreIface.h
@@ -30,6 +30,7 @@ class KDevCore;
 class KDevCoreIface : public TQObject, public DCOPObject
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
     
 public:
diff --git a/lib/interfaces/KDevPartControllerIface.h b/lib/interfaces/KDevPartControllerIface.h
index 3f519159..b140df97 100644
--- a/lib/interfaces/KDevPartControllerIface.h
+++ b/lib/interfaces/KDevPartControllerIface.h
@@ -28,6 +28,7 @@ class KDevPartController;
 class KDevPartControllerIface : public TQObject, public DCOPObject
 {
   Q_OBJECT
+//  TQ_OBJECT
   K_DCOP
     
 public:
diff --git a/lib/interfaces/codemodel.cpp b/lib/interfaces/codemodel.cpp
index e2e211ad..3d4bbe63 100644
--- a/lib/interfaces/codemodel.cpp
+++ b/lib/interfaces/codemodel.cpp
@@ -380,12 +380,12 @@ const FileList CodeModel::fileList( ) const
 
 bool CodeModel::hasFile( const TQString & name ) const
 {
-    return m_files.contains( name );
+    return m_files.tqcontains( name );
 }
 
 FileDom CodeModel::fileByName( const TQString & name )
 {
-    TQMap<TQString, FileDom>::const_iterator it = m_files.find( name );
+    TQMap<TQString, FileDom>::const_iterator it = m_files.tqfind( name );
     if( it != m_files.end() ) {
       return *it;
     } else {
@@ -395,7 +395,7 @@ FileDom CodeModel::fileByName( const TQString & name )
 
 const FileDom CodeModel::fileByName( const TQString & name ) const
 {
-    TQMap<TQString, FileDom>::const_iterator it = m_files.find( name );
+    TQMap<TQString, FileDom>::const_iterator it = m_files.tqfind( name );
     if( it != m_files.end() ) {
       return *it;
     } else {
@@ -502,7 +502,7 @@ bool CodeModel::addFile( FileDom file )
     if( file->name().isEmpty() )
 		return false;
 
-		if( m_files.find( file->name() ) != m_files.end() ) {
+		if( m_files.tqfind( file->name() ) != m_files.end() ) {
 			///the error-channel is set to 9007 because this problem appears with the cpp-support, so it is needed while debugging it
 			kdDebug(9007) << "file " << file->name() << " was added to code-model without removing it before! \n" << kdBacktrace() << endl;
 			removeFile( fileByName( file->name() ) );
@@ -679,17 +679,17 @@ const NamespaceList NamespaceModel::namespaceList( ) const
 
 NamespaceDom NamespaceModel::namespaceByName( const TQString & name )
 {
-    return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom();
+    return m_namespaces.tqcontains( name ) ? m_namespaces[ name ] : NamespaceDom();
 }
 
 const NamespaceDom NamespaceModel::namespaceByName( const TQString & name ) const
 {
-    return m_namespaces.contains( name ) ? m_namespaces[ name ] : NamespaceDom();
+    return m_namespaces.tqcontains( name ) ? m_namespaces[ name ] : NamespaceDom();
 }
 
 bool NamespaceModel::hasNamespace( const TQString & name ) const
 {
-    return m_namespaces.contains( name );
+    return m_namespaces.tqcontains( name );
 }
 
 bool NamespaceModel::addNamespace( NamespaceDom ns )
@@ -760,17 +760,17 @@ const ClassList ClassModel::classList( ) const
 
 bool ClassModel::hasClass( const TQString & name ) const
 {
-    return m_classes.contains( name );
+    return m_classes.tqcontains( name );
 }
 
 ClassList ClassModel::classByName( const TQString & name )
 {
-    return m_classes.contains( name ) ? m_classes[ name ] : ClassList();
+    return m_classes.tqcontains( name ) ? m_classes[ name ] : ClassList();
 }
 
 const ClassList ClassModel::classByName( const TQString & name ) const
 {
-    return m_classes.contains( name ) ? m_classes[ name ] : ClassList();
+    return m_classes.tqcontains( name ) ? m_classes[ name ] : ClassList();
 }
 
 bool ClassModel::addClass( ClassDom klass )
@@ -816,17 +816,17 @@ const FunctionList ClassModel::functionList( ) const
 
 bool ClassModel::hasFunction( const TQString & name ) const
 {
-    return m_functions.contains( name );
+    return m_functions.tqcontains( name );
 }
 
 FunctionList ClassModel::functionByName( const TQString & name )
 {
-    return m_functions.contains( name ) ? m_functions[ name ] : FunctionList();
+    return m_functions.tqcontains( name ) ? m_functions[ name ] : FunctionList();
 }
 
 const FunctionList ClassModel::functionByName( const TQString & name ) const
 {
-    return m_functions.contains( name ) ? m_functions[ name ] : FunctionList();
+    return m_functions.tqcontains( name ) ? m_functions[ name ] : FunctionList();
 }
 
 bool ClassModel::addFunction( FunctionDom fun )
@@ -872,17 +872,17 @@ const FunctionDefinitionList ClassModel::functionDefinitionList( ) const
 
 bool ClassModel::hasFunctionDefinition( const TQString & name ) const
 {
-    return m_functionDefinitions.contains( name );
+    return m_functionDefinitions.tqcontains( name );
 }
 
 FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name )
 {
-    return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
+    return m_functionDefinitions.tqcontains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
 }
 
 const FunctionDefinitionList ClassModel::functionDefinitionByName( const TQString & name ) const
 {
-    return m_functionDefinitions.contains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
+    return m_functionDefinitions.tqcontains( name ) ? m_functionDefinitions[ name ] : FunctionDefinitionList();
 }
 
 bool ClassModel::addFunctionDefinition( FunctionDefinitionDom fun )
@@ -914,17 +914,17 @@ const VariableList ClassModel::variableList( ) const
 
 VariableDom ClassModel::variableByName( const TQString & name )
 {
-    return m_variables.contains( name ) ? m_variables[ name ] : VariableDom();
+    return m_variables.tqcontains( name ) ? m_variables[ name ] : VariableDom();
 }
 
 const VariableDom ClassModel::variableByName( const TQString & name ) const
 {
-    return m_variables.contains( name ) ? m_variables[ name ] : VariableDom();
+    return m_variables.tqcontains( name ) ? m_variables[ name ] : VariableDom();
 }
 
 bool ClassModel::hasVariable( const TQString & name ) const
 {
-    return m_variables.contains( name );
+    return m_variables.tqcontains( name );
 }
 
 bool ClassModel::addVariable( VariableDom var )
@@ -953,17 +953,17 @@ const EnumList ClassModel::enumList( ) const
 
 EnumDom ClassModel::enumByName( const TQString & name )
 {
-    return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom();
+    return m_enumerators.tqcontains( name ) ? m_enumerators[ name ] : EnumDom();
 }
 
 const EnumDom ClassModel::enumByName( const TQString & name ) const
 {
-    return m_enumerators.contains( name ) ? m_enumerators[ name ] : EnumDom();
+    return m_enumerators.tqcontains( name ) ? m_enumerators[ name ] : EnumDom();
 }
 
 bool ClassModel::hasEnum( const TQString & name ) const
 {
-    return m_enumerators.contains( name );
+    return m_enumerators.tqcontains( name );
 }
 
 bool ClassModel::addEnum( EnumDom e )
@@ -1028,17 +1028,17 @@ const TypeAliasList ClassModel::typeAliasList( ) const
 
 bool ClassModel::hasTypeAlias( const TQString & name ) const
 {
-    return m_typeAliases.contains( name );
+    return m_typeAliases.tqcontains( name );
 }
 
 TypeAliasList ClassModel::typeAliasByName( const TQString & name )
 {
-    return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList();
+    return m_typeAliases.tqcontains( name ) ? m_typeAliases[ name ] : TypeAliasList();
 }
 
 const TypeAliasList ClassModel::typeAliasByName( const TQString & name ) const
 {
-    return m_typeAliases.contains( name ) ? m_typeAliases[ name ] : TypeAliasList();
+    return m_typeAliases.tqcontains( name ) ? m_typeAliases[ name ] : TypeAliasList();
 }
 
 bool ClassModel::addTypeAlias( TypeAliasDom typeAlias )
diff --git a/lib/interfaces/codemodel.h b/lib/interfaces/codemodel.h
index 882420b8..f85ff4c3 100644
--- a/lib/interfaces/codemodel.h
+++ b/lib/interfaces/codemodel.h
@@ -161,7 +161,7 @@ typedef KSharedPtr<EnumeratorModel> EnumeratorDom;
 @class ItemList
 The list of code model items.
 This is a type definition: @code typedef TQValueList<ItemDom> ItemList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<ItemDom> ItemList;
 
@@ -169,7 +169,7 @@ typedef TQValueList<ItemDom> ItemList;
 @class FileList
 The list of code model files.
 This is a type definition: @code typedef TQValueList<FileDom> FileList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<FileDom> FileList;
 
@@ -177,7 +177,7 @@ typedef TQValueList<FileDom> FileList;
 @class NamespaceList
 The list of code model namespaces.
 This is a type definition: @code typedef TQValueList<NamespaceDom> NamespaceList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<NamespaceDom> NamespaceList;
 
@@ -185,7 +185,7 @@ typedef TQValueList<NamespaceDom> NamespaceList;
 @class ClassList
 The list of code model classes.
 This is a type definition: @code typedef TQValueList<ClassDom> ClassList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<ClassDom> ClassList;
 
@@ -193,7 +193,7 @@ typedef TQValueList<ClassDom> ClassList;
 @class FunctionList
 The list of code model functions.
 This is a type definition: @code typedef TQValueList<FunctionDom> FunctionList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<FunctionDom> FunctionList;
 
@@ -201,7 +201,7 @@ typedef TQValueList<FunctionDom> FunctionList;
 @class FunctionDefinitionList
 The list of code model function definitions.
 This is a type definition: @code typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 
 typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList;
@@ -209,7 +209,7 @@ typedef TQValueList<FunctionDefinitionDom> FunctionDefinitionList;
 @class VariableList
 The list of code model variables.
 This is a type definition: @code typedef TQValueList<VariableDom> VariableList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<VariableDom> VariableList;
 
@@ -217,7 +217,7 @@ typedef TQValueList<VariableDom> VariableList;
 @class ArgumentList
 The list of code model arguments.
 This is a type definition: @code typedef TQValueList<ArgumentDom> ArgumentList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<ArgumentDom> ArgumentList;
 
@@ -225,7 +225,7 @@ typedef TQValueList<ArgumentDom> ArgumentList;
 @class EnumList
 The list of code model enums.
 This is a type definition: @code typedef TQValueList<EnumDom> EnumList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<EnumDom> EnumList;
 
@@ -233,7 +233,7 @@ typedef TQValueList<EnumDom> EnumList;
 @class TypeAliasList
 The list of code model type aliases.
 This is a type definition: @code typedef TQValueList<TypeAliasDom> TypeAliasList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<TypeAliasDom> TypeAliasList;
 
@@ -241,7 +241,7 @@ typedef TQValueList<TypeAliasDom> TypeAliasList;
 @class EnumeratorList
 The list of code model enumerators.
 This is a type definition: @code typedef TQValueList<EnumeratorDom> EnumeratorList; @endcode
-@sa QValueList
+@sa TQValueList
 */
 typedef TQValueList<EnumeratorDom> EnumeratorList;
 
@@ -619,7 +619,7 @@ private:
 
 class TemplateModelItem {
     public:
-        typedef QPair< TQString, TQString > ParamPair;
+        typedef TQPair< TQString, TQString > ParamPair;
         typedef TQValueVector< ParamPair > ParamMap; ///The first is the name, and the second the default-parameter, or "" if there is none.
         
         virtual const ParamMap& getTemplateParams() {
@@ -706,10 +706,10 @@ public:
 
     virtual bool isClass() const { return true; }
 
-    /**@return The scope of the class. Scope is a string list composed from names of parent classes and namespaces.*/
+    /**@return The scope of the class. Scope is a string list composed from names of tqparent classes and namespaces.*/
     TQStringList scope() const { return m_scope; }
     /**Sets the scope of this class.
-    @param scope The scope - a list of parent classes and namespaces.*/
+    @param scope The scope - a list of tqparent classes and namespaces.*/
     void setScope( const TQStringList& scope ) { m_scope = scope; }
 
     /**@return The list of base class names.*/
@@ -1044,7 +1044,7 @@ protected:
     NamespaceModel( CodeModel* model );
 
 public:
-  typedef std::set<NamespaceAliasModel> NamespaceAliasModelList; ///I'm using std-sets here, because Qt-3 has no appropriate replacement
+  typedef std::set<NamespaceAliasModel> NamespaceAliasModelList; ///I'm using std-sets here, because TQt-3 has no appropriate replacement
   typedef std::set<NamespaceImportModel> NamespaceImportModelList;
   
     /**A definition of safe pointer to the namespace model.*/
@@ -1256,7 +1256,7 @@ public:
     virtual bool isFunction() const { return true; }
 
     /**@return The scope of the function. Scope is a string list composed 
-    from names of parent functions, classes and namespaces.*/
+    from names of tqparent functions, classes and namespaces.*/
     TQStringList scope() const { return m_scope; }
 
     /**Sets the scope of the function.
diff --git a/lib/interfaces/codemodel_utils.cpp b/lib/interfaces/codemodel_utils.cpp
index afb946bd..5c9c71e9 100644
--- a/lib/interfaces/codemodel_utils.cpp
+++ b/lib/interfaces/codemodel_utils.cpp
@@ -296,7 +296,7 @@ AllFunctionDefinitions allFunctionDefinitionsDetailed( const FileDom & dom )
 
 
 bool resultTypesFit( const FunctionDom & dec, const FunctionDefinitionDom & def ) {
-    if( !def->resultType().contains("::") ) return dec->resultType() == def->resultType();
+    if( !def->resultType().tqcontains("::") ) return dec->resultType() == def->resultType();
     TQStringList l1 = dec->scope() + TQStringList::split("::", dec->resultType() );
     TQStringList l2 = TQStringList::split("::", def->resultType() );
     
diff --git a/lib/interfaces/codemodel_utils.h b/lib/interfaces/codemodel_utils.h
index 2879a424..14e97656 100644
--- a/lib/interfaces/codemodel_utils.h
+++ b/lib/interfaces/codemodel_utils.h
@@ -462,11 +462,11 @@ class PredAmOwner{
 /**@return A list of all functions in the file.
 @param dom File Dom to look for functions in.*/
 FunctionList allFunctions(const FileDom &dom);
-/**@return A detailed list of all functions in the file (detailed list contains
+/**@return A detailed list of all functions in the file (detailed list tqcontains
 the information about a scope of each FunctionDom found).
 @param dom File Dom to look for functions in.*/
 AllFunctions allFunctionsDetailed(const FileDom &dom);
-/**@return A detailed list of all function definitions in the file (detailed list contains
+/**@return A detailed list of all function definitions in the file (detailed list tqcontains
 the information about a scope of each FunctionDefinitionDom found).
 @param dom File Dom to look for functions in.*/
 AllFunctionDefinitions allFunctionDefinitionsDetailed(const FileDom &dom);
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:
diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox
index 4618c3d5..8b91bf8c 100644
--- a/lib/interfaces/external/Mainpage.dox
+++ b/lib/interfaces/external/Mainpage.dox
@@ -10,14 +10,14 @@ GUI Designer integration framework.
 
 \section designerintegration Overview of GUI designer integration process
 Each KPart that wants to act as a GUI Designer must implement @ref KInterfaceDesigner::Designer
-interface. It defines necessary signals to communicate with an IDE and abstract virtual
+interface. It defines necessary Q_SIGNALS to communicate with an IDE and abstract virtual
 functions to determine designer type.
 
 If a part which can "design" user interface files of a certain mimetype
 implements this interface and sets itself as a default handler for that 
 mimetype then it becomes automatically integrated into KDevelop IDE.
 
-When a part is embedded into KDevelop shell, its signals (defined in @ref
+When a part is embedded into KDevelop shell, its Q_SIGNALS (defined in @ref
 KInterfaceDesigner::Designer interface):
 @code
     void addedFunction(DesignerType type, const QString &formName, Function function)
@@ -26,7 +26,7 @@ KInterfaceDesigner::Designer interface):
     void editFunction(DesignerType type, const QString &formName, const QString &functionName)
     void editSource(DesignerType type, const QString &formName);
 @endcode
-are connected to corresponding slots of KDevelop designer integration engine which can be implemented in KDevelop language support plugin.
+are connected to corresponding Q_SLOTS of KDevelop designer integration engine which can be implemented in KDevelop language support plugin.
  
 Each language support which wants to use integrated designer, must reimplement 
 @code
diff --git a/lib/interfaces/external/designer.cpp b/lib/interfaces/external/designer.cpp
index 606fd2b4..06c28d50 100644
--- a/lib/interfaces/external/designer.cpp
+++ b/lib/interfaces/external/designer.cpp
@@ -20,8 +20,8 @@
 
 namespace KInterfaceDesigner{
 
-Designer::Designer(TQObject *parent, const char *name)
-    :KParts::ReadWritePart(parent, name)
+Designer::Designer(TQObject *tqparent, const char *name)
+    :KParts::ReadWritePart(tqparent, name)
 {
 }
 
diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h
index c254ab07..72d7508a 100644
--- a/lib/interfaces/external/designer.h
+++ b/lib/interfaces/external/designer.h
@@ -26,14 +26,14 @@ namespace KInterfaceDesigner{
 
 /**The type of a GUI Designer.*/
 enum DesignerType {
-    QtDesigner    /**<Qt Designer.*/,
+    TQtDesigner    /**<TQt Designer.*/,
     Glade         /**<Glade (version >= 3).*/
 };
 
 /**Function type.*/
 enum FunctionType {
     ftFunction    /**<Simple function or a callback.*/,
-    ftQtSlot      /**<Qt slot.*/
+    ftTQtSlot      /**<TQt slot.*/
 };
 
 /**Function.*/
@@ -65,8 +65,9 @@ mimetype then it becomes automatically integrated into KDevelop IDE.
 */
 class Designer: public KParts::ReadWritePart{
     Q_OBJECT
+  TQ_OBJECT
 public:
-    Designer(TQObject *parent, const char *name);
+    Designer(TQObject *tqparent, const char *name);
     
     /**Reimplement this to be able to open projects.*/
     virtual void openProject(const TQString &projectFile) = 0;
@@ -90,7 +91,7 @@ signals:
     /**Emitted when a form state is changed in the designer.
     @param formName An absolute name of the form file.
     @param status 0: form is clean, 1: form is modified.*/
-    void newStatus(const TQString &formName, int status);
+    void newtqStatus(const TQString &formName, int status);
 };
 
 }
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
diff --git a/lib/interfaces/hashedstring.cpp b/lib/interfaces/hashedstring.cpp
index aae068a3..723dd28b 100644
--- a/lib/interfaces/hashedstring.cpp
+++ b/lib/interfaces/hashedstring.cpp
@@ -30,7 +30,7 @@ size_t hashStringSafe( const TQString& str ) {
   size_t hash = 0;
   int len = str.length();
   for( int a = 0; a < len; a++ ) {
-    hash = str[a].unicode() + (hash * 17);
+    hash = str[a].tqunicode() + (hash * 17);
   }
   return hash;
 }
@@ -43,12 +43,12 @@ size_t HashedString::hashString(  const TQString& str )
 size_t fastHashString( const TQString& str ) {
   size_t hash = 0;
   if( !str.isEmpty() ) {
-    const TQChar* curr = str.unicode();
+    const TQChar* curr = str.tqunicode();
     const TQChar* end = curr + str.length();
     TQChar c;
     for(; curr < end ;) {
       c = *curr;
-      hash = c.unicode() + ( hash * 17 );
+      hash = c.tqunicode() + ( hash * 17 );
       ++curr;
     }
   }
@@ -72,7 +72,7 @@ class HashedStringSetData : public KShared {
       mutable size_t m_hash;
       HashedStringSetData() : m_hashValid( false ) {
       }
-  inline void invalidateHash() {
+  inline void tqinvalidateHash() {
     m_hashValid = false;
   }
 
@@ -180,7 +180,7 @@ void HashedStringSet::insert( const HashedString& str ) {
   if( str.str().isEmpty() ) return;
   makeDataPrivate();
   m_data->m_files.insert( str );
-  m_data->invalidateHash();
+  m_data->tqinvalidateHash();
 }
 
 bool HashedStringSet::operator <= ( const HashedStringSet& rhs ) const {
diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h
index f4264d2e..97ef2ad4 100644
--- a/lib/interfaces/katedocumentmanagerinterface.h
+++ b/lib/interfaces/katedocumentmanagerinterface.h
@@ -33,6 +33,7 @@ This is an emulated interface to provide compatibility with Kate scripts.
 class KateDocumentManagerInterface : public TQObject, public DCOPObject {
 
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 public:
     KateDocumentManagerInterface( KDevPartController *pc );
diff --git a/lib/interfaces/kdevapi.h b/lib/interfaces/kdevapi.h
index a933811e..36fc3605 100644
--- a/lib/interfaces/kdevapi.h
+++ b/lib/interfaces/kdevapi.h
@@ -44,9 +44,10 @@ The interface to KDevelop's core components.
 Needs to be implemented in a shell. Developers do not need to use this
 class because @ref KDevPlugin already provides API convenience methods.
 */
-class KDevApi: public QObject
+class KDevApi: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructor.*/
     KDevApi();
diff --git a/lib/interfaces/kdevcoderepository.h b/lib/interfaces/kdevcoderepository.h
index 8b862f6b..791ae580 100644
--- a/lib/interfaces/kdevcoderepository.h
+++ b/lib/interfaces/kdevcoderepository.h
@@ -45,9 +45,10 @@ never or rarely changes. System libraries are perfect examples of such code.
 Symbols from code contained in project files are better stored in memory
 symbol store like @ref CodeModel.
 */
-class KDevCodeRepository : public QObject
+class KDevCodeRepository : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructor.*/
     KDevCodeRepository();
diff --git a/lib/interfaces/kdevcore.cpp b/lib/interfaces/kdevcore.cpp
index dda66cbf..700693d6 100644
--- a/lib/interfaces/kdevcore.cpp
+++ b/lib/interfaces/kdevcore.cpp
@@ -285,8 +285,8 @@ const ProjectModelItem* ProjectModelItemContext::item() const
 // class KDevCore
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevCore::KDevCore( TQObject *parent, const char *name )
-    : TQObject( parent, name )
+KDevCore::KDevCore( TQObject *tqparent, const char *name )
+    : TQObject( tqparent, name )
 {
     new KDevCoreIface(this);
 }
diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h
index de2fccd8..09fba17c 100644
--- a/lib/interfaces/kdevcore.h
+++ b/lib/interfaces/kdevcore.h
@@ -297,14 +297,15 @@ It defines:
 - etc.
 .
 */
-class KDevCore: public QObject
+class KDevCore: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructor
-    @param parent The TQObject that's the parent of this class.
+    @param tqparent The TQObject that's the tqparent of this class.
     @param name The name of the class.*/
-    KDevCore(TQObject *parent=0, const char *name=0);
+    KDevCore(TQObject *tqparent=0, const char *name=0);
 
     /**Destructor.*/
     virtual ~KDevCore();
diff --git a/lib/interfaces/kdevdesignerintegration.cpp b/lib/interfaces/kdevdesignerintegration.cpp
index 0ba325ab..c95cfbe9 100644
--- a/lib/interfaces/kdevdesignerintegration.cpp
+++ b/lib/interfaces/kdevdesignerintegration.cpp
@@ -24,8 +24,8 @@ public:
   	KDevDesignerIntegrationIface *m_iface;
 };
 
-KDevDesignerIntegration::KDevDesignerIntegration(TQObject *parent, const char *name)
- : TQObject(parent, name)
+KDevDesignerIntegration::KDevDesignerIntegration(TQObject *tqparent, const char *name)
+ : TQObject(tqparent, name)
 {
   dptr = new KDevDesignerIntegrationPrivate();
   
diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h
index c1604a4a..6cd8fffb 100644
--- a/lib/interfaces/kdevdesignerintegration.h
+++ b/lib/interfaces/kdevdesignerintegration.h
@@ -40,22 +40,23 @@ into KDevelop GUI designers:
 Designer integration is a layer between visual form (GUI) designer of any type
 and the current language support. Usually designers create some kind of forms
 and allow developers to define actions which are executed upon some GUI events
-(for example, Qt Designer allows to define slots connected to GUI signals).
+(for example, TQt Designer allows to define slots connected to GUI signals).
 The actual code with action implementations needs to be written by hand in source
 files. Designer integration captures such implementation requests and opens
 necessary files at desired line numbers and adds (edits, removes) code for implementations.
 
-For example, Qt Designer integration should be able to create an subclass for a form
+For example, TQt Designer integration should be able to create an subclass for a form
 and reimplement slots defined in the form.
 */
-class KDevDesignerIntegration : public QObject
+class KDevDesignerIntegration : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
     /**Constructor.
-    @param parent Parent object.
+    @param tqparent Parent object.
     @param name Internal name.*/
-    KDevDesignerIntegration(TQObject *parent = 0, const char *name = 0);
+    KDevDesignerIntegration(TQObject *tqparent = 0, const char *name = 0);
     /**Destructor.*/
     ~KDevDesignerIntegration();
     
diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h
index f928d815..4199d14a 100644
--- a/lib/interfaces/kdevgenericfactory.h
+++ b/lib/interfaces/kdevgenericfactory.h
@@ -51,8 +51,8 @@ static const KDevPluginInfo data("KDevDummyPlugin");
 typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory;
 K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) )
 
-DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & )
-    :KDevPlugin(&data, parent, name)
+DummyPlugin::DummyPlugin(TQObject *tqparent, const char *name, const TQStringList & )
+    :KDevPlugin(&data, tqparent, name)
 {
 }
 @endcode
diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp
index 9b3cc40b..b0449d6b 100644
--- a/lib/interfaces/kdevlanguagesupport.cpp
+++ b/lib/interfaces/kdevlanguagesupport.cpp
@@ -29,8 +29,8 @@
 #include "kdevdesignerintegration.h"
 #include "kdevlanguagesupport.h"
 
-KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    : KDevPlugin(info, parent, name ? name : "KDevLanguageSupport" )
+KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *tqparent, const char *name)
+    : KDevPlugin(info, tqparent, name ? name : "KDevLanguageSupport" )
 {
 }
 
@@ -50,7 +50,7 @@ KMimeType::List KDevLanguageSupport::mimeTypes()
 
 TQString KDevLanguageSupport::formatTag( const Tag& /*tag*/ )
 {
-    return TQString::null;
+    return TQString();
 }
 
 TQString KDevLanguageSupport::formatClassName(const TQString &name)
diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h
index 78694193..765fde79 100644
--- a/lib/interfaces/kdevlanguagesupport.h
+++ b/lib/interfaces/kdevlanguagesupport.h
@@ -61,6 +61,7 @@ formatted name).
 class KDevLanguageSupport: public KDevPlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -90,10 +91,10 @@ 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.*/
-    KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name);
+    KDevLanguageSupport(const KDevPluginInfo *info, TQObject *tqparent, const char *name);
     /**Destructor.*/
     ~KDevLanguageSupport();
 
@@ -164,13 +165,13 @@ public:
 	 */
 	virtual void createAccessMethods(ClassDom theClass, VariableDom theVariable);
 
-    /**Opens an "Subclass Widget" dialog for given Qt .ui file (formName)
+    /**Opens an "Subclass Widget" dialog for given TQt .ui file (formName)
     and propmts to implement it's slots.
     @param formName The name of a form to subclass.
     @return A list of newly created files.*/
     virtual TQStringList subclassWidget(const TQString& formName);
 
-    /**Opens an "Update Widget" dialog for given Qt .ui file (formName)
+    /**Opens an "Update Widget" dialog for given TQt .ui file (formName)
     and prompts to add missing slot implementations
     in the subclass located in fileName.
     @param formName The name of a form which is being subclassed.
@@ -185,12 +186,12 @@ public:
     KDevDesignerIntegration *des = 0;
     switch (type)
     {
-        case KInterfaceDesigner::QtDesigner:
+        case KInterfaceDesigner::TQtDesigner:
             des = getDesignerFromCache(type);
             if (des == 0)
             {
                 MyLanguageImplementationWidget *impl = new MyLanguageImplementationWidget(this);
-                des = new QtDesignerMyLanguageIntegration(this, impl);
+                des = new TQtDesignerMyLanguageIntegration(this, impl);
                 des->loadSettings(*project()->projectDom(), "kdevmylangsupport/designerintegration");
                 saveDesignerToCache(type, des);
             }
@@ -198,7 +199,7 @@ public:
     }
     return des;
     @endcode
-    @ref ImplementationWidget and @ref QtDesignerIntegration classes are available
+    @ref ImplementationWidget and @ref TQtDesignerIntegration classes are available
     from designerintegration support library.
     @param type The type of the designer to integrate.
     @return The pointer to designer integration of given type or 0.*/
diff --git a/lib/interfaces/kdevmainwindow.h b/lib/interfaces/kdevmainwindow.h
index 5750be7e..c68dac77 100644
--- a/lib/interfaces/kdevmainwindow.h
+++ b/lib/interfaces/kdevmainwindow.h
@@ -47,7 +47,7 @@ public:
     @param view The view to embed. Must be a KPart.
     @param title The title of a view.
     @param toolTip The tooltip of a view.*/
-    virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString::null) = 0;
+    virtual void embedPartView(TQWidget *view, const TQString &title, const TQString& toolTip = TQString()) = 0;
 
     /**Embeds a toolview at the left of the main window.
     @param view The view to embed. Must be a KPart.
diff --git a/lib/interfaces/kdevpartcontroller.cpp b/lib/interfaces/kdevpartcontroller.cpp
index 58f1dc2a..09a47493 100644
--- a/lib/interfaces/kdevpartcontroller.cpp
+++ b/lib/interfaces/kdevpartcontroller.cpp
@@ -20,8 +20,8 @@
 #include "kdevpartcontroller.h"
 #include "katedocumentmanagerinterface.h"
 
-KDevPartController::KDevPartController(TQWidget *parent)
-  : KParts::PartManager(parent)
+KDevPartController::KDevPartController(TQWidget *tqparent)
+  : KParts::PartManager(tqparent)
 {
   new KDevPartControllerIface(this);
   new KateDocumentManagerInterface(this);
diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h
index be7084b9..e2ff8069 100644
--- a/lib/interfaces/kdevpartcontroller.h
+++ b/lib/interfaces/kdevpartcontroller.h
@@ -56,11 +56,12 @@ GUI designers, etc.
 class KDevPartController: public KParts::PartManager
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**Constructor.
-    @param parent The parent object.*/
-    KDevPartController(TQWidget *parent);
+    @param tqparent The tqparent object.*/
+    KDevPartController(TQWidget *tqparent);
     
     /**Call this before a call to @ref editDocument to set the encoding of the
     document to be opened.
diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp
index 5b4de199..d2a40332 100644
--- a/lib/interfaces/kdevplugin.cpp
+++ b/lib/interfaces/kdevplugin.cpp
@@ -54,11 +54,11 @@ struct KDevPlugin::Private
 // class KDevPlugin
 ///////////////////////////////////////////////////////////////////////////////
 
-KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    :TQObject(parent, name), d(new Private)
+KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *tqparent, const char *name)
+    :TQObject(tqparent, name), d(new Private)
 {
-    assert(parent->inherits( "KDevApi" ));
-    m_api = static_cast<KDevApi *>( parent );
+    assert(tqparent->inherits( "KDevApi" ));
+    m_api = static_cast<KDevApi *>( tqparent );
 
     actionCollection()->setHighlightingEnabled( true );
 
diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h
index a683c5db..249ff808 100644
--- a/lib/interfaces/kdevplugin.h
+++ b/lib/interfaces/kdevplugin.h
@@ -78,7 +78,7 @@ plugin names in GUI (required);
 - <i>X-KDevelop-Plugin-Version</i> is a version of a plugin (optional);
 - <i>X-KDevelop-Plugin-Homepage</i> is a home page of a plugin (optional);
 - <i>X-KDevelop-Plugin-License</i> is a license (optional). can be: GPL, LGPL, BSD, Artistic,
-QPL or Custom. If this property is not set, license is considered as unknown;
+TQPL or Custom. If this property is not set, license is considered as unknown;
 - <i>X-KDevelop-Plugin-BugsEmailAddress</i> is an email address for bug reports (optional);
 - <i>X-KDevelop-Plugin-Copyright</i> is a copyright statement (optional);
 - <i>X-KDE-Library</i> is a name of library which contains the plugin (required);
@@ -107,6 +107,7 @@ from shell applications.
 class KDevPlugin: public TQObject, public KXMLGUIClient
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**Constructs a plugin.
@@ -115,10 +116,10 @@ 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.*/
-    KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name = 0);
+    KDevPlugin(const KDevPluginInfo *info, TQObject *tqparent, const char *name = 0);
 
     /**Destructs a plugin.*/
     virtual ~KDevPlugin();
@@ -182,7 +183,7 @@ public:
           They belong to the application rc file (kdeveloprc)
     @note Project session file is useful for settings which cannot be shared between
           developers. If a setting should be shared, modify projectDom instead.
-    @param el The parent DOM element for plugins session settings.*/
+    @param el The tqparent DOM element for plugins session settings.*/
     virtual void restorePartialProjectSession(const TQDomElement* el);
 
     /**Saves session settings.
diff --git a/lib/interfaces/kdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp
index 686fd1ce..d2459d17 100644
--- a/lib/interfaces/kdevplugincontroller.cpp
+++ b/lib/interfaces/kdevplugincontroller.cpp
@@ -28,7 +28,7 @@ KTrader::OfferList KDevPluginController::query(const TQString &serviceType,
     const TQString &constraint)
 {
     return KTrader::self()->query(serviceType,
-        TQString("%1 and [X-KDevelop-Version] == %2").arg(constraint).arg(KDEVELOP_PLUGIN_VERSION));
+        TQString("%1 and [X-KDevelop-Version] == %2").tqarg(constraint).tqarg(KDEVELOP_PLUGIN_VERSION));
 }
 
 KTrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint)
diff --git a/lib/interfaces/kdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h
index 2ffba0ba..ee583ff4 100644
--- a/lib/interfaces/kdevplugincontroller.h
+++ b/lib/interfaces/kdevplugincontroller.h
@@ -36,9 +36,10 @@ class ProfileEngine;
 The base class for KDevelop plugin controller.
 Plugin controller is responsible for quering, loading and unloading available plugins.
 */
-class KDevPluginController: public QObject
+class KDevPluginController: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
     /**
diff --git a/lib/interfaces/kdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp
index daa64c2b..613c759d 100644
--- a/lib/interfaces/kdevplugininfo.cpp
+++ b/lib/interfaces/kdevplugininfo.cpp
@@ -149,7 +149,7 @@ TQString KDevPluginInfo::bugsEmailAddress() const
 
 TQVariant KDevPluginInfo::property(const TQString &name) const
 {
-    KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
+    KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName));
     if (offers.count() == 1)
         return offers.first()->property(name);
     return TQVariant();
@@ -162,7 +162,7 @@ TQVariant KDevPluginInfo::operator [](const TQString &name) const
 
 TQStringList KDevPluginInfo::propertyNames( ) const
 {
-    KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName));
+    KTrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").tqarg(d->m_pluginName));
     if (offers.count() == 1)
         return offers.first()->propertyNames();
     return TQStringList();
diff --git a/lib/interfaces/kdevplugininfo.h b/lib/interfaces/kdevplugininfo.h
index 50fe4601..746098c7 100644
--- a/lib/interfaces/kdevplugininfo.h
+++ b/lib/interfaces/kdevplugininfo.h
@@ -60,7 +60,7 @@ public:
     TQString version() const;
     /**@return A license type of a plugin. Information is taken from .desktop file.*/
     int licenseType() const;
-    /**@return A license text for known license types (GPL, LGPL, BSD, Artistic, QPL).*/
+    /**@return A license text for known license types (GPL, LGPL, BSD, Artistic, TQPL).*/
     TQString license() const;
     /**@return A copyright statement of a plugin. Information is taken from .desktop file.*/
     TQString copyrightStatement() const;
diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp
index f558cc48..1c334a8d 100644
--- a/lib/interfaces/kdevproject.cpp
+++ b/lib/interfaces/kdevproject.cpp
@@ -37,8 +37,8 @@ struct KDevProject::Private {
     KDevProjectIface *m_iface;
 };
 
-KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name)
-    : KDevPlugin(info, parent, name), d(new KDevProject::Private())
+KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *tqparent, const char *name)
+    : KDevPlugin(info, tqparent, name), d(new KDevProject::Private())
 {
     connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) );
     connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) );
@@ -80,14 +80,14 @@ KDevProject::Options KDevProject::options() const
 
 bool KDevProject::isProjectFile( const TQString & absFileName )
 {
-    return d->m_absToRel.contains( absFileName );
+    return d->m_absToRel.tqcontains( absFileName );
 }
 
 TQString KDevProject::relativeProjectFile( const TQString & absFileName )
 {
     if( isProjectFile(absFileName) )
 	return d->m_absToRel[ absFileName ];
-    return TQString::null;
+    return TQString();
 }
 
 void KDevProject::buildFileMap()
diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h
index 3e27d886..62e936b4 100644
--- a/lib/interfaces/kdevproject.h
+++ b/lib/interfaces/kdevproject.h
@@ -48,6 +48,7 @@ as a way of providing support for a build system (like it is done in KDevelop ID
 class KDevProject: public KDevPlugin
 {
     Q_OBJECT
+    TQ_OBJECT
 public:
     /**Constructs a project plugin.
     @param info Important information about the plugin - plugin internal and generic
@@ -55,10 +56,10 @@ 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.*/
-    KDevProject(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0);
+    KDevProject(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0);
     /**Destructor.*/
     virtual ~KDevProject();
 
@@ -66,7 +67,7 @@ public:
     enum Options {
         UsesOtherBuildSystem = 0        /**<Project uses unknown or unspecified build system or build system is not used at all.*/,
         UsesAutotoolsBuildSystem = 1    /**<Project uses autotools for building.*/,
-        UsesQMakeBuildSystem =2         /**<Project uses qmake for building.*/
+        UsesTQMakeBuildSystem =2         /**<Project uses qmake for building.*/
     };
 
     /**This method is invoked when the project is opened
diff --git a/lib/interfaces/kdevprojectiface.h b/lib/interfaces/kdevprojectiface.h
index eb2a0f32..59323f71 100644
--- a/lib/interfaces/kdevprojectiface.h
+++ b/lib/interfaces/kdevprojectiface.h
@@ -34,6 +34,7 @@ DCOP Interface for the @ref KDevProject object.
 class KDevProjectIface : public TQObject, public DCOPObject
 {
   Q_OBJECT
+//  TQ_OBJECT
       K_DCOP
 public:
   KDevProjectIface(KDevProject *prj);
@@ -62,7 +63,7 @@ k_dcop:
     TQStringList symlinkProjectFiles();
     
     // Project DOM access
-    TQString readEntry(const TQString &path, const TQString &defaultEntry = TQString::null);
+    TQString readEntry(const TQString &path, const TQString &defaultEntry = TQString());
     int readIntEntry(const TQString &path, int defaultEntry = 0);
     bool readBoolEntry(const TQString &path, bool defaultEntry = false);
     TQStringList readListEntry(const TQString &path, const TQString &tag);