summaryrefslogtreecommitdiff
path: root/libopie2/opiedb
authoreilers <eilers>2004-04-10 17:13:14 (UTC)
committer eilers <eilers>2004-04-10 17:13:14 (UTC)
commit096b94bf150d2f3a2ef9a26940871ee7ffa58bdf (patch) (side-by-side diff)
treec5cab0e19edc9aed9f8367a720619532ddac669c /libopie2/opiedb
parent4113636e53922f292477ca3f97035a624cf0450b (diff)
downloadopie-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') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp8
-rw-r--r--libopie2/opiedb/osqlitedriver.h3
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
@@ -36,3 +36,2 @@
#include <stdlib.h>
-#include <regex.h>
#include <stdio.h>
@@ -43,4 +42,5 @@
-using namespace Opie::DB;
-using namespace Opie::DB::Internal;
+namespace Opie {
+namespace DB {
+namespace Internal {
@@ -231 +231,3 @@ int OSQLiteDriver::call_back( void* voi, int argc,
}
+
+}}} // 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
@@ -7,2 +7,5 @@
#endif
+#ifdef Q_OS_MACX
+#include <sys/types.h>
+#endif
#include <regex.h>