| author | eilers <eilers> | 2004-06-27 17:34:44 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2004-06-27 17:34:44 (UTC) |
| commit | 0ef75ca5409d290df36d1c0bbf0413e37bfd4124 (patch) (unidiff) | |
| tree | a89d266f6ce2a6b90aff542d6c305c3fc5dde5b1 /libopie2/opiedb | |
| parent | e211aea3b9201920f442b36f6726d10c09b63154 (diff) | |
| download | opie-0ef75ca5409d290df36d1c0bbf0413e37bfd4124.zip opie-0ef75ca5409d290df36d1c0bbf0413e37bfd4124.tar.gz opie-0ef75ca5409d290df36d1c0bbf0413e37bfd4124.tar.bz2 | |
Argh.. Sorry for making problems !
CVS committed stuff which had merging conflicts... :(
| -rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index b9a491e..92f89cf 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp | |||
| @@ -170,9 +170,9 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { | |||
| 170 | char *err; | 170 | char *err; |
| 171 | /* SQLITE_OK 0 if return code > 0 == failure */ | 171 | /* SQLITE_OK 0 if return code > 0 == failure */ |
| 172 | if ( sqlite_exec(m_sqlite, qu->query().utf8(),&call_back, &query, &err) > 0 ) { | 172 | if ( sqlite_exec(m_sqlite, qu->query().utf8(),&call_back, &query, &err) > 0 ) { |
| 173 | qWarning("OSQLiteDriver::query: Error while executing %s",err); | 173 | owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; |
| 174 | free(err ); | 174 | free( err ); |
| 175 | // FixMe Errors | 175 | // FixMe Errors |
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | OSQLResult result(OSQLResult::Success, | 178 | OSQLResult result(OSQLResult::Success, |