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, 8 insertions, 7 deletions

diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h
index 945fb10a..baeddc90 100644
--- a/buildtools/qmake/trollprojectpart.h
+++ b/buildtools/qmake/trollprojectpart.h
@@ -26,18 +26,19 @@
 class KDialogBase;
 class TrollProjectWidget;
 class KDirWatch;
-class QMakeDefaultOpts;
+class TQMakeDefaultOpts;
 
 class TrollProjectPart : public KDevBuildTool
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TrollProjectPart( TQObject *parent, const char *name, const TQStringList &args );
+    TrollProjectPart( TQObject *tqparent, const char *name, const TQStringList &args );
     ~TrollProjectPart();
 
     bool isTMakeProject() const { return m_tmakeProject; }
-    bool isQt4Project() const;
+    bool isTQt4Project() const;
     bool isDirty();
     KDirWatch* dirWatch();
     virtual Options options() const;
@@ -74,15 +75,15 @@ private slots:
 
 private:
 //    void startMakeCommand(const TQString &dir, const TQString &target);
-    void startQMakeCommand(const TQString &dir, bool recursive = false );
+    void startTQMakeCommand(const TQString &dir, bool recursive = false );
 //     void execute(const TQString &directory, const TQString &command);
     void queueCmd(const TQString &dir, const TQString &cmd);
     TQString makeEnvironment();
 
-    TQString findQtDir();
+    TQString findTQtDir();
     TQString findExecutable( const TQString& path ) const;
     void buildBinDirs( TQStringList& ) const;
-    bool isValidQtDir( const TQString& path ) const;
+    bool isValidTQtDir( const TQString& path ) const;
     bool isExecutable( const TQString& path ) const;
 
     TQGuardedPtr<TrollProjectWidget> m_widget;
@@ -98,7 +99,7 @@ private:
 
     friend class TrollProjectWidget;
     friend class ProjectRunOptionsDlg;
-    friend class QMakeDefaultOpts;
+    friend class TQMakeDefaultOpts;
 };
 
 #endif