summaryrefslogtreecommitdiff
path: root/libopie2/opiedb
authoreilers <eilers>2004-06-27 17:20:04 (UTC)
committer eilers <eilers>2004-06-27 17:20:04 (UTC)
commite211aea3b9201920f442b36f6726d10c09b63154 (patch) (side-by-side diff)
treea65a20ae610bf053c0ff4dd561759a3369784d39 /libopie2/opiedb
parentb394de64efa36eb463148da1409c87e8537c0dd9 (diff)
downloadopie-e211aea3b9201920f442b36f6726d10c09b63154.zip
opie-e211aea3b9201920f442b36f6726d10c09b63154.tar.gz
opie-e211aea3b9201920f442b36f6726d10c09b63154.tar.bz2
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 !
Diffstat (limited to 'libopie2/opiedb') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp24
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
@@ -38,8 +38,4 @@
-// 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 {
@@ -175,4 +171,4 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
/* 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 );
@@ -217,11 +213,5 @@ int OSQLiteDriver::call_back( void* voi, int argc,
-#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] ) );
}