| author | eilers <eilers> | 2004-04-10 17:13:14 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2004-04-10 17:13:14 (UTC) |
| commit | 096b94bf150d2f3a2ef9a26940871ee7ffa58bdf (patch) (side-by-side diff) | |
| 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 @@ -33,17 +33,17 @@ #include <opie2/odebug.h> #include <stdlib.h> -#include <regex.h> #include <stdio.h> // fromLocal8Bit() does not work as expected. Thus it // is replaced by fromLatin1() (eilers) #define __BUGGY_LOCAL8BIT_ -using namespace Opie::DB; -using namespace Opie::DB::Internal; +namespace Opie { +namespace DB { +namespace Internal { namespace { struct Query { OSQLError::ValueList errors; @@ -228,4 +228,6 @@ int OSQLiteDriver::call_back( void* voi, int argc, columns ); } + +}}} // 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 @@ -4,8 +4,11 @@ #include <sqlite.h> #if defined (__GNUC__) && (__GNUC__ < 3) #include <sys/types.h> #endif +#ifdef Q_OS_MACX +#include <sys/types.h> +#endif #include <regex.h> #include "osqldriver.h" #include "osqlerror.h" |