13 files changed, 17 insertions, 22 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index 6891f03..f0495c6 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -19,2 +19,3 @@
 
+using namespace Opie;
 AdressSearch::AdressSearch(QListView* parent, QString name):
diff --git a/core/pim/osearch/adresssearch.h b/core/pim/osearch/adresssearch.h
index 028521a..34c4f11 100644
--- a/core/pim/osearch/adresssearch.h
+++ b/core/pim/osearch/adresssearch.h
@@ -16,3 +16,2 @@
 
-using namespace Opie;
 
@@ -34,3 +33,3 @@ protected:
 private:
-    OPimContactAccess *_contacts;
+    Opie::OPimContactAccess *_contacts;
 };
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index 639af46..c89c6e2 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -18,3 +18,3 @@
 
-
+using namespace Opie;
 ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact)
diff --git a/core/pim/osearch/contactitem.h b/core/pim/osearch/contactitem.h
index 3c553fc..c038082 100644
--- a/core/pim/osearch/contactitem.h
+++ b/core/pim/osearch/contactitem.h
@@ -20,3 +20,2 @@
 
-using namespace Opie;
 
@@ -28,3 +27,3 @@ class ContactItem : public ResultItem
 public:
-    ContactItem(OListViewItem* parent, OPimContact *contact);
+    ContactItem(OListViewItem* parent, Opie::OPimContact *contact);
 
@@ -39,3 +38,3 @@ private:
 	void setIcon();
-	OPimContact *_contact;
+    Opie::OPimContact *_contact;
 
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp
index 8dcfc70..7bcf340 100644
--- a/core/pim/osearch/eventitem.cpp
+++ b/core/pim/osearch/eventitem.cpp
@@ -19,2 +19,3 @@
 
+using namespace Opie;
 EventItem::EventItem(OListViewItem* parent, OPimEvent *event)
diff --git a/core/pim/osearch/eventitem.h b/core/pim/osearch/eventitem.h
index 68923f1..d121020 100644
--- a/core/pim/osearch/eventitem.h
+++ b/core/pim/osearch/eventitem.h
@@ -19,3 +19,2 @@
 
-using namespace Opie;
 
@@ -27,3 +26,3 @@ class EventItem : public ResultItem
 public:
-    EventItem(OListViewItem* parent, OPimEvent *event);
+    EventItem(OListViewItem* parent, Opie::OPimEvent *event);
 
@@ -37,3 +36,3 @@ private:
     void setIcon();
-    OPimEvent *_event;
+    Opie::OPimEvent *_event;
 
diff --git a/core/pim/osearch/todoitem.h b/core/pim/osearch/todoitem.h
index 7c8537b..031369a 100644
--- a/core/pim/osearch/todoitem.h
+++ b/core/pim/osearch/todoitem.h
@@ -19,3 +19,2 @@
 
-using namespace Opie;
 
@@ -27,3 +26,3 @@ class TodoItem : public ResultItem
 public:
-    TodoItem(OListViewItem* parent, OPimTodo *todo);
+    TodoItem(OListViewItem* parent, Opie::OPimTodo *todo);
     ~TodoItem();
@@ -36,3 +35,3 @@ private:
     void setIcon();
-    OPimTodo *_todo;
+    Opie::OPimTodo *_todo;
 
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index cdf3a1c..1839566 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -21,3 +21,3 @@
 
-
+using namespace Opie;
 TodoSearch::TodoSearch(QListView* parent, QString name)
diff --git a/core/pim/osearch/todosearch.h b/core/pim/osearch/todosearch.h
index 740e483..c047348 100644
--- a/core/pim/osearch/todosearch.h
+++ b/core/pim/osearch/todosearch.h
@@ -22,3 +22,2 @@ class QAction;
 
-using namespace Opie;
 
@@ -41,3 +40,3 @@ protected:
 private:
-    OPimTodoAccess *_todos;
+    Opie::OPimTodoAccess *_todos;
     QAction *actionShowCompleted;
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h
index 68af323..f8ed89e 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.h
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h
@@ -29,3 +29,2 @@
 
-using namespace Opie; 
 
@@ -48,3 +47,3 @@ private:
 
-    
+
     // how many lines should be showed in the datebook section
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp
index a8e4c41..a71c477 100644
--- a/core/pim/today/plugins/mail/mailpluginwidget.cpp
+++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp
@@ -20,2 +20,3 @@
 
+using namespace Opie::Ui;
 MailPluginWidget::MailPluginWidget( QWidget *parent,  const char* name)
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.h b/core/pim/today/plugins/mail/mailpluginwidget.h
index 0ad8738..2c6104f 100644
--- a/core/pim/today/plugins/mail/mailpluginwidget.h
+++ b/core/pim/today/plugins/mail/mailpluginwidget.h
@@ -23,3 +23,2 @@
 
-using namespace Opie;
 
@@ -32,3 +31,3 @@ public:
     ~MailPluginWidget();
-    
+
     void refresh();
@@ -39,3 +38,3 @@ protected slots:
 private:
-    OClickableLabel* m_mailLabel;
+    Opie::Ui::OClickableLabel* m_mailLabel;
     QHBoxLayout* m_layout;
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h
index bea15d5..976dbf7 100644
--- a/core/pim/today/plugins/todolist/todoplugin.h
+++ b/core/pim/today/plugins/todolist/todoplugin.h
@@ -29,3 +29,2 @@
 
-using namespace Opie; 
 
@@ -36,3 +35,3 @@ public:
     ~TodolistPlugin();
-    
+
     QString pluginName()  const;