7 files changed, 17 insertions, 17 deletions
diff --git a/kexi/kexidb/drivers/mySQL/mySQL.pro b/kexi/kexidb/drivers/mySQL/mySQL.pro
index 6c443be30..5f00a4137 100644
--- a/kexi/kexidb/drivers/mySQL/mySQL.pro
+++ b/kexi/kexidb/drivers/mySQL/mySQL.pro
@@ -2,11 +2,11 @@ include( ../common.pro )
 
 INCLUDEPATH += $(MYSQL_INC) $(MYSQL_INC)/mysql
 
-tqcontains(CONFIG,debug) {
+contains(CONFIG,debug) {
 	win32:LIBS += $(MYSQL_LIB)/debug/libmysql.lib
 	win32:QMAKE_LFLAGS += /NODEFAULTLIB:LIBCMTD.LIB
 }
-!tqcontains(CONFIG,debug) {
+!contains(CONFIG,debug) {
 #	win32:LIBS += $(MYSQL_LIB)/opt/mysqlclient.lib
 	win32:LIBS += $(MYSQL_LIB)/opt/libmysql.lib
 #	win32:QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRT.LIB
diff --git a/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp b/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp
index 50b94ae2a..4a82df509 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp
@@ -154,7 +154,7 @@ bool MySqlConnectionInternal::executeSQL(const TQString& statement) {
 }
 
 TQString MySqlConnectionInternal::escapeIdentifier(const TQString& str) const {
-	return TQString(str).tqreplace('`', "'");
+	return TQString(str).replace('`', "'");
 }
 
 //--------------------------------------
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
index 9a1213b0a..4d7db1602 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
@@ -191,9 +191,9 @@ TQCString MySqlDriver::escapeString(const TQCString& str) const
 //! see http://dev.mysql.com/doc/refman/5.0/en/string-syntax.html
 
 	return TQCString("'")+TQCString(str)
-		.tqreplace( '\\', "\\\\" )
-		.tqreplace( '\'', "\\''" )
-		.tqreplace( '"', "\\\"" )
+		.replace( '\\', "\\\\" )
+		.replace( '\'', "\\''" )
+		.replace( '"', "\\\"" )
 		+ TQCString("'");
 }
 
@@ -201,11 +201,11 @@ TQCString MySqlDriver::escapeString(const TQCString& str) const
  * the name with single quotes.
  */
 TQString MySqlDriver::drv_escapeIdentifier( const TQString& str) const {
-	return TQString(str).tqreplace('`', "'");
+	return TQString(str).replace('`', "'");
 }
 
 TQCString MySqlDriver::drv_escapeIdentifier( const TQCString& str) const {
-	return TQCString(str).tqreplace('`', "'");
+	return TQCString(str).replace('`', "'");
 }
 
 #include "mysqldriver.moc"
diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
index 3d9162ca5..ce66a6e8e 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
@@ -150,13 +150,13 @@ TQCString pqxxSqlDriver::escapeString( const TQCString& str) const
 //==================================================================================
 //
 TQString pqxxSqlDriver::drv_escapeIdentifier( const TQString& str) const {
-	return TQString(str).tqreplace( '"', "\"\"" );
+	return TQString(str).replace( '"', "\"\"" );
 }
 
 //==================================================================================
 //
 TQCString pqxxSqlDriver::drv_escapeIdentifier( const TQCString& str) const {
-	return TQCString(str).tqreplace( '"', "\"\"" );
+	return TQCString(str).replace( '"', "\"\"" );
 }
 
 //==================================================================================
diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
index 27f190b8e..631f3bc6c 100644
--- a/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp
@@ -366,14 +366,14 @@ bool SQLiteConnection::isReadOnly() const
 }
 
 #ifdef SQLITE2
-bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool tqreplace)
+bool SQLiteConnection::drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool replace)
 {
 	const TQString oldTableName = tableSchema.name();
 	const bool destTableExists = this->tableSchema( newName ) != 0;
 
 	//1. drop the table
 	if (destTableExists) {
-		if (!tqreplace)
+		if (!replace)
 			return false;
 		if (!drv_dropTable( newName ))
 			return false;
diff --git a/kexi/kexidb/drivers/sqlite/sqliteconnection.h b/kexi/kexidb/drivers/sqlite/sqliteconnection.h
index 922e8447a..ab80675e4 100644
--- a/kexi/kexidb/drivers/sqlite/sqliteconnection.h
+++ b/kexi/kexidb/drivers/sqlite/sqliteconnection.h
@@ -109,7 +109,7 @@ class SQLiteConnection : public Connection
 		 \return true on success.
 		 More advanced server backends implement this using "ALTER TABLE .. RENAME TO". 
 		*/
-		virtual bool drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool tqreplace = false);
+		virtual bool drv_alterTableName(TableSchema& tableSchema, const TQString& newName, bool replace = false);
 #endif
 
 		//! for drv_changeFieldProperty()
diff --git a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
index c5128b63f..80276682b 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp
@@ -124,12 +124,12 @@ bool SQLiteDriver::drv_isSystemFieldName( const TQString& n ) const
 
 TQString SQLiteDriver::escapeString(const TQString& str) const
 {
-	return TQString("'")+TQString(str).tqreplace( '\'', "''" ) + "'";
+	return TQString("'")+TQString(str).replace( '\'', "''" ) + "'";
 }
 
 TQCString SQLiteDriver::escapeString(const TQCString& str) const
 {
-	return TQCString("'")+TQCString(str).tqreplace( '\'', "''" )+"'";
+	return TQCString("'")+TQCString(str).replace( '\'', "''" )+"'";
 }
 
 TQString SQLiteDriver::escapeBLOB(const TQByteArray& array) const
@@ -139,12 +139,12 @@ TQString SQLiteDriver::escapeBLOB(const TQByteArray& array) const
 
 TQString SQLiteDriver::drv_escapeIdentifier( const TQString& str) const
 {
-	return TQString(str).tqreplace( '"', "\"\"" );
+	return TQString(str).replace( '"', "\"\"" );
 }
 
 TQCString SQLiteDriver::drv_escapeIdentifier( const TQCString& str) const
 {
-	return TQCString(str).tqreplace( '"', "\"\"" );
+	return TQCString(str).replace( '"', "\"\"" );
 }
 
 AdminTools* SQLiteDriver::drv_createAdminTools() const