Fixing Bug #1328:

VCards: Real encoding in UTF-8. Now even chars > 0xff are supported.
SQL: Switching form latin1 encoding to UTF-8 encoding. We are now fully
Unicode compliant !
Sorry for all users already using the SQL interface for loosing their special
characters. There was no other way !
All other should export its SQL database to xml before updating and reimporting afterwards !

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
@@ -37,10 +37,6 @@
 #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 {
 
@@ -174,6 +170,6 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
     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
@@ -216,13 +212,7 @@ int OSQLiteDriver::call_back( void* voi, int argc,
     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 );