TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 11 deletions

diff --git a/kexi/migration/pqxx/pqxxmigrate.h b/kexi/migration/pqxx/pqxxmigrate.h
index c09c8a7a..ee33c138 100644
--- a/kexi/migration/pqxx/pqxxmigrate.h
+++ b/kexi/migration/pqxx/pqxxmigrate.h
@@ -18,8 +18,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef PQXXIMPORT_H
-#define PQXXIMPORT_H
+#ifndef PTQXXIMPORT_H
+#define PTQXXIMPORT_H
 
 #include <migration/keximigrate.h>
 
@@ -34,26 +34,27 @@ namespace KexiMigration
 	class PqxxMigrate : public KexiMigrate
 	{
 		Q_OBJECT
+  TQ_OBJECT
 		KEXIMIGRATION_DRIVER
 
 		public:
-			PqxxMigrate(QObject *parent, const char *name, const QStringList &args = QStringList());
+			PqxxMigrate(TQObject *tqparent, const char *name, const TQStringList &args = TQStringList());
 			virtual ~PqxxMigrate();
 			
 		protected:
 			//Driver specific function to return table names
-			virtual bool drv_tableNames(QStringList& tablenames);
+			virtual bool drv_tableNames(TQStringList& tablenames);
 			
 			//Driver specific implementation to read a table schema
 			virtual bool drv_readTableSchema(
-				const QString& originalName, KexiDB::TableSchema& tableSchema);
+				const TQString& originalName, KexiDB::TableSchema& tableSchema);
 			
 			//Driver specific connection implementation
 			virtual bool drv_connect();
 			virtual bool drv_disconnect();
 
 			virtual tristate drv_queryStringListFromSQL(
-				const QString& sqlStatement, uint columnNumber, QStringList& stringList, 
+				const TQString& sqlStatement, uint columnNumber, TQStringList& stringList, 
 				int numRecords = -1);
 
 			/*! Fetches single record from result obtained 
@@ -64,10 +65,10 @@ namespace KexiMigration
 			 On success the result is stored in \a data and true is returned,
 			 \a data is resized to appropriate size. cancelled is returned on EOF. */
 //! @todo SQL-dependent!
-			virtual tristate drv_fetchRecordFromSQL(const QString& sqlStatement, 
+			virtual tristate drv_fetchRecordFromSQL(const TQString& sqlStatement, 
 				KexiDB::RowData& data, bool &firstRecord);
 
-			virtual bool drv_copyTable(const QString& srcTable, 
+			virtual bool drv_copyTable(const TQString& srcTable, 
 				KexiDB::Connection *destConn, KexiDB::TableSchema* dstTable);
 		
 		private:
@@ -85,15 +86,15 @@ namespace KexiMigration
 			pqxx::result::const_iterator m_fetchRecordFromSQL_iter;
 
 			//perform a query on the database
-			bool query(const QString& statement);
+			bool query(const TQString& statement);
 
 			//Clear the result info
 			void clearResultInfo ();
 			
-			pqxx::oid tableOid(const QString& tablename);
+			pqxx::oid tableOid(const TQString& tablename);
 			
 			//Convert the pqxx type to a kexi type
-			KexiDB::Field::Type type(int t, const QString& fname);
+			KexiDB::Field::Type type(int t, const TQString& fname);
 			
 			//Find out the field constraints
 			//Return whether or not the field is a pkey