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 | |||
@@ -157,35 +157,35 @@ bool OSQLiteDriver::close() { | |||
157 | return true; | 157 | return true; |
158 | } | 158 | } |
159 | 159 | ||
160 | 160 | ||
161 | /* Query */ | 161 | /* Query */ |
162 | OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { | 162 | OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { |
163 | if ( !m_sqlite ) { | 163 | if ( !m_sqlite ) { |
164 | // FIXME set error code | 164 | // FIXME set error code |
165 | OSQLResult result( OSQLResult::Failure ); | 165 | OSQLResult result( OSQLResult::Failure ); |
166 | return result; | 166 | return result; |
167 | } | 167 | } |
168 | Query query; | 168 | Query query; |
169 | query.driver = this; | 169 | query.driver = this; |
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, |
179 | query.items, | 179 | query.items, |
180 | query.errors ); | 180 | query.errors ); |
181 | return result; | 181 | return result; |
182 | } | 182 | } |
183 | 183 | ||
184 | 184 | ||
185 | OSQLTable::ValueList OSQLiteDriver::tables() const { | 185 | OSQLTable::ValueList OSQLiteDriver::tables() const { |
186 | 186 | ||
187 | } | 187 | } |
188 | 188 | ||
189 | 189 | ||
190 | OSQLError OSQLiteDriver::lastError() { | 190 | OSQLError OSQLiteDriver::lastError() { |
191 | OSQLError error; | 191 | OSQLError error; |