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
@@ -17,6 +17,7 @@
 
 //#include <qwhatsthis.h>
 
+using namespace Opie;
 AdressSearch::AdressSearch(QListView* parent, QString name):
         SearchGroup(parent, 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
@@ -14,7 +14,6 @@
 #include "searchgroup.h"
 #include <opie2/ocontactaccess.h>
 
-using namespace Opie;
 
 
 /**
@@ -32,7 +31,7 @@ protected:
         virtual void insertItem( void* );
 
 private:
-    OPimContactAccess *_contacts;
+    Opie::OPimContactAccess *_contacts;
 };
 
 #endif
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
@@ -16,7 +16,7 @@
 #include <qpe/qcopenvelope_qws.h>
 
 
-
+using namespace Opie;
 ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact)
 : ResultItem(parent)
 {
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
@@ -18,7 +18,6 @@
 
 #include "resultitem.h"
 
-using namespace Opie;
 
 /**
 @author Patrick S. Vogt
@@ -26,7 +25,7 @@ using namespace Opie;
 class ContactItem : public ResultItem
 {
 public:
-    ContactItem(OListViewItem* parent, OPimContact *contact);
+    ContactItem(OListViewItem* parent, Opie::OPimContact *contact);
 
     ~ContactItem();
 
@@ -37,7 +36,7 @@ public:
 
 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
@@ -17,6 +17,7 @@
 #include <qpe/qcopenvelope_qws.h>
 
 
+using namespace Opie;
 EventItem::EventItem(OListViewItem* parent, OPimEvent *event)
  : ResultItem(parent)
 {
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
@@ -17,7 +17,6 @@
 
 #include <opie2/opimevent.h>
 
-using namespace Opie;
 
 /**
 @author Patrick S. Vogt
@@ -25,7 +24,7 @@ using namespace Opie;
 class EventItem : public ResultItem
 {
 public:
-    EventItem(OListViewItem* parent, OPimEvent *event);
+    EventItem(OListViewItem* parent, Opie::OPimEvent *event);
 
     ~EventItem();
 
@@ -35,7 +34,7 @@ public:
 
 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
@@ -17,7 +17,6 @@
 #include <opie2/opimtodo.h>
 #include "resultitem.h"
 
-using namespace Opie;
 
 /**
 @author Patrick S. Vogt
@@ -25,7 +24,7 @@ using namespace Opie;
 class TodoItem : public ResultItem
 {
 public:
-    TodoItem(OListViewItem* parent, OPimTodo *todo);
+    TodoItem(OListViewItem* parent, Opie::OPimTodo *todo);
     ~TodoItem();
 
     virtual QString toRichText();
@@ -34,7 +33,7 @@ public:
 
 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
@@ -19,7 +19,7 @@
 #include <qaction.h>
 #include <qpopupmenu.h>
 
-
+using namespace Opie;
 TodoSearch::TodoSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _todos(0), _popupMenu(0)
 {
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
@@ -20,7 +20,6 @@
 
 class QAction;
 
-using namespace Opie;
 
 /**
 @author Patrick S. Vogt
@@ -39,7 +38,7 @@ protected:
         virtual void insertItem( void* );
 
 private:
-    OPimTodoAccess *_todos;
+    Opie::OPimTodoAccess *_todos;
     QAction *actionShowCompleted;
     QPopupMenu *_popupMenu;
 };
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
@@ -27,7 +27,6 @@
 #include <qguardedptr.h>
 #include <qlist.h>
 
-using namespace Opie; 
 
 class DatebookPluginWidget :  public QWidget {
 
@@ -46,7 +45,7 @@ private:
     void readConfig();
     void getDates();
 
-    
+
     // how many lines should be showed in the datebook section
     int m_max_lines_meet;
     // If location is to be showed too, 1 to activate it.
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
@@ -18,6 +18,7 @@
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
+using namespace Opie::Ui;
 MailPluginWidget::MailPluginWidget( QWidget *parent,  const char* name)
     : QWidget(parent,  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
@@ -21,7 +21,6 @@
 
 #include <opie2/oclickablelabel.h>
 
-using namespace Opie;
 
 class MailPluginWidget : public QWidget {
 
@@ -30,14 +29,14 @@ class MailPluginWidget : public QWidget {
 public:
     MailPluginWidget( QWidget *parent,  const char *name );
     ~MailPluginWidget();
-    
+
     void refresh();
 
 protected slots:
     void startMail();
 
 private:
-    OClickableLabel* m_mailLabel;
+    Opie::Ui::OClickableLabel* m_mailLabel;
     QHBoxLayout* m_layout;
     void readConfig();
     void getInfo();
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
@@ -27,14 +27,13 @@
 #include <qguardedptr.h>
 #include <qwidget.h>
 
-using namespace Opie; 
 
 class TodolistPlugin : public TodayPluginObject {
 
 public:
     TodolistPlugin();
     ~TodolistPlugin();
-    
+
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;