4 files changed, 41 insertions, 39 deletions

diff --git a/kexi/kexidb/drivers/odbc/odbcconnection.cpp b/kexi/kexidb/drivers/odbc/odbcconnection.cpp
index ec5a7cdf..3ac6f082 100644
--- a/kexi/kexidb/drivers/odbc/odbcconnection.cpp
+++ b/kexi/kexidb/drivers/odbc/odbcconnection.cpp
@@ -23,8 +23,8 @@
 #include <sqltypes.h>
 
 //QT Includes 
-#include <qfile.h>
-#include <qdir.h>
+#include <tqfile.h>
+#include <tqdir.h>
 
 //KDE Includes
 #include <kgenericfactory.h>
@@ -45,7 +45,7 @@ class ODBCConnectionPrivate
 {
 	public:
 		ConnectionData connData;
-		QString currentDB;
+		TQString currentDB;
 		SQLHENV envHandle;
 		SQLHDBC connectionHandle;
 };
@@ -57,19 +57,19 @@ ODBCConnection::ODBCConnection( Driver *driver, ConnectionData &conn_data )
 	//d->connData = conn_data;
 }
 
-Cursor* ODBCConnection::prepareQuery(const QString& statement, uint cursor_options)
+Cursor* ODBCConnection::prepareQuery(const TQString& statement, uint cursor_options)
 {
 	Q_UNUSED( statement );
 	Q_UNUSED( cursor_options );
 	return 0;
 }
 
-QString ODBCConnection::escapeString(const QString& str) const
+TQString ODBCConnection::escapeString(const TQString& str) const
 {
 	return str;
 }
 
-QCString ODBCConnection::escapeString(const QCString& str) const
+TQCString ODBCConnection::escapeString(const TQCString& str) const
 {
 	return str;
 }
@@ -112,17 +112,17 @@ bool ODBCConnection::drv_disconnect()
 	return true;
 }
 
-bool ODBCConnection::drv_getDatabasesList(QStringList &)
+bool ODBCConnection::drv_getDatabasesList(TQStringList &)
 {
 	return false;
 }
 
-bool ODBCConnection::drv_createDatabase(const QString &)
+bool ODBCConnection::drv_createDatabase(const TQString &)
 {
 	return false;
 }
 
-bool ODBCConnection::drv_useDatabase(const QString &)
+bool ODBCConnection::drv_useDatabase(const TQString &)
 {
 	return false;
 }
@@ -132,12 +132,12 @@ bool ODBCConnection::drv_closeDatabase()
 	return false;
 }
 
-bool ODBCConnection::drv_dropDatabase(const QString &)
+bool ODBCConnection::drv_dropDatabase(const TQString &)
 {
 	return false;
 }
 
-bool ODBCConnection::drv_executeSQL(const QString &)
+bool ODBCConnection::drv_executeSQL(const TQString &)
 {
 	return false;
 }
diff --git a/kexi/kexidb/drivers/odbc/odbcconnection.h b/kexi/kexidb/drivers/odbc/odbcconnection.h
index 8f551905..128eab61 100644
--- a/kexi/kexidb/drivers/odbc/odbcconnection.h
+++ b/kexi/kexidb/drivers/odbc/odbcconnection.h
@@ -20,7 +20,7 @@
 #ifndef KEXIDB_CONN_ODBC_H
 #define KEXIDB_CONN_ODBC_H
 
-#include <qstringlist.h>
+#include <tqstringlist.h>
 
 #include <kexidb/connection.h>
 #include <kexidb/tableschema.h>
@@ -39,13 +39,14 @@ class Driver;
 class ODBCConnection : public Connection
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 		~ODBCConnection();
 
-		virtual Cursor* prepareQuery( const QString& statement = QString::null, uint cursor_options = 0 );
-		virtual QString escapeString(const QString& str) const;
-		virtual QCString escapeString(const QCString& str) const;
+		virtual Cursor* prepareQuery( const TQString& statement = TQString(), uint cursor_options = 0 );
+		virtual TQString escapeString(const TQString& str) const;
+		virtual TQCString escapeString(const TQCString& str) const;
 
 	protected:
 		/*! Used by driver */
@@ -55,29 +56,29 @@ class ODBCConnection : public Connection
 		
 		virtual bool drv_disconnect();
 		
-		virtual bool drv_getDatabasesList( QStringList &list );
+		virtual bool drv_getDatabasesList( TQStringList &list );
 		
 		/*! Creates new database using connection. Note: Do not pass \a dbName 
 			arg because for file-based engine (that has one database per connection)
 			it is defined during connection. */
-		virtual bool drv_createDatabase( const QString &dbName = QString::null );
+		virtual bool drv_createDatabase( const TQString &dbName = TQString() );
 		
 		/*! Opens existing database using connection. Do not pass \a dbName 
 			arg because for file-based engine (that has one database per connection)
 			it is defined during connection. If you pass it, 
 			database file name will be changed. */
-		virtual bool drv_useDatabase( const QString &dbName = QString::null );
+		virtual bool drv_useDatabase( const TQString &dbName = TQString() );
 		
 		virtual bool drv_closeDatabase();
 		
 		/*! Drops database from the server using connection.
 			After drop, database shouldn't be accessible 
 			anymore, so database file is just removed. See note from drv_useDatabase(). */
-		virtual bool drv_dropDatabase( const QString &dbName = QString::null );
+		virtual bool drv_dropDatabase( const TQString &dbName = TQString() );
 
 		//virtual bool drv_createTable( const KexiDB::Table& table );
 
-		virtual bool drv_executeSQL( const QString& statement );
+		virtual bool drv_executeSQL( const TQString& statement );
 
 		friend class ODBCDriver;
 	
diff --git a/kexi/kexidb/drivers/odbc/odbcdriver.cpp b/kexi/kexidb/drivers/odbc/odbcdriver.cpp
index aac6a6c9..38e0796e 100644
--- a/kexi/kexidb/drivers/odbc/odbcdriver.cpp
+++ b/kexi/kexidb/drivers/odbc/odbcdriver.cpp
@@ -18,10 +18,10 @@
 */
 
 //QT Includes
-#include <qfile.h>
-#include <qdir.h>
-#include <qstring.h>
-#include <qcstring.h>
+#include <tqfile.h>
+#include <tqdir.h>
+#include <tqstring.h>
+#include <tqcstring.h>
 
 //KDE Includes
 #include <kdebug.h>
@@ -39,8 +39,8 @@ using namespace KexiDB;
 
 KEXIDB_DRIVER_INFO( ODBCDriver, odbc )
 
-ODBCDriver::ODBCDriver( QObject *parent, const char *name, const QStringList &args )
-	: Driver( parent, name, args )
+ODBCDriver::ODBCDriver( TQObject *tqparent, const char *name, const TQStringList &args )
+	: Driver( tqparent, name, args )
 {
 	d->isFileDriver = false;
 	d->isDBOpenedAfterCreate = true;
@@ -76,30 +76,30 @@ KexiDB::Connection* ODBCDriver::drv_createConnection( ConnectionData &conn_data
 	//return new ODBCConnection( this, conn_data );
 }
 
-bool ODBCDriver::isSystemDatabaseName( const QString& name ) const
+bool ODBCDriver::isSystemDatabaseName( const TQString& name ) const
 {
 	Q_UNUSED( name );
 	return false;
 }
 
-bool ODBCDriver::isSystemObjectName( const QString& name )
+bool ODBCDriver::isSystemObjectName( const TQString& name )
 {
 	Q_UNUSED( name );
 	return false;
 }
 
-bool ODBCDriver::isSystemFieldName( const QString& name ) const
+bool ODBCDriver::isSystemFieldName( const TQString& name ) const
 {
 	Q_UNUSED( name );
 	return false;
 }
 
-QString ODBCDriver::escapeString( const QString& str ) const
+TQString ODBCDriver::escapeString( const TQString& str ) const
 {
 	return str;
 }
 
-QCString ODBCDriver::escapeString( const QCString& str ) const
+TQCString ODBCDriver::escapeString( const TQCString& str ) const
 {
 	return str;
 }
diff --git a/kexi/kexidb/drivers/odbc/odbcdriver.h b/kexi/kexidb/drivers/odbc/odbcdriver.h
index 60681f21..c26af43f 100644
--- a/kexi/kexidb/drivers/odbc/odbcdriver.h
+++ b/kexi/kexidb/drivers/odbc/odbcdriver.h
@@ -23,8 +23,8 @@
 //Kexi Includes
 #include <kexidb/driver.h>
 
-class QCString;
-class QString;
+class TQCString;
+class TQString;
 
 namespace KexiDB
 {
@@ -41,27 +41,28 @@ class ODBCDriverPrivate;
 class ODBCDriver : public Driver
 {
 	Q_OBJECT
+  TQ_OBJECT
 	KEXIDB_DRIVER
 
 	public:
-		ODBCDriver( QObject *parent, const char *name, const QStringList &args = QStringList() );
+		ODBCDriver( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() );
 		~ODBCDriver();
 
-		virtual bool isSystemDatabaseName( const QString& name ) const;
+		virtual bool isSystemDatabaseName( const TQString& name ) const;
 		/** \return true if n is a system object name; 
 		 * \todo Find out what is a system object name and what isn't  
 		 */
-		virtual bool isSystemObjectName( const QString& name );
+		virtual bool isSystemObjectName( const TQString& name );
 
 		/** 
 		 * \return true if \a n is a system field name; 
 		 * There aren't any system fields per tables, unless the table
 		 * is a system table
 		 */
-		virtual bool isSystemFieldName( const QString& name ) const;
+		virtual bool isSystemFieldName( const TQString& name ) const;
 		
-		virtual QString escapeString( const QString& str ) const;
-		virtual QCString escapeString( const QCString& str ) const;
+		virtual TQString escapeString( const TQString& str ) const;
+		virtual TQCString escapeString( const TQCString& str ) const;
 
 	protected:
 		virtual Connection *drv_createConnection( ConnectionData &conn_data );