Some fixes to the namespace using.

the first test implementation of regexp-search for addressbook (disabled)

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>