9 files changed, 12 insertions, 15 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
@@ -12,16 +12,17 @@
 //
 #include "adresssearch.h"
 #include "contactitem.h"
 
 #include <qpe/resource.h>
 
 //#include <qwhatsthis.h>
 
+using namespace Opie;
 AdressSearch::AdressSearch(QListView* parent, QString name):
 	SearchGroup(parent, name)
 {
 	_contacts = 0;
 	QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
 	setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
 
 
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
@@ -9,17 +9,16 @@
 //
 //
 #ifndef ADRESSSEARCH_H
 #define ADRESSSEARCH_H
 
 #include "searchgroup.h"
 #include <opie2/ocontactaccess.h>
 
-using namespace Opie;
 
 
 /**
 @author Patrick S. Vogt
 */
 class AdressSearch : public SearchGroup
 {
 public:
@@ -27,12 +26,12 @@ public:
     ~AdressSearch();
 
 protected:
 	virtual void load();
 	virtual int search();
 	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
@@ -11,17 +11,17 @@
 //
 //
 #include "contactitem.h"
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 
-
+using namespace Opie;
 ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact)
 : ResultItem(parent)
 {
 	_contact = contact;
 	setText(0, _contact->toShortText());
 	setIcon();
 }
 
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
@@ -13,32 +13,31 @@
 #ifndef CONTACTITEM_H
 #define CONTACTITEM_H
 
 #include <opie2/opimrecord.h>
 #include <opie2/opimcontact.h>
 
 #include "resultitem.h"
 
-using namespace Opie;
 
 /**
 @author Patrick S. Vogt
 */
 class ContactItem : public ResultItem
 {
 public:
-    ContactItem(OListViewItem* parent, OPimContact *contact);
+    ContactItem(OListViewItem* parent, Opie::OPimContact *contact);
 
     ~ContactItem();
 
     virtual QString toRichText();
     virtual void action( int );
     virtual QIntDict<QString> actions();
 
 
 private:
 	void setIcon();
-	OPimContact *_contact;
+    Opie::OPimContact *_contact;
 
 };
 
 #endif
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
@@ -12,16 +12,17 @@
 //
 #include "eventitem.h"
 
 
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 
+using namespace Opie;
 EventItem::EventItem(OListViewItem* parent, OPimEvent *event)
  : ResultItem(parent)
 {
 	_event = event;
 	setText(0, _event->toShortText() );
 	setIcon();
 }
 
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
@@ -12,31 +12,30 @@
 //
 #ifndef EVENTITEM_H
 #define EVENTITEM_H
 
 #include "resultitem.h"
 
 #include <opie2/opimevent.h>
 
-using namespace Opie;
 
 /**
 @author Patrick S. Vogt
 */
 class EventItem : public ResultItem
 {
 public:
-    EventItem(OListViewItem* parent, OPimEvent *event);
+    EventItem(OListViewItem* parent, Opie::OPimEvent *event);
 
     ~EventItem();
 
     virtual QString toRichText();
     virtual void action( int );
     virtual QIntDict<QString> actions();
 
 private:
     void setIcon();
-    OPimEvent *_event;
+    Opie::OPimEvent *_event;
 
 };
 
 #endif
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
@@ -12,30 +12,29 @@
 //
 #ifndef TODOITEM_H
 #define TODOITEM_H
 
 
 #include <opie2/opimtodo.h>
 #include "resultitem.h"
 
-using namespace Opie;
 
 /**
 @author Patrick S. Vogt
 */
 class TodoItem : public ResultItem
 {
 public:
-    TodoItem(OListViewItem* parent, OPimTodo *todo);
+    TodoItem(OListViewItem* parent, Opie::OPimTodo *todo);
     ~TodoItem();
 
     virtual QString toRichText();
     virtual void action( int );
     virtual QIntDict<QString> actions();
 
 private:
     void setIcon();
-    OPimTodo *_todo;
+    Opie::OPimTodo *_todo;
 
 };
 
 #endif
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
@@ -14,17 +14,17 @@
 #include "todoitem.h"
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qaction.h>
 #include <qpopupmenu.h>
 
-
+using namespace Opie;
 TodoSearch::TodoSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _todos(0), _popupMenu(0)
 {
 //	AppLnkSet als(QPEApplication::qpeDir());
 //	setPixmap( 0, als.findExec("todolist")->pixmap() );
 	QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" );
 	setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
 	actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null,  0, 0, 0, true );
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
@@ -15,17 +15,16 @@
 
 #include "searchgroup.h"
 
 #include <opie2/otodoaccess.h>
 #include <opie2/opimtodo.h>
 
 class QAction;
 
-using namespace Opie;
 
 /**
 @author Patrick S. Vogt
 */
 class TodoSearch : public SearchGroup
 {
 public:
     TodoSearch(QListView* parent, QString name);
@@ -34,14 +33,14 @@ public:
     virtual QPopupMenu* popupMenu();
 
 protected:
 	virtual void load();
 	virtual int search();
 	virtual void insertItem( void* );
 
 private:
-    OPimTodoAccess *_todos;
+    Opie::OPimTodoAccess *_todos;
     QAction *actionShowCompleted;
     QPopupMenu *_popupMenu;
 };
 
 #endif