summaryrefslogtreecommitdiffstats
path: root/kexi/kexidb/drivers/mySQL
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/kexidb/drivers/mySQL')
-rw-r--r--kexi/kexidb/drivers/mySQL/mysqlconnection.cpp2
-rw-r--r--kexi/kexidb/drivers/mySQL/mysqldriver.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp b/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp
index 44853163..18682a4f 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp
@@ -175,7 +175,7 @@ bool MySqlConnection::drv_containsTable( const TQString &tableName )
{
bool success;
return resultExists(TQString("show tables like %1")
- .arg(driver()->escapeString(tableName)), success) && success;
+ .tqarg(driver()->escapeString(tableName)), success) && success;
}
bool MySqlConnection::drv_getTablesList( TQStringList &list )
diff --git a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
index 0f2bcf9b..01d326af 100644
--- a/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqldriver.cpp
@@ -120,12 +120,12 @@ TQString MySqlDriver::escapeString(const TQString& str) const
const int old_length = str.length();
int i;
for ( i = 0; i < old_length; i++ ) { //anything to escape?
- const unsigned int ch = str[i].unicode();
+ const unsigned int ch = str[i].tqunicode();
if (ch == '\\' || ch == '\'' || ch == '"' || ch == '\n' || ch == '\r' || ch == '\t' || ch == '\b' || ch == '\0')
break;
}
if (i >= old_length) { //no characters to escape
- return TQString::fromLatin1("'") + str + TQString::fromLatin1("'");
+ return TQString::tqfromLatin1("'") + str + TQString::tqfromLatin1("'");
}
TQChar *new_string = new TQChar[ old_length * 3 + 1 ]; // a worst case approximation
@@ -133,7 +133,7 @@ TQString MySqlDriver::escapeString(const TQString& str) const
int new_length = 0;
new_string[new_length++] = '\''; //prepend '
for ( i = 0; i < old_length; i++, new_length++ ) {
- const unsigned int ch = str[i].unicode();
+ const unsigned int ch = str[i].tqunicode();
if (ch == '\\') {
new_string[new_length++] = '\\';
new_string[new_length] = '\\';