| -rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index 69eddfe..b9a491e 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp @@ -33,18 +33,14 @@ #include <opie2/odebug.h> #include <stdlib.h> #include <stdio.h> -// fromLocal8Bit() does not work as expected. Thus it -// is replaced by fromLatin1() (eilers) -#define __BUGGY_LOCAL8BIT_ - -namespace Opie { -namespace DB { +namespace Opie { +namespace DB { namespace Internal { namespace { struct Query { OSQLError::ValueList errors; OSQLResultItem::ValueList items; @@ -170,14 +166,14 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { return result; } Query query; query.driver = this; char *err; /* SQLITE_OK 0 if return code > 0 == failure */ - if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err) > 0 ) { - owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; + if ( sqlite_exec(m_sqlite, qu->query().utf8(),&call_back, &query, &err) > 0 ) { + qWarning("OSQLiteDriver::query: Error while executing %s",err); free(err ); // FixMe Errors } OSQLResult result(OSQLResult::Success, query.items, @@ -212,21 +208,15 @@ int OSQLiteDriver::call_back( void* voi, int argc, //copy them over to a OSQLResultItem QMap<QString, QString> tableString; QMap<int, QString> tableInt; for (int i = 0; i < argc; i++ ) { -#ifdef __BUGGY_LOCAL8BIT_ - tableInt.insert( i, QString::fromLatin1( argv[i] ) ); - tableString.insert( QString::fromLatin1( columns[i] ), - QString::fromLatin1( argv[i] ) ); -#else - tableInt.insert( i, QString::fromLocal8Bit( argv[i] ) ); - tableString.insert( QString::fromLocal8Bit( columns[i] ), - QString::fromLocal8Bit( argv[i] ) ); -#endif + tableInt.insert( i, QString::fromUtf8( argv[i] ) ); + tableString.insert( QString::fromUtf8( columns[i] ), + QString::fromUtf8( argv[i] ) ); } OSQLResultItem item( tableString, tableInt ); qu->items.append( item ); return ((Query*)voi)->driver->handleCallBack( argc, argv, |