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

diff --git a/kexi/kexidb/driver_p.h b/kexi/kexidb/driver_p.h
index 44ecd617..7a9be4ee 100644
--- a/kexi/kexidb/driver_p.h
+++ b/kexi/kexidb/driver_p.h
@@ -24,12 +24,12 @@
 # error "Do not include: this is KexiDB internal file"
 #endif
 
-#include <qstring.h>
-#include <qvariant.h>
-#include <qmap.h>
-#include <qptrdict.h>
-#include <qasciidict.h>
-#include <qvaluevector.h>
+#include <tqstring.h>
+#include <tqvariant.h>
+#include <tqmap.h>
+#include <tqptrdict.h>
+#include <tqasciidict.h>
+#include <tqvaluevector.h>
 #include <kgenericfactory.h>
 
 #include "connection.h"
@@ -50,19 +50,19 @@ class KEXI_DB_EXPORT DriverBehaviour
 		DriverBehaviour();
 			
 	//! "UNSIGNED" by default
-	QString UNSIGNED_TYPE_KEYWORD;
+	TQString UNSIGNED_TYPE_KEYWORD;
 	
 	//! "AUTO_INCREMENT" by default, used as add-in word to field definition
 	//! May be also used as full definition if SPECIAL_AUTO_INCREMENT_DEF is true.
-	QString AUTO_INCREMENT_FIELD_OPTION;
+	TQString AUTO_INCREMENT_FIELD_OPTION;
 
 	//! "AUTO_INCREMENT PRIMARY KEY" by default, used as add-in word to field definition
 	//! May be also used as full definition if SPECIAL_AUTO_INCREMENT_DEF is true.
-	QString AUTO_INCREMENT_PK_FIELD_OPTION;
+	TQString AUTO_INCREMENT_PK_FIELD_OPTION;
 
 	//! "" by default, used as type string for autoinc. field definition
 	//! pgsql defines it as "SERIAL", sqlite defines it as "INTEGER"
-	QString AUTO_INCREMENT_TYPE;
+	TQString AUTO_INCREMENT_TYPE;
 
 	/*! True if autoincrement field has special definition 
 	 e.g. like "INTEGER PRIMARY KEY" for SQLite.
@@ -72,7 +72,7 @@ class KEXI_DB_EXPORT DriverBehaviour
 
 	/*! True if autoincrement requires field to be declared as primary key.
 	 This is true for SQLite. False by default. */
-	bool AUTO_INCREMENT_REQUIRES_PK : 1;
+	bool AUTO_INCREMENT_RETQUIRES_PK : 1;
 
 	/*! Name of a field (or built-in function) with autoincremented unique value,
 	 typically returned by Connection::drv_lastInsertRowID().
@@ -81,7 +81,7 @@ class KEXI_DB_EXPORT DriverBehaviour
 	 - PostgreSQL and SQLite engines use 'OID' field 
 	 - MySQL uses LAST_INSERT_ID() built-in function
 	*/
-	QString ROW_ID_FIELD_NAME;
+	TQString ROW_ID_FIELD_NAME;
 	
 	/*! True if the value (fetched from field or function,
 	 defined by ROW_ID_FIELD_NAME member) is EXACTLY the value of autoincremented field,
@@ -109,12 +109,12 @@ class KEXI_DB_EXPORT DriverBehaviour
 	 
 	 \sa Connection::SetAvailableDatabaseName()
 	*/
-	QString ALWAYS_AVAILABLE_DATABASE_NAME;
+	TQString ALWAYS_AVAILABLE_DATABASE_NAME;
 	
 	/*! Quotation marks used for escaping identifier (see Driver::escapeIdentifier()).
 	 Default value is '"'. Change it for your driver.
 	*/
-	QChar QUOTATION_MARKS_FOR_IDENTIFIER;
+	TQChar TQUOTATION_MARKS_FOR_IDENTIFIER;
 	
 	/*! True if using database is requied to perform real connection.
 	 This is true for may engines, e.g. for PostgreSQL, where connections 
@@ -122,16 +122,16 @@ class KEXI_DB_EXPORT DriverBehaviour
 	 This flag is unused for file-based db drivers,
 	 by default set to true and used for all other db drivers.
 	*/
-	bool USING_DATABASE_REQUIRED_TO_CONNECT : 1;
+	bool USING_DATABASE_RETQUIRED_TO_CONNECT : 1;
 
 	/*! True if before we know whether the fetched result of executed query
 	 is empty or not, we need to fetch first record. Particularly, it's true for SQLite.
 	 The flag is used in Cursor::open(). By default this flag is false. */
-	bool _1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY : 1;
+	bool _1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY : 1;
 
 	/*! True if "SELECT 1 from (subquery)" is supported. False by default.
 	 Used in Connection::resultExists() for optimization. It's set to true for SQLite driver. */
-	bool SELECT_1_SUBQUERY_SUPPORTED : 1;
+	bool SELECT_1_SUBTQUERY_SUPPORTED : 1;
 
 	/*! Keywords that need to be escaped for the driver.  Set this before calling
 	    Driver::initSQLKeywords. */
@@ -145,17 +145,17 @@ class DriverPrivate
 		DriverPrivate();
 		virtual ~DriverPrivate();
 
-		QPtrDict<Connection> connections;
+		TQPtrDict<Connection> connections;
 
-//(js)now QObject::name() is reused:
+//(js)now TQObject::name() is reused:
 //		/*! The name equal to the service name (X-Kexi-DriverName) 
 //		 stored in given service .desktop file. Set this in subclasses. */
-//		QString m_driverName;
+//		TQString m_driverName;
 		
 		/*! Name of MIME type of files handled by this driver 
 		 if it is a file-based database's driver 
 		 (equal X-Kexi-FileDBDriverMime service property) */
-		QString fileDBDriverMimeType;
+		TQString fileDBDriverMimeType;
 
 		/*! Info about the driver as a service. */
 		KService *service;
@@ -172,12 +172,12 @@ class DriverPrivate
 		 cannot be used by user, and in most cases user even shouldn't see these.
 		 The list contents is driver dependent (by default is empty) 
 		 - fill this in subclass ctor. */
-//		QStringList m_systemObjectNames;
+//		TQStringList m_systemObjectNames;
 
 		/*! List of system fields names, build-in system fields that cannot be used by user,
 		 and in most cases user even shouldn't see these.
 		 The list contents is driver dependent (by default is empty) - fill this in subclass ctor. */
-//		QStringList m_systemFieldNames;
+//		TQStringList m_systemFieldNames;
 
 		/*! Features (like transactions, etc.) supported by this driver
 		 (sum of selected  Features enum items). 
@@ -186,17 +186,17 @@ class DriverPrivate
 		int features;
 
 		//! real type names for this engine
-		QValueVector<QString> typeNames;
+		TQValueVector<TQString> typeNames;
 
 		/*! Driver properties dictionary (indexed by name), 
 		 useful for presenting properties to the user. 
 		 Set available properties here in driver implementation. */
-		QMap<QCString,QVariant> properties;
+		TQMap<TQCString,TQVariant> properties;
 
 		/*! i18n'd captions for properties. You do not need 
 		 to set predefined properties' caption in driver implementation 
 		 -it's done automatically. */
-		QMap<QCString,QString> propertyCaptions;
+		TQMap<TQCString,TQString> propertyCaptions;
 
 		/*! Provides a number of database administration tools for the driver. */
 		AdminTools *adminTools;
@@ -207,7 +207,7 @@ class DriverPrivate
 	    UI consistency and to allow DB migration without changing the queries.
 	    \sa DriverPrivate::initKexiKeywords(), KexiDB::kexiSQLKeywords.
 	*/
-	static QAsciiDict<bool>* kexiSQLDict;
+	static TQAsciiDict<bool>* kexiSQLDict;
 	static const char *kexiSQLKeywords[];
 	
 	/*! Driver-specific SQL keywords that need to be escaped if used as an
@@ -219,7 +219,7 @@ class DriverPrivate
 	
 	    \sa DriverBehaviour::SQL_KEYWORDS.
 	*/	
-	QAsciiDict<bool>* driverSQLDict;
+	TQAsciiDict<bool>* driverSQLDict;
 	
 	/*! Initialise the dictionary of Kexi SQL keywords used for escaping. */
 	void initKexiKeywords();
@@ -234,7 +234,7 @@ class DriverPrivate
 		void initInternalProperties();
 	
 	private:
-		void initKeywords(const char* keywords[], QAsciiDict<bool>& dict);
+		void initKeywords(const char* keywords[], TQAsciiDict<bool>& dict);
 	
 	friend class DriverManagerInternal;
 };