-rw-r--r-- | core/pim/osearch/adresssearch.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/applnkitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/applnksearch.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/contactitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/doclnkitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/doclnksearch.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/eventitem.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/main.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/olistview.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/resultitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.cpp | 3 | ||||
-rw-r--r-- | core/pim/osearch/todoitem.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.cpp | 1 |
15 files changed, 1 insertions, 20 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp index dbd6df6..6891f03 100644 --- a/core/pim/osearch/adresssearch.cpp +++ b/core/pim/osearch/adresssearch.cpp | |||
@@ -10,18 +10,16 @@ | |||
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 <qstring.h> | ||
19 | #include <qiconset.h> | ||
20 | //#include <qwhatsthis.h> | 18 | //#include <qwhatsthis.h> |
21 | 19 | ||
22 | AdressSearch::AdressSearch(QListView* parent, QString name): | 20 | AdressSearch::AdressSearch(QListView* parent, QString name): |
23 | SearchGroup(parent, name) | 21 | SearchGroup(parent, name) |
24 | { | 22 | { |
25 | _contacts = 0; | 23 | _contacts = 0; |
26 | QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" ); | 24 | QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" ); |
27 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); | 25 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); |
diff --git a/core/pim/osearch/applnkitem.cpp b/core/pim/osearch/applnkitem.cpp index 06c2b1e..19e765e 100644 --- a/core/pim/osearch/applnkitem.cpp +++ b/core/pim/osearch/applnkitem.cpp | |||
@@ -10,17 +10,16 @@ | |||
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 "applnkitem.h" | 13 | #include "applnkitem.h" |
14 | 14 | ||
15 | #include <qpe/applnk.h> | 15 | #include <qpe/applnk.h> |
16 | #include <qpe/qcopenvelope_qws.h> | 16 | #include <qpe/qcopenvelope_qws.h> |
17 | 17 | ||
18 | #include <qfileinfo.h> | ||
19 | 18 | ||
20 | AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) | 19 | AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) |
21 | : ResultItem(parent) | 20 | : ResultItem(parent) |
22 | { | 21 | { |
23 | _app = app; | 22 | _app = app; |
24 | setText(0, _app->name() ); | 23 | setText(0, _app->name() ); |
25 | setPixmap(0, _app->pixmap() ); | 24 | setPixmap(0, _app->pixmap() ); |
26 | } | 25 | } |
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp index 1c84d66..758baf2 100644 --- a/core/pim/osearch/applnksearch.cpp +++ b/core/pim/osearch/applnksearch.cpp | |||
@@ -12,17 +12,16 @@ | |||
12 | // | 12 | // |
13 | #include "applnksearch.h" | 13 | #include "applnksearch.h" |
14 | #include "applnkitem.h" | 14 | #include "applnkitem.h" |
15 | 15 | ||
16 | #include <qpe/applnk.h> | 16 | #include <qpe/applnk.h> |
17 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
18 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
19 | 19 | ||
20 | #include <qiconset.h> | ||
21 | 20 | ||
22 | AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) | 21 | AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) |
23 | { | 22 | { |
24 | _apps = 0; | 23 | _apps = 0; |
25 | QIconSet is = Resource::loadIconSet( "osearch/applicationsSmall" ); | 24 | QIconSet is = Resource::loadIconSet( "osearch/applicationsSmall" ); |
26 | //QIconSet is = Resource::loadIconSet( "AppsIcon" ); | 25 | //QIconSet is = Resource::loadIconSet( "AppsIcon" ); |
27 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); | 26 | setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); |
28 | } | 27 | } |
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp index eedc374..639af46 100644 --- a/core/pim/osearch/contactitem.cpp +++ b/core/pim/osearch/contactitem.cpp | |||
@@ -10,17 +10,16 @@ | |||
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 | #include <qpixmap.h> | ||
19 | 18 | ||
20 | 19 | ||
21 | ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact) | 20 | ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact) |
22 | : ResultItem(parent) | 21 | : ResultItem(parent) |
23 | { | 22 | { |
24 | _contact = contact; | 23 | _contact = contact; |
25 | setText(0, _contact->toShortText()); | 24 | setText(0, _contact->toShortText()); |
26 | setIcon(); | 25 | setIcon(); |
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index 2b4660a..eeea54b 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp | |||
@@ -15,19 +15,17 @@ | |||
15 | 15 | ||
16 | #include <opie2/opimevent.h> | 16 | #include <opie2/opimevent.h> |
17 | #include <opie2/opimrecurrence.h> | 17 | #include <opie2/opimrecurrence.h> |
18 | 18 | ||
19 | 19 | ||
20 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | 22 | ||
23 | #include <qiconset.h> | ||
24 | #include <qaction.h> | 23 | #include <qaction.h> |
25 | #include <qdatetime.h> | ||
26 | #include <qpopupmenu.h> | 24 | #include <qpopupmenu.h> |
27 | 25 | ||
28 | 26 | ||
29 | 27 | ||
30 | DatebookSearch::DatebookSearch(QListView* parent, QString name) | 28 | DatebookSearch::DatebookSearch(QListView* parent, QString name) |
31 | : SearchGroup(parent, name), _dates(0), _popupMenu(0) | 29 | : SearchGroup(parent, name), _dates(0), _popupMenu(0) |
32 | { | 30 | { |
33 | QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" ); | 31 | QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" ); |
diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp index 1516b8e..df8e856 100644 --- a/core/pim/osearch/doclnkitem.cpp +++ b/core/pim/osearch/doclnkitem.cpp | |||
@@ -10,17 +10,16 @@ | |||
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 "doclnkitem.h" | 13 | #include "doclnkitem.h" |
14 | 14 | ||
15 | #include <qpe/applnk.h> | 15 | #include <qpe/applnk.h> |
16 | #include <qpe/qcopenvelope_qws.h> | 16 | #include <qpe/qcopenvelope_qws.h> |
17 | 17 | ||
18 | #include <qfile.h> | ||
19 | #include <qtextstream.h> | 18 | #include <qtextstream.h> |
20 | #include <qfileinfo.h> | 19 | #include <qfileinfo.h> |
21 | 20 | ||
22 | DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app) | 21 | DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app) |
23 | : ResultItem(parent) | 22 | : ResultItem(parent) |
24 | { | 23 | { |
25 | _doc = app; | 24 | _doc = app; |
26 | setText(0, _doc->name() ); | 25 | setText(0, _doc->name() ); |
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp index c73dcbf..3f0d223 100644 --- a/core/pim/osearch/doclnksearch.cpp +++ b/core/pim/osearch/doclnksearch.cpp | |||
@@ -19,17 +19,16 @@ | |||
19 | 19 | ||
20 | #include <qpe/applnk.h> | 20 | #include <qpe/applnk.h> |
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | 24 | ||
25 | #include <qaction.h> | 25 | #include <qaction.h> |
26 | #include <qfile.h> | 26 | #include <qfile.h> |
27 | #include <qiconset.h> | ||
28 | #include <qpopupmenu.h> | 27 | #include <qpopupmenu.h> |
29 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
30 | 29 | ||
31 | 30 | ||
32 | DocLnkSearch::DocLnkSearch(QListView* parent, QString name) | 31 | DocLnkSearch::DocLnkSearch(QListView* parent, QString name) |
33 | : AppLnkSearch(parent, name), _popupMenu(0) | 32 | : AppLnkSearch(parent, name), _popupMenu(0) |
34 | { | 33 | { |
35 | QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" ); | 34 | QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" ); |
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp index f6e34fe..8dcfc70 100644 --- a/core/pim/osearch/eventitem.cpp +++ b/core/pim/osearch/eventitem.cpp | |||
@@ -11,18 +11,16 @@ | |||
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 | #include <qdatetime.h> | ||
20 | #include <qpixmap.h> | ||
21 | 19 | ||
22 | EventItem::EventItem(OListViewItem* parent, OPimEvent *event) | 20 | EventItem::EventItem(OListViewItem* parent, OPimEvent *event) |
23 | : ResultItem(parent) | 21 | : ResultItem(parent) |
24 | { | 22 | { |
25 | _event = event; | 23 | _event = event; |
26 | setText(0, _event->toShortText() ); | 24 | setText(0, _event->toShortText() ); |
27 | setIcon(); | 25 | setIcon(); |
28 | } | 26 | } |
diff --git a/core/pim/osearch/main.cpp b/core/pim/osearch/main.cpp index 9a03818..e0a2de3 100644 --- a/core/pim/osearch/main.cpp +++ b/core/pim/osearch/main.cpp | |||
@@ -1,7 +1,6 @@ | |||
1 | 1 | ||
2 | #include "mainwindow.h" | 2 | #include "mainwindow.h" |
3 | 3 | ||
4 | #include <qpe/qpeapplication.h> | ||
5 | #include <opie/oapplicationfactory.h> | 4 | #include <opie/oapplicationfactory.h> |
6 | 5 | ||
7 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 6 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index 95f5967..bfe95b0 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -21,18 +21,18 @@ | |||
21 | #include "mainwindow.h" | 21 | #include "mainwindow.h" |
22 | 22 | ||
23 | #include <opie2/owait.h> | 23 | #include <opie2/owait.h> |
24 | 24 | ||
25 | #include <qpe/qpemessagebox.h> | 25 | #include <qpe/qpemessagebox.h> |
26 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
27 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
28 | 28 | ||
29 | |||
29 | #include <qpe/qpeapplication.h> | 30 | #include <qpe/qpeapplication.h> |
30 | #include <qpe/config.h> | ||
31 | #include <qpe/global.h> | 31 | #include <qpe/global.h> |
32 | 32 | ||
33 | #include <qtoolbar.h> | 33 | #include <qtoolbar.h> |
34 | #include <qaction.h> | 34 | #include <qaction.h> |
35 | #include <qmessagebox.h> | 35 | #include <qmessagebox.h> |
36 | #include <qpopupmenu.h> | 36 | #include <qpopupmenu.h> |
37 | #include <qtoolbutton.h> | 37 | #include <qtoolbutton.h> |
38 | #include <qstring.h> | 38 | #include <qstring.h> |
diff --git a/core/pim/osearch/olistview.cpp b/core/pim/osearch/olistview.cpp index 7a7cb26..8fbb31d 100644 --- a/core/pim/osearch/olistview.cpp +++ b/core/pim/osearch/olistview.cpp | |||
@@ -8,17 +8,16 @@ | |||
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | // (c) 2002 Patrick S. Vogtp <tille@handhelds.org> | 9 | // (c) 2002 Patrick S. Vogtp <tille@handhelds.org> |
10 | 10 | ||
11 | #include "olistview.h" | 11 | #include "olistview.h" |
12 | #include "olistviewitem.h" | 12 | #include "olistviewitem.h" |
13 | 13 | ||
14 | #include <qpe/qpeapplication.h> | 14 | #include <qpe/qpeapplication.h> |
15 | 15 | ||
16 | #include <qmessagebox.h> | ||
17 | 16 | ||
18 | 17 | ||
19 | OListView::OListView(QWidget *parent, const char *name ) | 18 | OListView::OListView(QWidget *parent, const char *name ) |
20 | : QListView(parent,name) | 19 | : QListView(parent,name) |
21 | { | 20 | { |
22 | 21 | ||
23 | setRootIsDecorated( true ); | 22 | setRootIsDecorated( true ); |
24 | addColumn(tr("Results"),qApp->desktop()->width() - 9 ); | 23 | addColumn(tr("Results"),qApp->desktop()->width() - 9 ); |
diff --git a/core/pim/osearch/resultitem.cpp b/core/pim/osearch/resultitem.cpp index f051b12..41c22c0 100644 --- a/core/pim/osearch/resultitem.cpp +++ b/core/pim/osearch/resultitem.cpp | |||
@@ -8,17 +8,16 @@ | |||
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 "resultitem.h" | 13 | #include "resultitem.h" |
14 | 14 | ||
15 | 15 | ||
16 | #include <qmessagebox.h> | ||
17 | 16 | ||
18 | ResultItem::ResultItem(OListViewItem* parent) | 17 | ResultItem::ResultItem(OListViewItem* parent) |
19 | : OListViewItem(parent) | 18 | : OListViewItem(parent) |
20 | { | 19 | { |
21 | 20 | ||
22 | } | 21 | } |
23 | 22 | ||
24 | 23 | ||
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp index 5377b9f..7a0b5a7 100644 --- a/core/pim/osearch/searchgroup.cpp +++ b/core/pim/osearch/searchgroup.cpp | |||
@@ -5,23 +5,20 @@ | |||
5 | // Description: | 5 | // Description: |
6 | // | 6 | // |
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 "olistviewitem.h" | ||
14 | #include "searchgroup.h" | 13 | #include "searchgroup.h" |
15 | 14 | ||
16 | #include <opie2/owait.h> | 15 | #include <opie2/owait.h> |
17 | 16 | ||
18 | #include <qobject.h> | ||
19 | #include <qregexp.h> | ||
20 | #include <qapplication.h> | 17 | #include <qapplication.h> |
21 | 18 | ||
22 | #ifndef NEW_OWAIT | 19 | #ifndef NEW_OWAIT |
23 | static OWait *wait = 0; | 20 | static OWait *wait = 0; |
24 | #endif | 21 | #endif |
25 | 22 | ||
26 | SearchGroup::SearchGroup(QListView* parent, QString name) | 23 | SearchGroup::SearchGroup(QListView* parent, QString name) |
27 | : OListViewItem(parent, name) | 24 | : OListViewItem(parent, name) |
diff --git a/core/pim/osearch/todoitem.cpp b/core/pim/osearch/todoitem.cpp index c20f1fd..be780a1 100644 --- a/core/pim/osearch/todoitem.cpp +++ b/core/pim/osearch/todoitem.cpp | |||
@@ -11,17 +11,16 @@ | |||
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "todoitem.h" | 13 | #include "todoitem.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 | #include <qpixmap.h> | ||
20 | 19 | ||
21 | 20 | ||
22 | TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo) | 21 | TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo) |
23 | : ResultItem(parent) | 22 | : ResultItem(parent) |
24 | { | 23 | { |
25 | _todo = todo; | 24 | _todo = todo; |
26 | setText( 0, todo->toShortText() ); | 25 | setText( 0, todo->toShortText() ); |
27 | setIcon(); | 26 | setIcon(); |
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp index 5042803..cdf3a1c 100644 --- a/core/pim/osearch/todosearch.cpp +++ b/core/pim/osearch/todosearch.cpp | |||
@@ -11,17 +11,16 @@ | |||
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 <qiconset.h> | ||
20 | #include <qaction.h> | 19 | #include <qaction.h> |
21 | #include <qpopupmenu.h> | 20 | #include <qpopupmenu.h> |
22 | 21 | ||
23 | 22 | ||
24 | TodoSearch::TodoSearch(QListView* parent, QString name) | 23 | TodoSearch::TodoSearch(QListView* parent, QString name) |
25 | : SearchGroup(parent, name), _todos(0), _popupMenu(0) | 24 | : SearchGroup(parent, name), _todos(0), _popupMenu(0) |
26 | { | 25 | { |
27 | //AppLnkSet als(QPEApplication::qpeDir()); | 26 | //AppLnkSet als(QPEApplication::qpeDir()); |