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

1 files changed, 13 insertions, 12 deletions

diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h
index 193f582d..df92869b 100644
--- a/languages/cpp/qtbuildconfig.h
+++ b/languages/cpp/qtbuildconfig.h
@@ -15,8 +15,8 @@
 	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 	Boston, MA 02110-1301, USA.
 */
-#ifndef QTBUILDCONFIG_H
-#define QTBUILDCONFIG_H
+#ifndef TQTBUILDCONFIG_H
+#define TQTBUILDCONFIG_H
 
 #include <tqobject.h>
 #include <tqstringlist.h>
@@ -25,17 +25,18 @@ class CppSupportPart;
 class TQDomDocument;
 
 /**
-	@brief The QtBuildConfig class stores all parameters related to the used Qt library
+	@brief The TQtBuildConfig class stores all parameters related to the used TQt library
 
 	@author Tobias Erbsland <te@profzone.ch>
 */
-class QtBuildConfig : public QObject
+class TQtBuildConfig : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	QtBuildConfig( CppSupportPart* part, TQDomDocument* dom );
-	virtual ~QtBuildConfig();
+	TQtBuildConfig( CppSupportPart* part, TQDomDocument* dom );
+	virtual ~TQtBuildConfig();
 
 	inline bool isUsed() const { return m_used; }
 	inline int version() const { return m_version; }
@@ -52,7 +53,7 @@ public:
 	void setRoot( const TQString& root );
     void setDesignerPath( const TQString& path );
     void setDesignerPluginPaths( const TQStringList& pfx );
-    void setQMakePath( const TQString& path );
+    void setTQMakePath( const TQString& path );
 	void setDesignerIntegration( const TQString& designerIntegration );
 	void init();
 
@@ -64,8 +65,8 @@ signals:
 
 private:
 
-    bool isValidQtDir( const TQString& ) const;
-    void findQtDir();
+    bool isValidTQtDir( const TQString& ) const;
+    void findTQtDir();
     TQString findExecutable( const TQString& ) const;
     void buildBinDirs( TQStringList& ) const;
     bool isExecutable( const TQString& ) const;
@@ -76,9 +77,9 @@ private:
 	bool m_used; ///< Flag if qt is used in this project.
 	int m_version; ///< The major version of the qt library (3 or 4)
 	int m_includeStyle; ///< The type of include style used (qt 3 or 4)
-	TQString m_root; ///< The root directory of the used qt installation for Qt3
-    TQString m_designerPath; ///< The path including the binary name of Qt Designer
-    TQString m_qmakePath; ///< The path including the binary name of QMake
+	TQString m_root; ///< The root directory of the used qt installation for TQt3
+    TQString m_designerPath; ///< The path including the binary name of TQt Designer
+    TQString m_qmakePath; ///< The path including the binary name of TQMake
     TQStringList m_designerPluginPaths; ///< The Prefix for Designer
 	TQString m_designerIntegration; ///< The type of designer used, kdevdesigner or qt designer