-rw-r--r-- | core/pim/osearch/adresssearch.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/adresssearch.h | 3 | ||||
-rw-r--r-- | core/pim/osearch/contactitem.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/contactitem.h | 5 | ||||
-rw-r--r-- | core/pim/osearch/eventitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/eventitem.h | 5 | ||||
-rw-r--r-- | core/pim/osearch/todoitem.h | 5 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.h | 3 |
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 | |||
@@ -8,24 +8,25 @@ | |||
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "adresssearch.h" | 13 | #include "adresssearch.h" |
14 | #include "contactitem.h" | 14 | #include "contactitem.h" |
15 | 15 | ||
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | 17 | ||
18 | //#include <qwhatsthis.h> | 18 | //#include <qwhatsthis.h> |
19 | 19 | ||
20 | using namespace Opie; | ||
20 | AdressSearch::AdressSearch(QListView* parent, QString name): | 21 | AdressSearch::AdressSearch(QListView* parent, QString name): |
21 | SearchGroup(parent, name) | 22 | SearchGroup(parent, name) |
22 | { | 23 | { |
23 | _contacts = 0; | 24 | _contacts = 0; |
24 | QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" ); | 25 | QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" ); |
25 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); | 26 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); |
26 | 27 | ||
27 | 28 | ||
28 | //QWhatsThis::add( this, QObject::tr("Search the addressbook") ); | 29 | //QWhatsThis::add( this, QObject::tr("Search the addressbook") ); |
29 | /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" ); | 30 | /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" ); |
30 | QImage img = pix.convertToImage(); | 31 | QImage img = pix.convertToImage(); |
31 | img.smoothScale( 14, 14 ); | 32 | img.smoothScale( 14, 14 ); |
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 | |||
@@ -5,34 +5,33 @@ | |||
5 | // | 5 | // |
6 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 6 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
7 | // | 7 | // |
8 | // Copyright: See COPYING file that comes with this distribution | 8 | // Copyright: See COPYING file that comes with this distribution |
9 | // | 9 | // |
10 | // | 10 | // |
11 | #ifndef ADRESSSEARCH_H | 11 | #ifndef ADRESSSEARCH_H |
12 | #define ADRESSSEARCH_H | 12 | #define ADRESSSEARCH_H |
13 | 13 | ||
14 | #include "searchgroup.h" | 14 | #include "searchgroup.h" |
15 | #include <opie2/ocontactaccess.h> | 15 | #include <opie2/ocontactaccess.h> |
16 | 16 | ||
17 | using namespace Opie; | ||
18 | 17 | ||
19 | 18 | ||
20 | /** | 19 | /** |
21 | @author Patrick S. Vogt | 20 | @author Patrick S. Vogt |
22 | */ | 21 | */ |
23 | class AdressSearch : public SearchGroup | 22 | class AdressSearch : public SearchGroup |
24 | { | 23 | { |
25 | public: | 24 | public: |
26 | AdressSearch(QListView* parent, QString name); | 25 | AdressSearch(QListView* parent, QString name); |
27 | ~AdressSearch(); | 26 | ~AdressSearch(); |
28 | 27 | ||
29 | protected: | 28 | protected: |
30 | virtual void load(); | 29 | virtual void load(); |
31 | virtual int search(); | 30 | virtual int search(); |
32 | virtual void insertItem( void* ); | 31 | virtual void insertItem( void* ); |
33 | 32 | ||
34 | private: | 33 | private: |
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 | |||
@@ -7,25 +7,25 @@ | |||
7 | // | 7 | // |
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "contactitem.h" | 13 | #include "contactitem.h" |
14 | 14 | ||
15 | #include <qpe/resource.h> | 15 | #include <qpe/resource.h> |
16 | #include <qpe/qcopenvelope_qws.h> | 16 | #include <qpe/qcopenvelope_qws.h> |
17 | 17 | ||
18 | 18 | ||
19 | 19 | using namespace Opie; | |
20 | ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact) | 20 | ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact) |
21 | : ResultItem(parent) | 21 | : ResultItem(parent) |
22 | { | 22 | { |
23 | _contact = contact; | 23 | _contact = contact; |
24 | setText(0, _contact->toShortText()); | 24 | setText(0, _contact->toShortText()); |
25 | setIcon(); | 25 | setIcon(); |
26 | } | 26 | } |
27 | 27 | ||
28 | void ContactItem::setIcon() | 28 | void ContactItem::setIcon() |
29 | { | 29 | { |
30 | QPixmap icon; | 30 | QPixmap icon; |
31 | switch ( _contact->lastHitField() ) { | 31 | switch ( _contact->lastHitField() ) { |
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 | |||
@@ -9,36 +9,35 @@ | |||
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #ifndef CONTACTITEM_H | 13 | #ifndef CONTACTITEM_H |
14 | #define CONTACTITEM_H | 14 | #define CONTACTITEM_H |
15 | 15 | ||
16 | #include <opie2/opimrecord.h> | 16 | #include <opie2/opimrecord.h> |
17 | #include <opie2/opimcontact.h> | 17 | #include <opie2/opimcontact.h> |
18 | 18 | ||
19 | #include "resultitem.h" | 19 | #include "resultitem.h" |
20 | 20 | ||
21 | using namespace Opie; | ||
22 | 21 | ||
23 | /** | 22 | /** |
24 | @author Patrick S. Vogt | 23 | @author Patrick S. Vogt |
25 | */ | 24 | */ |
26 | class ContactItem : public ResultItem | 25 | class ContactItem : public ResultItem |
27 | { | 26 | { |
28 | public: | 27 | public: |
29 | ContactItem(OListViewItem* parent, OPimContact *contact); | 28 | ContactItem(OListViewItem* parent, Opie::OPimContact *contact); |
30 | 29 | ||
31 | ~ContactItem(); | 30 | ~ContactItem(); |
32 | 31 | ||
33 | virtual QString toRichText(); | 32 | virtual QString toRichText(); |
34 | virtual void action( int ); | 33 | virtual void action( int ); |
35 | virtual QIntDict<QString> actions(); | 34 | virtual QIntDict<QString> actions(); |
36 | 35 | ||
37 | 36 | ||
38 | private: | 37 | private: |
39 | void setIcon(); | 38 | void setIcon(); |
40 | OPimContact *_contact; | 39 | Opie::OPimContact *_contact; |
41 | 40 | ||
42 | }; | 41 | }; |
43 | 42 | ||
44 | #endif | 43 | #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 | |||
@@ -8,24 +8,25 @@ | |||
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "eventitem.h" | 13 | #include "eventitem.h" |
14 | 14 | ||
15 | 15 | ||
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | #include <qpe/qcopenvelope_qws.h> | 17 | #include <qpe/qcopenvelope_qws.h> |
18 | 18 | ||
19 | 19 | ||
20 | using namespace Opie; | ||
20 | EventItem::EventItem(OListViewItem* parent, OPimEvent *event) | 21 | EventItem::EventItem(OListViewItem* parent, OPimEvent *event) |
21 | : ResultItem(parent) | 22 | : ResultItem(parent) |
22 | { | 23 | { |
23 | _event = event; | 24 | _event = event; |
24 | setText(0, _event->toShortText() ); | 25 | setText(0, _event->toShortText() ); |
25 | setIcon(); | 26 | setIcon(); |
26 | } | 27 | } |
27 | 28 | ||
28 | 29 | ||
29 | EventItem::~EventItem() | 30 | EventItem::~EventItem() |
30 | { | 31 | { |
31 | } | 32 | } |
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 | |||
@@ -8,35 +8,34 @@ | |||
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #ifndef EVENTITEM_H | 13 | #ifndef EVENTITEM_H |
14 | #define EVENTITEM_H | 14 | #define EVENTITEM_H |
15 | 15 | ||
16 | #include "resultitem.h" | 16 | #include "resultitem.h" |
17 | 17 | ||
18 | #include <opie2/opimevent.h> | 18 | #include <opie2/opimevent.h> |
19 | 19 | ||
20 | using namespace Opie; | ||
21 | 20 | ||
22 | /** | 21 | /** |
23 | @author Patrick S. Vogt | 22 | @author Patrick S. Vogt |
24 | */ | 23 | */ |
25 | class EventItem : public ResultItem | 24 | class EventItem : public ResultItem |
26 | { | 25 | { |
27 | public: | 26 | public: |
28 | EventItem(OListViewItem* parent, OPimEvent *event); | 27 | EventItem(OListViewItem* parent, Opie::OPimEvent *event); |
29 | 28 | ||
30 | ~EventItem(); | 29 | ~EventItem(); |
31 | 30 | ||
32 | virtual QString toRichText(); | 31 | virtual QString toRichText(); |
33 | virtual void action( int ); | 32 | virtual void action( int ); |
34 | virtual QIntDict<QString> actions(); | 33 | virtual QIntDict<QString> actions(); |
35 | 34 | ||
36 | private: | 35 | private: |
37 | void setIcon(); | 36 | void setIcon(); |
38 | OPimEvent *_event; | 37 | Opie::OPimEvent *_event; |
39 | 38 | ||
40 | }; | 39 | }; |
41 | 40 | ||
42 | #endif | 41 | #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 | |||
@@ -8,34 +8,33 @@ | |||
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #ifndef TODOITEM_H | 13 | #ifndef TODOITEM_H |
14 | #define TODOITEM_H | 14 | #define TODOITEM_H |
15 | 15 | ||
16 | 16 | ||
17 | #include <opie2/opimtodo.h> | 17 | #include <opie2/opimtodo.h> |
18 | #include "resultitem.h" | 18 | #include "resultitem.h" |
19 | 19 | ||
20 | using namespace Opie; | ||
21 | 20 | ||
22 | /** | 21 | /** |
23 | @author Patrick S. Vogt | 22 | @author Patrick S. Vogt |
24 | */ | 23 | */ |
25 | class TodoItem : public ResultItem | 24 | class TodoItem : public ResultItem |
26 | { | 25 | { |
27 | public: | 26 | public: |
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(); |
32 | virtual void action( int ); | 31 | virtual void action( int ); |
33 | virtual QIntDict<QString> actions(); | 32 | virtual QIntDict<QString> actions(); |
34 | 33 | ||
35 | private: | 34 | private: |
36 | void setIcon(); | 35 | void setIcon(); |
37 | OPimTodo *_todo; | 36 | Opie::OPimTodo *_todo; |
38 | 37 | ||
39 | }; | 38 | }; |
40 | 39 | ||
41 | #endif | 40 | #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 | |||
@@ -10,25 +10,25 @@ | |||
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "todosearch.h" | 13 | #include "todosearch.h" |
14 | #include "todoitem.h" | 14 | #include "todoitem.h" |
15 | 15 | ||
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | #include <qpe/config.h> | 17 | #include <qpe/config.h> |
18 | 18 | ||
19 | #include <qaction.h> | 19 | #include <qaction.h> |
20 | #include <qpopupmenu.h> | 20 | #include <qpopupmenu.h> |
21 | 21 | ||
22 | 22 | using namespace Opie; | |
23 | TodoSearch::TodoSearch(QListView* parent, QString name) | 23 | TodoSearch::TodoSearch(QListView* parent, QString name) |
24 | : SearchGroup(parent, name), _todos(0), _popupMenu(0) | 24 | : SearchGroup(parent, name), _todos(0), _popupMenu(0) |
25 | { | 25 | { |
26 | //AppLnkSet als(QPEApplication::qpeDir()); | 26 | //AppLnkSet als(QPEApplication::qpeDir()); |
27 | //setPixmap( 0, als.findExec("todolist")->pixmap() ); | 27 | //setPixmap( 0, als.findExec("todolist")->pixmap() ); |
28 | QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" ); | 28 | QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" ); |
29 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); | 29 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); |
30 | actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true ); | 30 | actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true ); |
31 | Config cfg( "osearch", Config::User ); | 31 | Config cfg( "osearch", Config::User ); |
32 | cfg.setGroup( "todo_settings" ); | 32 | cfg.setGroup( "todo_settings" ); |
33 | actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) ); | 33 | actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) ); |
34 | 34 | ||
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 | |||
@@ -11,37 +11,36 @@ | |||
11 | // | 11 | // |
12 | // | 12 | // |
13 | #ifndef TODOSEARCH_H | 13 | #ifndef TODOSEARCH_H |
14 | #define TODOSEARCH_H | 14 | #define TODOSEARCH_H |
15 | 15 | ||
16 | #include "searchgroup.h" | 16 | #include "searchgroup.h" |
17 | 17 | ||
18 | #include <opie2/otodoaccess.h> | 18 | #include <opie2/otodoaccess.h> |
19 | #include <opie2/opimtodo.h> | 19 | #include <opie2/opimtodo.h> |
20 | 20 | ||
21 | class QAction; | 21 | class QAction; |
22 | 22 | ||
23 | using namespace Opie; | ||
24 | 23 | ||
25 | /** | 24 | /** |
26 | @author Patrick S. Vogt | 25 | @author Patrick S. Vogt |
27 | */ | 26 | */ |
28 | class TodoSearch : public SearchGroup | 27 | class TodoSearch : public SearchGroup |
29 | { | 28 | { |
30 | public: | 29 | public: |
31 | TodoSearch(QListView* parent, QString name); | 30 | TodoSearch(QListView* parent, QString name); |
32 | ~TodoSearch(); | 31 | ~TodoSearch(); |
33 | 32 | ||
34 | virtual QPopupMenu* popupMenu(); | 33 | virtual QPopupMenu* popupMenu(); |
35 | 34 | ||
36 | protected: | 35 | protected: |
37 | virtual void load(); | 36 | virtual void load(); |
38 | virtual int search(); | 37 | virtual int search(); |
39 | virtual void insertItem( void* ); | 38 | virtual void insertItem( void* ); |
40 | 39 | ||
41 | private: | 40 | private: |
42 | OPimTodoAccess *_todos; | 41 | Opie::OPimTodoAccess *_todos; |
43 | QAction *actionShowCompleted; | 42 | QAction *actionShowCompleted; |
44 | QPopupMenu *_popupMenu; | 43 | QPopupMenu *_popupMenu; |
45 | }; | 44 | }; |
46 | 45 | ||
47 | #endif | 46 | #endif |