summaryrefslogtreecommitdiff
authoreilers <eilers>2003-09-29 07:45:13 (UTC)
committer eilers <eilers>2003-09-29 07:45:13 (UTC)
commit5e0dd8f6328bff965878c80b9d220a535b826376 (patch) (side-by-side diff)
treee9f541e05ae510fba50dcce89e98b284f6cc5fd0
parent36d6b0096c41b01e69bb0d12e6c29648cbbf8290 (diff)
downloadopie-5e0dd8f6328bff965878c80b9d220a535b826376.zip
opie-5e0dd8f6328bff965878c80b9d220a535b826376.tar.gz
opie-5e0dd8f6328bff965878c80b9d220a535b826376.tar.bz2
Fixing umlaut problem.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiedb/opiedb.pro3
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp18
2 files changed, 16 insertions, 5 deletions
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro
index 3612f0e..bf547ab 100644
--- a/libopie2/opiedb/opiedb.pro
+++ b/libopie2/opiedb/opiedb.pro
@@ -1,5 +1,6 @@
TEMPLATE = lib
-CONFIG += qt warn_on debug
+#CONFIG += qt warn_on debug
+CONFIG += qt warn_on release
DESTDIR = $(OPIEDIR)/lib
HEADERS = osqlbackend.h \
osqldriver.h \
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index 9214ad3..99fd218 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -4,6 +4,10 @@
#include "osqlquery.h"
#include "osqlitedriver.h"
+// fromLocal8Bit() does not work as expected. Thus it
+// is replaced by fromLatin1() (eilers)
+#define __BUGGY_LOCAL8BIT_
+
namespace {
struct Query {
@@ -80,7 +84,7 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
free(err );
// FixMe Errors
}
- qWarning("Item count is %d", query.items.count() );
+ // qWarning("Item count is %d", query.items.count() );
OSQLResult result(OSQLResult::Success,
query.items,
query.errors );
@@ -102,18 +106,24 @@ int OSQLiteDriver::handleCallBack( int, char**, char** ) {
/* callback_handler add the values to the list*/
int OSQLiteDriver::call_back( void* voi, int argc,
char** argv, char** columns) {
- qWarning("Callback with %d items", argc );
+ // qWarning("Callback with %d items", argc );
Query* qu = (Query*)voi;
//copy them over to a OSQLResultItem
QMap<QString, QString> tableString;
QMap<int, QString> tableInt;
for (int i = 0; i < argc; i++ ) {
- qWarning("%s|%s", columns[i], argv[i] );
+ //qWarning("%s|%s", columns[i], argv[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
}
OSQLResultItem item( tableString, tableInt );
qu->items.append( item );