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

diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.h b/kexi/kexidb/drivers/pqxx/pqxxconnection.h
index 85bed42a..7e7cdf69 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection.h
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.h
@@ -17,10 +17,10 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef PQXXCONNECTION_H
-#define PQXXCONNECTION_H
+#ifndef PTQXXCONNECTION_H
+#define PTQXXCONNECTION_H
 
-#include <qstringlist.h>
+#include <tqstringlist.h>
 
 #include <kexidb/connection.h>
 #include "pqxxcursor.h"
@@ -48,11 +48,12 @@ class pqxxTransactionData : public TransactionData
 class pqxxSqlConnection : public Connection
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		virtual ~pqxxSqlConnection();
 
-		virtual Cursor* prepareQuery( const QString& statement = QString::null, uint cursor_options = 0 );
+		virtual Cursor* prepareQuery( const TQString& statement = TQString(), uint cursor_options = 0 );
 		virtual Cursor* prepareQuery( QuerySchema& query, uint cursor_options = 0 );
 		virtual PreparedStatement::Ptr prepareStatement(PreparedStatement::StatementType type, 
 			FieldList& fields);
@@ -63,19 +64,19 @@ class pqxxSqlConnection : public Connection
 		virtual bool drv_isDatabaseUsed() const;
 		virtual bool drv_connect(KexiDB::ServerVersionInfo& version);
 		virtual bool drv_disconnect();
-		virtual bool drv_getDatabasesList( QStringList &list );
-		virtual bool drv_createDatabase( const QString &dbName = QString::null );
-		virtual bool drv_useDatabase( const QString &dbName = QString::null, bool *cancelled = 0, 
+		virtual bool drv_getDatabasesList( TQStringList &list );
+		virtual bool drv_createDatabase( const TQString &dbName = TQString() );
+		virtual bool drv_useDatabase( const TQString &dbName = TQString(), bool *cancelled = 0, 
 		  MessageHandler* msgHandler = 0 );
 		virtual bool drv_closeDatabase();
-		virtual bool drv_dropDatabase( const QString &dbName = QString::null );
-		virtual bool drv_executeSQL( const QString& statement );
-		virtual Q_ULLONG drv_lastInsertRowID();
+		virtual bool drv_dropDatabase( const TQString &dbName = TQString() );
+		virtual bool drv_executeSQL( const TQString& statement );
+		virtual TQ_ULLONG drv_lastInsertRowID();
 
 //TODO: move this somewhere to low level class (MIGRATION?)
-		virtual bool drv_getTablesList( QStringList &list );
+		virtual bool drv_getTablesList( TQStringList &list );
 //TODO: move this somewhere to low level class (MIGRATION?)
-		virtual bool drv_containsTable( const QString &tableName );
+		virtual bool drv_containsTable( const TQString &tableName );
 
 		virtual TransactionData* drv_beginTransaction();
 		virtual bool drv_commitTransaction(TransactionData *);
@@ -83,13 +84,13 @@ class pqxxSqlConnection : public Connection
 
 		//Error reporting
 		virtual int serverResult();
-		virtual QString serverResultName();
+		virtual TQString serverResultName();
 		virtual void drv_clearServerResult();
-		virtual QString serverErrorMsg();
+		virtual TQString serverErrorMsg();
 		
 		pqxxSqlConnectionInternal *d;
 	private:
-		QString escapeName(const QString &tn) const;
+		TQString escapeName(const TQString &tn) const;
 		//  	pqxx::transaction_base* m_trans;
 		//! temporary solution for executeSQL()...
 		pqxxTransactionData *m_trans;