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 | |
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)
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 8 | ||||
-rw-r--r-- | libopie2/opiedb/osqlitedriver.h | 3 |
2 files changed, 8 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 | |||
@@ -35,5 +35,4 @@ | |||
35 | 35 | ||
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | #include <regex.h> | ||
38 | #include <stdio.h> | 37 | #include <stdio.h> |
39 | 38 | ||
@@ -42,6 +41,7 @@ | |||
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 { |
@@ -230,2 +230,4 @@ int OSQLiteDriver::call_back( void* voi, int argc, | |||
230 | 230 | ||
231 | } | 231 | } |
232 | |||
233 | }}} // namespace OPIE::DB::Internal | ||
diff --git a/libopie2/opiedb/osqlitedriver.h b/libopie2/opiedb/osqlitedriver.h index d5ab224..33037b8 100644 --- a/libopie2/opiedb/osqlitedriver.h +++ b/libopie2/opiedb/osqlitedriver.h | |||
@@ -6,4 +6,7 @@ | |||
6 | #include <sys/types.h> | 6 | #include <sys/types.h> |
7 | #endif | 7 | #endif |
8 | #ifdef Q_OS_MACX | ||
9 | #include <sys/types.h> | ||
10 | #endif | ||
8 | #include <regex.h> | 11 | #include <regex.h> |
9 | 12 | ||