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

diff --git a/kexi/kexidb/driver_p.cpp b/kexi/kexidb/driver_p.cpp
index 2ad5f9ce..8c7f096a 100644
--- a/kexi/kexidb/driver_p.cpp
+++ b/kexi/kexidb/driver_p.cpp
@@ -19,16 +19,16 @@
 */
 
 #include <kdebug.h>
-#include <qdict.h>
-#include <qvaluevector.h>
+#include <tqdict.h>
+#include <tqvaluevector.h>
 #include "driver_p.h"
 
 using namespace KexiDB;
 
 namespace KexiDB {
-	QAsciiDict<bool>* DriverPrivate::kexiSQLDict = 0;
+	TQAsciiDict<bool>* DriverPrivate::kexiSQLDict = 0;
 	
-	/*! QAsciiDict keys need to be a pointer to *something*.  Used
+	/*! TQAsciiDict keys need to be a pointer to *something*.  Used
 	    for SQL keyword dictionaries
 	*/
   static bool _dummy;
@@ -55,7 +55,7 @@ DriverPrivate::DriverPrivate()
 
 void DriverPrivate::initInternalProperties()
 {
-	properties["is_file_database"] = QVariant(isFileDriver, 1);
+	properties["is_file_database"] = TQVariant(isFileDriver, 1);
 	propertyCaptions["is_file_database"] = i18n("File-based database driver");
 	if (isFileDriver) {
 		properties["file_database_mimetype"] = fileDBDriverMimeType;
@@ -63,7 +63,7 @@ void DriverPrivate::initInternalProperties()
 	}
 
 #if 0
-	QString str;
+	TQString str;
 	if (features & Driver::SingleTransactions)
 		str = i18n("Single transactions");
 	else if (features & Driver::MultipleTransactions)
@@ -77,15 +77,15 @@ void DriverPrivate::initInternalProperties()
 #endif
 //	properties["transaction_support"] = features & Driver::TransactionsMask;
 //	propertyCaptions["transaction_support"] = i18n("Transaction support");
-	properties["transaction_single"] = QVariant(features & Driver::SingleTransactions, 1);
+	properties["transaction_single"] = TQVariant(features & Driver::SingleTransactions, 1);
 	propertyCaptions["transaction_single"] = i18n("Single transactions support");
-	properties["transaction_multiple"] = QVariant(features & Driver::MultipleTransactions, 1);
+	properties["transaction_multiple"] = TQVariant(features & Driver::MultipleTransactions, 1);
 	propertyCaptions["transaction_multiple"] = i18n("Multiple transactions support");
-	properties["transaction_nested"] = QVariant(features & Driver::NestedTransactions, 1);
+	properties["transaction_nested"] = TQVariant(features & Driver::NestedTransactions, 1);
 	propertyCaptions["transaction_nested"] = i18n("Nested transactions support");
 
 	properties["kexidb_driver_version"] =
-	  QString("%1.%2").arg(version().major).arg(version().minor);
+	  TQString("%1.%2").tqarg(version().major).tqarg(version().minor);
 	propertyCaptions["kexidb_driver_version"] =
 	  i18n("KexiDB driver version");
 }
@@ -98,23 +98,23 @@ DriverPrivate::~DriverPrivate()
 
 
 void DriverPrivate::initKexiKeywords() {
-	// QAsciiDict constructor args:
+	// TQAsciiDict constructor args:
 	//   size (preferable prime)
 	//   case sensitive flag (false)
 	//   copy strings (false)
 	if(!kexiSQLDict) {
-		kexiSQLDict = new QAsciiDict<bool>(79, false, false);
+		kexiSQLDict = new TQAsciiDict<bool>(79, false, false);
 		initKeywords(kexiSQLKeywords, *kexiSQLDict);
 	}
 }
 
 void DriverPrivate::initDriverKeywords(const char* keywords[], int hashSize) {
-	driverSQLDict = new QAsciiDict<bool>(hashSize, false, false);
+	driverSQLDict = new TQAsciiDict<bool>(hashSize, false, false);
 	initKeywords(keywords, *driverSQLDict);
 }
 
 void DriverPrivate::initKeywords(const char* keywords[], 
-    QAsciiDict<bool>& dict) {
+    TQAsciiDict<bool>& dict) {
 	for(int i = 0; keywords[i] != 0; i++) {
 		dict.insert(keywords[i], &_dummy);
 	}