diff options
Diffstat (limited to 'kexi/kexidb')
| -rw-r--r-- | kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp | 2 | ||||
| -rw-r--r-- | kexi/kexidb/parser/parser_p.cpp | 4 | ||||
| -rw-r--r-- | kexi/kexidb/simplecommandlineapp.cpp | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp b/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp index 7b245d9a..74479fe7 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp @@ -153,7 +153,7 @@ bool MySqlPreparedStatement::execute() if (field->isTextType()) { //! @todo optimize m_stringBuffer[ 1024 ]; ??? - char *str = qstrncpy(m_stringBuffer, (const char*)(*it).toString().utf8(), 1024); + char *str = tqstrncpy(m_stringBuffer, (const char*)(*it).toString().utf8(), 1024); m_mysqlBind[arg].buffer_type = MYSQL_TYPE_STRING; m_mysqlBind[arg].buffer = m_stringBuffer; m_mysqlBind[arg].is_null = (my_bool*)0; diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index 38a7d386..1d2e5295 100644 --- a/kexi/kexidb/parser/parser_p.cpp +++ b/kexi/kexidb/parser/parser_p.cpp @@ -84,11 +84,11 @@ void yyerror(const char *str) KexiDBDbg << "at character " << current << " near tooken " << ctoken << endl; parser->setOperation(Parser::OP_Error); - const bool otherError = (qstrnicmp(str, "other error", 11)==0); + const bool otherError = (tqstrnicmp(str, "other error", 11)==0); if (parser->error().type().isEmpty() && (str==0 || strlen(str)==0 - || qstrnicmp(str, "syntax error", 12)==0 || qstrnicmp(str, "parse error", 11)==0) + || tqstrnicmp(str, "syntax error", 12)==0 || tqstrnicmp(str, "parse error", 11)==0) || otherError) { KexiDBDbg << parser->statement() << endl; diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp index 570043fe..c0f95391 100644 --- a/kexi/kexidb/simplecommandlineapp.cpp +++ b/kexi/kexidb/simplecommandlineapp.cpp @@ -108,17 +108,17 @@ SimpleCommandLineApp::SimpleCommandLineApp( d->allOptions = new KCmdLineOptions[predefinedOptionsCount + userOptionsCount + 1]; KCmdLineOptions *allOptionsPtr = d->allOptions; for (KCmdLineOptions *optionsPtr = predefinedOptions; optionsPtr->name; optionsPtr++, allOptionsPtr++) { - allOptionsPtr->name = qstrdup(optionsPtr->name); - allOptionsPtr->description = qstrdup(optionsPtr->description); + allOptionsPtr->name = tqstrdup(optionsPtr->name); + allOptionsPtr->description = tqstrdup(optionsPtr->description); if (optionsPtr == predefinedOptions) //first row == drv - allOptionsPtr->def = qstrdup(KexiDB::Driver::defaultFileBasedDriverName().latin1()); + allOptionsPtr->def = tqstrdup(KexiDB::Driver::defaultFileBasedDriverName().latin1()); else - allOptionsPtr->def = qstrdup(optionsPtr->def); + allOptionsPtr->def = tqstrdup(optionsPtr->def); } for (KCmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, allOptionsPtr++) { - allOptionsPtr->name = qstrdup(optionsPtr->name); - allOptionsPtr->description = qstrdup(optionsPtr->description); - allOptionsPtr->def = qstrdup(optionsPtr->def); + allOptionsPtr->name = tqstrdup(optionsPtr->name); + allOptionsPtr->description = tqstrdup(optionsPtr->description); + allOptionsPtr->def = tqstrdup(optionsPtr->def); } allOptionsPtr->name = 0; //end allOptionsPtr->description = 0; |