summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/adresssearch.cpp1
-rw-r--r--core/pim/osearch/adresssearch.h3
-rw-r--r--core/pim/osearch/contactitem.cpp2
-rw-r--r--core/pim/osearch/contactitem.h5
-rw-r--r--core/pim/osearch/eventitem.cpp1
-rw-r--r--core/pim/osearch/eventitem.h5
-rw-r--r--core/pim/osearch/todoitem.h5
-rw-r--r--core/pim/osearch/todosearch.cpp2
-rw-r--r--core/pim/osearch/todosearch.h3
-rw-r--r--core/pim/today/plugins/datebook/datebookpluginwidget.h3
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.cpp1
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.h5
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.h3
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 @@
17 17
18//#include <qwhatsthis.h> 18//#include <qwhatsthis.h>
19 19
20using namespace Opie;
20AdressSearch::AdressSearch(QListView* parent, QString name): 21AdressSearch::AdressSearch(QListView* parent, QString name):
21 SearchGroup(parent, name) 22 SearchGroup(parent, name)
22{ 23{
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 @@
14#include "searchgroup.h" 14#include "searchgroup.h"
15#include <opie2/ocontactaccess.h> 15#include <opie2/ocontactaccess.h>
16 16
17using namespace Opie;
18 17
19 18
20/** 19/**
@@ -32,7 +31,7 @@ protected:
32 virtual void insertItem( void* ); 31 virtual void insertItem( void* );
33 32
34private: 33private:
35 OPimContactAccess *_contacts; 34 Opie::OPimContactAccess *_contacts;
36}; 35};
37 36
38#endif 37#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 @@
16#include <qpe/qcopenvelope_qws.h> 16#include <qpe/qcopenvelope_qws.h>
17 17
18 18
19 19using namespace Opie;
20ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact) 20ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact)
21: ResultItem(parent) 21: ResultItem(parent)
22{ 22{
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 @@
18 18
19#include "resultitem.h" 19#include "resultitem.h"
20 20
21using namespace Opie;
22 21
23/** 22/**
24@author Patrick S. Vogt 23@author Patrick S. Vogt
@@ -26,7 +25,7 @@ using namespace Opie;
26class ContactItem : public ResultItem 25class ContactItem : public ResultItem
27{ 26{
28public: 27public:
29 ContactItem(OListViewItem* parent, OPimContact *contact); 28 ContactItem(OListViewItem* parent, Opie::OPimContact *contact);
30 29
31 ~ContactItem(); 30 ~ContactItem();
32 31
@@ -37,7 +36,7 @@ public:
37 36
38private: 37private:
39 void setIcon(); 38 void setIcon();
40 OPimContact *_contact; 39 Opie::OPimContact *_contact;
41 40
42}; 41};
43 42
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 @@
17#include <qpe/qcopenvelope_qws.h> 17#include <qpe/qcopenvelope_qws.h>
18 18
19 19
20using namespace Opie;
20EventItem::EventItem(OListViewItem* parent, OPimEvent *event) 21EventItem::EventItem(OListViewItem* parent, OPimEvent *event)
21 : ResultItem(parent) 22 : ResultItem(parent)
22{ 23{
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 @@
17 17
18#include <opie2/opimevent.h> 18#include <opie2/opimevent.h>
19 19
20using namespace Opie;
21 20
22/** 21/**
23@author Patrick S. Vogt 22@author Patrick S. Vogt
@@ -25,7 +24,7 @@ using namespace Opie;
25class EventItem : public ResultItem 24class EventItem : public ResultItem
26{ 25{
27public: 26public:
28 EventItem(OListViewItem* parent, OPimEvent *event); 27 EventItem(OListViewItem* parent, Opie::OPimEvent *event);
29 28
30 ~EventItem(); 29 ~EventItem();
31 30
@@ -35,7 +34,7 @@ public:
35 34
36private: 35private:
37 void setIcon(); 36 void setIcon();
38 OPimEvent *_event; 37 Opie::OPimEvent *_event;
39 38
40}; 39};
41 40
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 @@
17#include <opie2/opimtodo.h> 17#include <opie2/opimtodo.h>
18#include "resultitem.h" 18#include "resultitem.h"
19 19
20using namespace Opie;
21 20
22/** 21/**
23@author Patrick S. Vogt 22@author Patrick S. Vogt
@@ -25,7 +24,7 @@ using namespace Opie;
25class TodoItem : public ResultItem 24class TodoItem : public ResultItem
26{ 25{
27public: 26public:
28 TodoItem(OListViewItem* parent, OPimTodo *todo); 27 TodoItem(OListViewItem* parent, Opie::OPimTodo *todo);
29 ~TodoItem(); 28 ~TodoItem();
30 29
31 virtual QString toRichText(); 30 virtual QString toRichText();
@@ -34,7 +33,7 @@ public:
34 33
35private: 34private:
36 void setIcon(); 35 void setIcon();
37 OPimTodo *_todo; 36 Opie::OPimTodo *_todo;
38 37
39}; 38};
40 39
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 @@
19#include <qaction.h> 19#include <qaction.h>
20#include <qpopupmenu.h> 20#include <qpopupmenu.h>
21 21
22 22using namespace Opie;
23TodoSearch::TodoSearch(QListView* parent, QString name) 23TodoSearch::TodoSearch(QListView* parent, QString name)
24: SearchGroup(parent, name), _todos(0), _popupMenu(0) 24: SearchGroup(parent, name), _todos(0), _popupMenu(0)
25{ 25{
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 @@
20 20
21class QAction; 21class QAction;
22 22
23using namespace Opie;
24 23
25/** 24/**
26@author Patrick S. Vogt 25@author Patrick S. Vogt
@@ -39,7 +38,7 @@ protected:
39 virtual void insertItem( void* ); 38 virtual void insertItem( void* );
40 39
41private: 40private:
42 OPimTodoAccess *_todos; 41 Opie::OPimTodoAccess *_todos;
43 QAction *actionShowCompleted; 42 QAction *actionShowCompleted;
44 QPopupMenu *_popupMenu; 43 QPopupMenu *_popupMenu;
45}; 44};
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 @@
27#include <qguardedptr.h> 27#include <qguardedptr.h>
28#include <qlist.h> 28#include <qlist.h>
29 29
30using namespace Opie;
31 30
32class DatebookPluginWidget : public QWidget { 31class DatebookPluginWidget : public QWidget {
33 32
@@ -46,7 +45,7 @@ private:
46 void readConfig(); 45 void readConfig();
47 void getDates(); 46 void getDates();
48 47
49 48
50 // how many lines should be showed in the datebook section 49 // how many lines should be showed in the datebook section
51 int m_max_lines_meet; 50 int m_max_lines_meet;
52 // If location is to be showed too, 1 to activate it. 51 // 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 @@
18#include <qpe/config.h> 18#include <qpe/config.h>
19#include <qpe/qcopenvelope_qws.h> 19#include <qpe/qcopenvelope_qws.h>
20 20
21using namespace Opie::Ui;
21MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) 22MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name)
22 : QWidget(parent, name ) { 23 : QWidget(parent, name ) {
23 24
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 @@
21 21
22#include <opie2/oclickablelabel.h> 22#include <opie2/oclickablelabel.h>
23 23
24using namespace Opie;
25 24
26class MailPluginWidget : public QWidget { 25class MailPluginWidget : public QWidget {
27 26
@@ -30,14 +29,14 @@ class MailPluginWidget : public QWidget {
30public: 29public:
31 MailPluginWidget( QWidget *parent, const char *name ); 30 MailPluginWidget( QWidget *parent, const char *name );
32 ~MailPluginWidget(); 31 ~MailPluginWidget();
33 32
34 void refresh(); 33 void refresh();
35 34
36protected slots: 35protected slots:
37 void startMail(); 36 void startMail();
38 37
39private: 38private:
40 OClickableLabel* m_mailLabel; 39 Opie::Ui::OClickableLabel* m_mailLabel;
41 QHBoxLayout* m_layout; 40 QHBoxLayout* m_layout;
42 void readConfig(); 41 void readConfig();
43 void getInfo(); 42 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 @@
27#include <qguardedptr.h> 27#include <qguardedptr.h>
28#include <qwidget.h> 28#include <qwidget.h>
29 29
30using namespace Opie;
31 30
32class TodolistPlugin : public TodayPluginObject { 31class TodolistPlugin : public TodayPluginObject {
33 32
34public: 33public:
35 TodolistPlugin(); 34 TodolistPlugin();
36 ~TodolistPlugin(); 35 ~TodolistPlugin();
37 36
38 QString pluginName() const; 37 QString pluginName() const;
39 double versionNumber() const; 38 double versionNumber() const;
40 QString pixmapNameWidget() const; 39 QString pixmapNameWidget() const;