diff options
Diffstat (limited to 'kexi/kexidb/drivers/mySQL')
| -rw-r--r-- | kexi/kexidb/drivers/mySQL/mySQL.pro | 4 | ||||
| -rw-r--r-- | kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp | 2 | ||||
| -rw-r--r-- | kexi/kexidb/drivers/mySQL/mysqldriver.cpp | 10 |
3 files changed, 8 insertions, 8 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" |