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, 16 insertions, 15 deletions

diff --git a/kdevdesigner/designer/project.h b/kdevdesigner/designer/project.h
index 25ec499d..350fd6f0 100644
--- a/kdevdesigner/designer/project.h
+++ b/kdevdesigner/designer/project.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -33,7 +33,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqmap.h>
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include "../interfaces/projectsettingsiface.h"
 #include "sourcefile.h"
 #include "formfile.h"
@@ -47,14 +47,14 @@ struct DesignerDatabase;
 class PixmapCollection;
 class Project;
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 class TQSqlDatabase;
 
 class DatabaseConnection
 {
 public:
     DatabaseConnection( Project *p ) :
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	conn( 0 ),
 #endif
 	project( p ), loaded( FALSE ), iface( 0 ) {}
@@ -86,7 +86,7 @@ public:
     TQStringList tables() const { return tbls; }
     TQStringList fields( const TQString& t ) { return flds[t]; }
     TQMap<TQString, TQStringList> fields() { return flds; }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQSqlDatabase* connection() const { return conn; }
     void remove();
 #endif
@@ -98,7 +98,7 @@ private:
     int prt;
     TQStringList tbls;
     TQMap<TQString, TQStringList> flds;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQSqlDatabase *conn;
 #endif
     Project *project;
@@ -108,14 +108,15 @@ private:
 
 #endif
 
-class Project : public QObject
+class Project : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     friend class DatabaseConnection;
 
 public:
-    Project( const TQString &fn, const TQString &pName = TQString::null,
-	     QPluginManager<ProjectSettingsInterface> *pm = 0, bool isDummy = FALSE,
+    Project( const TQString &fn, const TQString &pName = TQString(),
+	     TQPluginManager<ProjectSettingsInterface> *pm = 0, bool isDummy = FALSE,
 	     const TQString &l = "C++" );
     ~Project();
 
@@ -143,7 +144,7 @@ public:
 
     void save( bool onlyProjectFile = FALSE );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> databaseConnections() const;
     void setDatabaseConnections( const TQPtrList<DatabaseConnection> &lst );
     void addDatabaseConnection( DatabaseConnection *conn );
@@ -248,14 +249,14 @@ private:
     TQString proName;
     TQString desc;
     TQString dbFile;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> dbConnections;
 #endif
     TQString lang;
     DesignerProject *iface;
     TQMap<TQString, TQString> customSettings;
     TQStringList csList;
-    QPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
+    TQPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
     PixmapCollection *pixCollection;
     TQPtrList<SourceFile> sourcefiles;
     TQPtrList<FormFile> formfiles;