author | eilers <eilers> | 2004-04-10 17:13:14 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-04-10 17:13:14 (UTC) |
commit | 096b94bf150d2f3a2ef9a26940871ee7ffa58bdf (patch) (unidiff) | |
tree | c5cab0e19edc9aed9f8367a720619532ddac669c /libopie2/opiedb/osqlitedriver.cpp | |
parent | 4113636e53922f292477ca3f97035a624cf0450b (diff) | |
download | opie-096b94bf150d2f3a2ef9a26940871ee7ffa58bdf.zip opie-096b94bf150d2f3a2ef9a26940871ee7ffa58bdf.tar.gz opie-096b94bf150d2f3a2ef9a26940871ee7ffa58bdf.tar.bz2 |
Some fixes to the namespace using.
the first test implementation of regexp-search for addressbook (disabled)
Diffstat (limited to 'libopie2/opiedb/osqlitedriver.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index 3ba161e..ccac2f8 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp | |||
@@ -25,33 +25,33 @@ | |||
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | 28 | ||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "osqlquery.h" | 31 | #include "osqlquery.h" |
32 | #include "osqlitedriver.h" | 32 | #include "osqlitedriver.h" |
33 | 33 | ||
34 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
35 | 35 | ||
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | #include <regex.h> | ||
38 | #include <stdio.h> | 37 | #include <stdio.h> |
39 | 38 | ||
40 | // fromLocal8Bit() does not work as expected. Thus it | 39 | // fromLocal8Bit() does not work as expected. Thus it |
41 | // is replaced by fromLatin1() (eilers) | 40 | // is replaced by fromLatin1() (eilers) |
42 | #define __BUGGY_LOCAL8BIT_ | 41 | #define __BUGGY_LOCAL8BIT_ |
43 | 42 | ||
44 | using namespace Opie::DB; | 43 | namespace Opie { |
45 | using namespace Opie::DB::Internal; | 44 | namespace DB { |
45 | namespace Internal { | ||
46 | 46 | ||
47 | namespace { | 47 | namespace { |
48 | struct Query { | 48 | struct Query { |
49 | OSQLError::ValueList errors; | 49 | OSQLError::ValueList errors; |
50 | OSQLResultItem::ValueList items; | 50 | OSQLResultItem::ValueList items; |
51 | OSQLiteDriver *driver; | 51 | OSQLiteDriver *driver; |
52 | }; | 52 | }; |
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | OSQLiteDriver::OSQLiteDriver( QLibrary *lib ) | 56 | OSQLiteDriver::OSQLiteDriver( QLibrary *lib ) |
57 | : OSQLDriver( lib ) | 57 | : OSQLDriver( lib ) |
@@ -220,12 +220,14 @@ int OSQLiteDriver::call_back( void* voi, int argc, | |||
220 | QString::fromLocal8Bit( argv[i] ) ); | 220 | QString::fromLocal8Bit( argv[i] ) ); |
221 | #endif | 221 | #endif |
222 | } | 222 | } |
223 | OSQLResultItem item( tableString, tableInt ); | 223 | OSQLResultItem item( tableString, tableInt ); |
224 | qu->items.append( item ); | 224 | qu->items.append( item ); |
225 | 225 | ||
226 | return ((Query*)voi)->driver->handleCallBack( argc, | 226 | return ((Query*)voi)->driver->handleCallBack( argc, |
227 | argv, | 227 | argv, |
228 | columns ); | 228 | columns ); |
229 | 229 | ||
230 | 230 | ||
231 | } | 231 | } |
232 | |||
233 | }}} // namespace OPIE::DB::Internal | ||