34 files changed, 1 insertions, 123 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp index 1914f71..076e2e0 100644 --- a/core/pim/addressbook/ablabel.cpp +++ b/core/pim/addressbook/ablabel.cpp | |||
@@ -15,20 +15,17 @@ | |||
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "ablabel.h" | 21 | #include "ablabel.h" |
22 | 22 | ||
23 | #include <qpe/stringutil.h> | ||
24 | 23 | ||
25 | #include <qregexp.h> | ||
26 | #include <qstylesheet.h> | ||
27 | 24 | ||
28 | AbLabel::AbLabel( QWidget *parent, const char *name ): | 25 | AbLabel::AbLabel( QWidget *parent, const char *name ): |
29 | QTextView( parent, name ), | 26 | QTextView( parent, name ), |
30 | m_empty( false ) | 27 | m_empty( false ) |
31 | { | 28 | { |
32 | } | 29 | } |
33 | 30 | ||
34 | AbLabel::~AbLabel() | 31 | AbLabel::~AbLabel() |
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 70330c7..f7bff58 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp | |||
@@ -15,30 +15,21 @@ | |||
15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
16 | ** | 16 | ** |
17 | ** Contact info@trolltech.com if any conditions of this licensing are | 17 | ** Contact info@trolltech.com if any conditions of this licensing are |
18 | ** not clear to you. | 18 | ** not clear to you. |
19 | ** | 19 | ** |
20 | **********************************************************************/ | 20 | **********************************************************************/ |
21 | 21 | ||
22 | 22 | ||
23 | #include <qpe/categoryselect.h> | ||
24 | #include <qpe/config.h> | ||
25 | #include <qpe/stringutil.h> | ||
26 | #include <qpe/qcopenvelope_qws.h> | ||
27 | #include <qpe/timestring.h> | 23 | #include <qpe/timestring.h> |
28 | #include <qpe/resource.h> | 24 | #include <qpe/resource.h> |
29 | 25 | ||
30 | #include <opie/orecordlist.h> | 26 | #include <opie/orecordlist.h> |
31 | 27 | ||
32 | #include <qasciidict.h> | ||
33 | #include <qdatetime.h> | ||
34 | #include <qfile.h> | ||
35 | #include <qregexp.h> | ||
36 | #include <qmessagebox.h> | ||
37 | 28 | ||
38 | #include "abtable.h" | 29 | #include "abtable.h" |
39 | 30 | ||
40 | #include <errno.h> | 31 | #include <errno.h> |
41 | #include <fcntl.h> | 32 | #include <fcntl.h> |
42 | #include <unistd.h> | 33 | #include <unistd.h> |
43 | #include <stdlib.h> | 34 | #include <stdlib.h> |
44 | 35 | ||
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 1c7ddd4..9cf55b3 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -14,53 +14,37 @@ | |||
14 | ** | 14 | ** |
15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
16 | ** | 16 | ** |
17 | ** | 17 | ** |
18 | **********************************************************************/ | 18 | **********************************************************************/ |
19 | 19 | ||
20 | #define QTOPIA_INTERNAL_FD | 20 | #define QTOPIA_INTERNAL_FD |
21 | 21 | ||
22 | #include "contacteditor.h" | ||
23 | #include "ablabel.h" | ||
24 | #include "abview.h" | ||
25 | #include "abtable.h" | ||
26 | // #include "addresssettings.h" | 22 | // #include "addresssettings.h" |
27 | #include "addressbook.h" | 23 | #include "addressbook.h" |
28 | 24 | ||
29 | 25 | ||
30 | #include <opie/ofileselector.h> | 26 | #include <opie/ofileselector.h> |
31 | #include <opie/ofiledialog.h> | 27 | #include <opie/ofiledialog.h> |
32 | #include <opie/ocontact.h> | 28 | #include <opie/ocontact.h> |
33 | #include <opie/ocontactaccessbackend_vcard.h> | 29 | #include <opie/ocontactaccessbackend_vcard.h> |
34 | 30 | ||
35 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
36 | #include <qpe/ir.h> | 32 | #include <qpe/ir.h> |
37 | #include <qpe/qpemessagebox.h> | 33 | #include <qpe/qpemessagebox.h> |
38 | #include <qpe/qcopenvelope_qws.h> | ||
39 | #include <qtoolbar.h> | ||
40 | #include <qmenubar.h> | 34 | #include <qmenubar.h> |
41 | // #include <qtoolbar.h> | 35 | // #include <qtoolbar.h> |
42 | // #include <qmenubar.h> | 36 | // #include <qmenubar.h> |
43 | #include <qpe/qpeapplication.h> | 37 | #include <qpe/qpeapplication.h> |
44 | #include <qpe/config.h> | ||
45 | 38 | ||
46 | #include <qaction.h> | 39 | #include <qaction.h> |
47 | #include <qdialog.h> | ||
48 | #include <qdir.h> | ||
49 | #include <qfile.h> | ||
50 | #include <qimage.h> | ||
51 | #include <qlayout.h> | 40 | #include <qlayout.h> |
52 | #include <qmessagebox.h> | 41 | #include <qmessagebox.h> |
53 | #include <qpixmap.h> | ||
54 | #include <qpopupmenu.h> | ||
55 | #include <qstringlist.h> | ||
56 | #include <qtoolbutton.h> | 42 | #include <qtoolbutton.h> |
57 | #include <qwhatsthis.h> | ||
58 | #include <qdatetime.h> | ||
59 | 43 | ||
60 | #include <stdlib.h> | 44 | #include <stdlib.h> |
61 | #include <sys/stat.h> | 45 | #include <sys/stat.h> |
62 | #include <sys/types.h> | 46 | #include <sys/types.h> |
63 | #include <fcntl.h> | 47 | #include <fcntl.h> |
64 | #include <unistd.h> | 48 | #include <unistd.h> |
65 | 49 | ||
66 | 50 | ||
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp index 981f5e0..dee0f11 100644 --- a/core/pim/addressbook/configdlg.cpp +++ b/core/pim/addressbook/configdlg.cpp | |||
@@ -1,15 +1,14 @@ | |||
1 | #include "configdlg.h" | 1 | #include "configdlg.h" |
2 | 2 | ||
3 | #include <qcheckbox.h> | 3 | #include <qcheckbox.h> |
4 | #include <qradiobutton.h> | 4 | #include <qradiobutton.h> |
5 | #include <qlistbox.h> | 5 | #include <qlistbox.h> |
6 | #include <qpushbutton.h> | 6 | #include <qpushbutton.h> |
7 | #include <qiconset.h> | ||
8 | 7 | ||
9 | #include <qpe/resource.h> | 8 | #include <qpe/resource.h> |
10 | 9 | ||
11 | #include <opie/ocontact.h> | 10 | #include <opie/ocontact.h> |
12 | #include "opie/ocontactfields.h" | 11 | #include "opie/ocontactfields.h" |
13 | 12 | ||
14 | ConfigDlg::ConfigDlg( QWidget *parent, const char *name): | 13 | ConfigDlg::ConfigDlg( QWidget *parent, const char *name): |
15 | ConfigDlg_Base(parent, name, true ) | 14 | ConfigDlg_Base(parent, name, true ) |
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 7932781..b1eb042 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -15,41 +15,30 @@ | |||
15 | * | 15 | * |
16 | * This is a rewrite of the abeditor.h file, modified to provide a more | 16 | * This is a rewrite of the abeditor.h file, modified to provide a more |
17 | * intuitive interface to TrollTech's original Address Book editor. This | 17 | * intuitive interface to TrollTech's original Address Book editor. This |
18 | * is made to operate exactly in interface with the exception of name. | 18 | * is made to operate exactly in interface with the exception of name. |
19 | * | 19 | * |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include "contacteditor.h" | 22 | #include "contacteditor.h" |
23 | #include "addresspicker.h" | ||
24 | 23 | ||
25 | #include <qpe/categoryselect.h> | 24 | #include <qpe/categoryselect.h> |
26 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
27 | #include <qpe/qpedialog.h> | 26 | #include <qpe/qpedialog.h> |
28 | #include <qpe/timeconversion.h> | ||
29 | #include <opie/ocontact.h> | 27 | #include <opie/ocontact.h> |
30 | #include <qpe/resource.h> | 28 | #include <qpe/resource.h> |
31 | 29 | ||
32 | #include <qcombobox.h> | ||
33 | #include <qlabel.h> | 30 | #include <qlabel.h> |
34 | #include <qtabwidget.h> | 31 | #include <qtabwidget.h> |
35 | #include <qlayout.h> | 32 | #include <qlayout.h> |
36 | #include <qlineedit.h> | 33 | #include <qlineedit.h> |
37 | #include <qmultilineedit.h> | 34 | #include <qmultilineedit.h> |
38 | #include <qscrollview.h> | ||
39 | #include <qtoolbutton.h> | 35 | #include <qtoolbutton.h> |
40 | #include <qpushbutton.h> | ||
41 | #include <qmainwindow.h> | ||
42 | #include <qvaluelist.h> | ||
43 | #include <qpopupmenu.h> | ||
44 | #include <qlistbox.h> | 36 | #include <qlistbox.h> |
45 | #include <qhbox.h> | ||
46 | #include <qaction.h> | ||
47 | #include <qiconset.h> | ||
48 | #include <qmessagebox.h> | 37 | #include <qmessagebox.h> |
49 | #include <qwhatsthis.h> | 38 | #include <qwhatsthis.h> |
50 | 39 | ||
51 | #include <assert.h> | 40 | #include <assert.h> |
52 | 41 | ||
53 | static inline bool containsAlphaNum( const QString &str ); | 42 | static inline bool containsAlphaNum( const QString &str ); |
54 | static inline bool constainsWhiteSpace( const QString &str ); | 43 | static inline bool constainsWhiteSpace( const QString &str ); |
55 | 44 | ||
diff --git a/core/pim/addressbook/main.cpp b/core/pim/addressbook/main.cpp index 97bfa6d..47d370a 100644 --- a/core/pim/addressbook/main.cpp +++ b/core/pim/addressbook/main.cpp | |||
@@ -15,14 +15,13 @@ | |||
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "addressbook.h" | 21 | #include "addressbook.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | ||
24 | 23 | ||
25 | #include <opie/oapplicationfactory.h> | 24 | #include <opie/oapplicationfactory.h> |
26 | 25 | ||
27 | OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> ) |
28 | 27 | ||
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp index 9e0c78a..7a20591 100644 --- a/core/pim/addressbook/picker.cpp +++ b/core/pim/addressbook/picker.cpp | |||
@@ -1,12 +1,10 @@ | |||
1 | #include "picker.h" | 1 | #include "picker.h" |
2 | 2 | ||
3 | #include <qfont.h> | ||
4 | #include <qstring.h> | ||
5 | #include <qtimer.h> | 3 | #include <qtimer.h> |
6 | #include <qlayout.h> | 4 | #include <qlayout.h> |
7 | 5 | ||
8 | char PickerLabel::lastLetter = '\0'; | 6 | char PickerLabel::lastLetter = '\0'; |
9 | 7 | ||
10 | PickerLabel::PickerLabel( QWidget *parent, const char *name ) | 8 | PickerLabel::PickerLabel( QWidget *parent, const char *name ) |
11 | : QLabel ( parent, name ) | 9 | : QLabel ( parent, name ) |
12 | { | 10 | { |
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 24affd0..af26302 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -27,46 +27,31 @@ | |||
27 | #include "datebooksettings.h" | 27 | #include "datebooksettings.h" |
28 | #include "datebookweek.h" | 28 | #include "datebookweek.h" |
29 | #include "datebookweeklst.h" | 29 | #include "datebookweeklst.h" |
30 | #include "dateentryimpl.h" | 30 | #include "dateentryimpl.h" |
31 | 31 | ||
32 | #include <qpe/datebookmonth.h> | 32 | #include <qpe/datebookmonth.h> |
33 | #include <qpe/qpeapplication.h> | 33 | #include <qpe/qpeapplication.h> |
34 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
35 | #include <qpe/qpedebug.h> | ||
36 | #include <qpe/event.h> | ||
37 | #include <qpe/finddialog.h> | 35 | #include <qpe/finddialog.h> |
38 | #include <qpe/ir.h> | 36 | #include <qpe/ir.h> |
39 | #include <qmenubar.h> | ||
40 | #include <qpe/qpemessagebox.h> | 37 | #include <qpe/qpemessagebox.h> |
41 | #include <qpe/resource.h> | 38 | #include <qpe/resource.h> |
42 | #include <qpe/sound.h> | 39 | #include <qpe/sound.h> |
43 | #include <qpe/timestring.h> | ||
44 | #include <qtoolbar.h> | 40 | #include <qtoolbar.h> |
45 | #include <qpe/tzselect.h> | 41 | #include <qpe/tzselect.h> |
46 | #include <qpe/xmlreader.h> | ||
47 | 42 | ||
48 | #include <qaction.h> | 43 | #include <qaction.h> |
49 | #include <qcopchannel_qws.h> | 44 | #include <qcopchannel_qws.h> |
50 | #include <qdatetime.h> | ||
51 | #include <qdialog.h> | ||
52 | #include <qfile.h> | ||
53 | #include <qlabel.h> | ||
54 | #include <qlayout.h> | 45 | #include <qlayout.h> |
55 | #include <qmessagebox.h> | 46 | #include <qmessagebox.h> |
56 | #include <qpopupmenu.h> | ||
57 | #include <qpushbutton.h> | ||
58 | #include <qregexp.h> | ||
59 | #include <qtextcodec.h> | ||
60 | #include <qtextstream.h> | ||
61 | #include <qtimer.h> | 47 | #include <qtimer.h> |
62 | #include <qtl.h> | 48 | #include <qtl.h> |
63 | #include <qwidgetstack.h> | 49 | #include <qwidgetstack.h> |
64 | #include <qwindowsystem_qws.h> | ||
65 | 50 | ||
66 | #include <sys/stat.h> | 51 | #include <sys/stat.h> |
67 | #include <sys/types.h> | 52 | #include <sys/types.h> |
68 | #include <fcntl.h> | 53 | #include <fcntl.h> |
69 | #include <unistd.h> | 54 | #include <unistd.h> |
70 | 55 | ||
71 | #include <stdlib.h> | 56 | #include <stdlib.h> |
72 | 57 | ||
diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp index 1244fd3..d43d31a 100644 --- a/core/pim/datebook/datebookdayallday.cpp +++ b/core/pim/datebook/datebookdayallday.cpp | |||
@@ -3,30 +3,20 @@ | |||
3 | ** | 3 | ** |
4 | ** | 4 | ** |
5 | ** | 5 | ** |
6 | ** | 6 | ** |
7 | ** | 7 | ** |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | #include "datebookdayallday.h" | 9 | #include "datebookdayallday.h" |
10 | 10 | ||
11 | #include <qpushbutton.h> | ||
12 | #include <qlayout.h> | 11 | #include <qlayout.h> |
13 | #include <qvariant.h> | ||
14 | #include <qtooltip.h> | ||
15 | #include <qwhatsthis.h> | ||
16 | #include <qobjectlist.h> | ||
17 | #include <qpe/event.h> | ||
18 | #include <qpe/ir.h> | 12 | #include <qpe/ir.h> |
19 | #include <qpe/datebookdb.h> | ||
20 | #include <qpe/resource.h> | ||
21 | #include <qpopupmenu.h> | 13 | #include <qpopupmenu.h> |
22 | #include <qtimer.h> | 14 | #include <qtimer.h> |
23 | #include <qregexp.h> | ||
24 | #include <qdatetime.h> | ||
25 | 15 | ||
26 | #include "datebookday.h" | 16 | #include "datebookday.h" |
27 | 17 | ||
28 | /* | 18 | /* |
29 | * Constructs a DatebookdayAllday which is a child of 'parent', with the | 19 | * Constructs a DatebookdayAllday which is a child of 'parent', with the |
30 | * name 'name' and widget flags set to 'f' | 20 | * name 'name' and widget flags set to 'f' |
31 | */ | 21 | */ |
32 | DatebookdayAllday::DatebookdayAllday(DateBookDB* db, QWidget* parent, const char* name, WFlags ) | 22 | DatebookdayAllday::DatebookdayAllday(DateBookDB* db, QWidget* parent, const char* name, WFlags ) |
diff --git a/core/pim/datebook/datebookdayheaderimpl.cpp b/core/pim/datebook/datebookdayheaderimpl.cpp index 3e965f5..213c843 100644 --- a/core/pim/datebook/datebookdayheaderimpl.cpp +++ b/core/pim/datebook/datebookdayheaderimpl.cpp | |||
@@ -16,22 +16,18 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "datebookdayheaderimpl.h" | 20 | #include "datebookdayheaderimpl.h" |
21 | 21 | ||
22 | #include <qpe/datebookmonth.h> | 22 | #include <qpe/datebookmonth.h> |
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | #include <qpe/timestring.h> | ||
25 | 24 | ||
26 | #include <qbuttongroup.h> | 25 | #include <qbuttongroup.h> |
27 | #include <qpopupmenu.h> | ||
28 | #include <qstringlist.h> | ||
29 | #include <qtimer.h> | ||
30 | #include <qtoolbutton.h> | 26 | #include <qtoolbutton.h> |
31 | 27 | ||
32 | 28 | ||
33 | /* | 29 | /* |
34 | * Constructs a DateBookDayHeader which is a child of 'parent', with the | 30 | * Constructs a DateBookDayHeader which is a child of 'parent', with the |
35 | * name 'name' and widget flags set to 'f' | 31 | * name 'name' and widget flags set to 'f' |
36 | * | 32 | * |
37 | * The dialog will by default be modeless, unless you set 'modal' to | 33 | * The dialog will by default be modeless, unless you set 'modal' to |
diff --git a/core/pim/datebook/datebooksettings.cpp b/core/pim/datebook/datebooksettings.cpp index 675b17f..a6d04ba 100644 --- a/core/pim/datebook/datebooksettings.cpp +++ b/core/pim/datebook/datebooksettings.cpp | |||
@@ -19,17 +19,16 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "datebooksettings.h" | 21 | #include "datebooksettings.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | 24 | ||
25 | #include <qspinbox.h> | 25 | #include <qspinbox.h> |
26 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> |
27 | #include <qcombobox.h> | ||
28 | 27 | ||
29 | DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent, | 28 | DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent, |
30 | const char *name, bool modal, WFlags fl ) | 29 | const char *name, bool modal, WFlags fl ) |
31 | : DateBookSettingsBase( parent, name, modal, fl ), | 30 | : DateBookSettingsBase( parent, name, modal, fl ), |
32 | ampm( whichClock ) | 31 | ampm( whichClock ) |
33 | { | 32 | { |
34 | init(); | 33 | init(); |
35 | QObject::connect( qApp, SIGNAL( clockChanged( bool ) ), this, SLOT( slotChangeClock( bool ) ) ); | 34 | QObject::connect( qApp, SIGNAL( clockChanged( bool ) ), this, SLOT( slotChangeClock( bool ) ) ); |
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp index 84b4f1b..eaa9730 100644 --- a/core/pim/datebook/datebookweekheaderimpl.cpp +++ b/core/pim/datebook/datebookweekheaderimpl.cpp | |||
@@ -13,21 +13,17 @@ | |||
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "datebookweekheaderimpl.h" | 20 | #include "datebookweekheaderimpl.h" |
21 | #include "datebookweekheader.h" | ||
22 | #include "datebookweek.h" | 21 | #include "datebookweek.h" |
23 | #include <qlabel.h> | ||
24 | #include <qspinbox.h> | ||
25 | #include <qdatetime.h> | ||
26 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
27 | #include <qpe/datebookmonth.h> | 23 | #include <qpe/datebookmonth.h> |
28 | 24 | ||
29 | #include <qtoolbutton.h> | 25 | #include <qtoolbutton.h> |
30 | 26 | ||
31 | /* | 27 | /* |
32 | * Constructs a DateBookWeekHeader which is a child of 'parent', with the | 28 | * Constructs a DateBookWeekHeader which is a child of 'parent', with the |
33 | * name 'name' and widget flags set to 'f' | 29 | * name 'name' and widget flags set to 'f' |
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index 24fb0ba..42a1753 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp | |||
@@ -1,17 +1,16 @@ | |||
1 | #include "datebookweeklst.h" | 1 | #include "datebookweeklst.h" |
2 | 2 | ||
3 | 3 | ||
4 | #include "datebook.h" | 4 | #include "datebook.h" |
5 | 5 | ||
6 | #include <qpe/datebookmonth.h> | 6 | #include <qpe/datebookmonth.h> |
7 | #include <qpe/config.h> | 7 | #include <qpe/config.h> |
8 | #include <qpe/resource.h> | 8 | #include <qpe/resource.h> |
9 | #include <qpe/calendar.h> | ||
10 | 9 | ||
11 | #include <qlayout.h> | 10 | #include <qlayout.h> |
12 | #include <qtoolbutton.h> | 11 | #include <qtoolbutton.h> |
13 | #include <qtl.h> | 12 | #include <qtl.h> |
14 | 13 | ||
15 | bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false); | 14 | bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false); |
16 | 15 | ||
17 | DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl) | 16 | DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl) |
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index 856837c..018bb5a 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -19,31 +19,20 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "dateentryimpl.h" | 21 | #include "dateentryimpl.h" |
22 | #include "repeatentry.h" | 22 | #include "repeatentry.h" |
23 | 23 | ||
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/categoryselect.h> | 25 | #include <qpe/categoryselect.h> |
26 | #include <qpe/datebookmonth.h> | 26 | #include <qpe/datebookmonth.h> |
27 | #include <qpe/global.h> | ||
28 | #include <qpe/timeconversion.h> | ||
29 | #include <qpe/timestring.h> | ||
30 | #include <qpe/tzselect.h> | 27 | #include <qpe/tzselect.h> |
31 | 28 | ||
32 | #include <qevent.h> | ||
33 | #include <qcheckbox.h> | ||
34 | #include <qcombobox.h> | ||
35 | #include <qlayout.h> | ||
36 | #include <qlineedit.h> | 29 | #include <qlineedit.h> |
37 | #include <qmultilineedit.h> | ||
38 | #include <qpopupmenu.h> | ||
39 | #include <qscrollview.h> | ||
40 | #include <qspinbox.h> | 30 | #include <qspinbox.h> |
41 | #include <qtoolbutton.h> | ||
42 | 31 | ||
43 | #include <opie/otimepicker.h> | 32 | #include <opie/otimepicker.h> |
44 | #include "onoteedit.h" | 33 | #include "onoteedit.h" |
45 | 34 | ||
46 | #include <stdlib.h> | 35 | #include <stdlib.h> |
47 | #include <stdio.h> | 36 | #include <stdio.h> |
48 | 37 | ||
49 | /* | 38 | /* |
diff --git a/core/pim/datebook/main.cpp b/core/pim/datebook/main.cpp index 8004690..421e457 100644 --- a/core/pim/datebook/main.cpp +++ b/core/pim/datebook/main.cpp | |||
@@ -14,12 +14,11 @@ | |||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "datebook.h" | 21 | #include "datebook.h" |
22 | #include <qpe/qpeapplication.h> | ||
23 | #include <opie/oapplicationfactory.h> | 22 | #include <opie/oapplicationfactory.h> |
24 | 23 | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<DateBook> ) | 24 | OPIE_EXPORT_APP( OApplicationFactory<DateBook> ) |
diff --git a/core/pim/datebook/noteentryimpl.cpp b/core/pim/datebook/noteentryimpl.cpp index 0e45985..14fe98e 100644 --- a/core/pim/datebook/noteentryimpl.cpp +++ b/core/pim/datebook/noteentryimpl.cpp | |||
@@ -1,11 +1,9 @@ | |||
1 | #include "noteentryimpl.h" | 1 | #include "noteentryimpl.h" |
2 | #include "qstring.h" | ||
3 | #include "qmultilinedit.h" | ||
4 | #include "qlabel.h" | 2 | #include "qlabel.h" |
5 | #include "onoteedit.h" | 3 | #include "onoteedit.h" |
6 | 4 | ||
7 | NoteEntry::NoteEntry(const QString &title, const QString ¬eStr, | 5 | NoteEntry::NoteEntry(const QString &title, const QString ¬eStr, |
8 | QWidget* parent, const char* name, bool modal, | 6 | QWidget* parent, const char* name, bool modal, |
9 | WFlags fl) : | 7 | WFlags fl) : |
10 | NoteEntryBase(parent, name, modal, fl) { | 8 | NoteEntryBase(parent, name, modal, fl) { |
11 | 9 | ||
diff --git a/core/pim/datebook/repeatentry.cpp b/core/pim/datebook/repeatentry.cpp index b1a162d..7cf36da 100644 --- a/core/pim/datebook/repeatentry.cpp +++ b/core/pim/datebook/repeatentry.cpp | |||
@@ -17,23 +17,19 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "repeatentry.h" | 21 | #include "repeatentry.h" |
22 | 22 | ||
23 | #include <qpe/datebookmonth.h> | 23 | #include <qpe/datebookmonth.h> |
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/timestring.h> | ||
26 | 25 | ||
27 | #include <qbuttongroup.h> | ||
28 | #include <qlabel.h> | 26 | #include <qlabel.h> |
29 | #include <qpopupmenu.h> | ||
30 | #include <qspinbox.h> | 27 | #include <qspinbox.h> |
31 | #include <qtoolbutton.h> | ||
32 | 28 | ||
33 | #include <time.h> | 29 | #include <time.h> |
34 | 30 | ||
35 | // Global Templates for use in setting up the repeat label... | 31 | // Global Templates for use in setting up the repeat label... |
36 | // the problem is these strings get initialized before QPEApplication can install the translator -zecke | 32 | // the problem is these strings get initialized before QPEApplication can install the translator -zecke |
37 | namespace { | 33 | namespace { |
38 | QString strDayTemplate; | 34 | QString strDayTemplate; |
39 | QString strYearTemplate; | 35 | QString strYearTemplate; |
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()); |
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index b55a4a7..72cdfd6 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -16,17 +16,16 @@ | |||
16 | 16 | ||
17 | #define QTOPIA_INTERNAL_LANGLIST | 17 | #define QTOPIA_INTERNAL_LANGLIST |
18 | 18 | ||
19 | #include "today.h" | 19 | #include "today.h" |
20 | 20 | ||
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | #include <qpe/global.h> | ||
25 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/contact.h> | 25 | #include <qpe/contact.h> |
27 | 26 | ||
28 | #include <qdir.h> | 27 | #include <qdir.h> |
29 | #include <qtimer.h> | 28 | #include <qtimer.h> |
30 | #include <qwhatsthis.h> | 29 | #include <qwhatsthis.h> |
31 | 30 | ||
32 | struct TodayPlugin { | 31 | struct TodayPlugin { |
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index 0613f2c..b68aad2 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -34,30 +34,24 @@ | |||
34 | #include <opie2/oapplicationfactory.h> | 34 | #include <opie2/oapplicationfactory.h> |
35 | 35 | ||
36 | #include <qpe/applnk.h> | 36 | #include <qpe/applnk.h> |
37 | #include <qpe/config.h> | 37 | #include <qpe/config.h> |
38 | #include <qpe/ir.h> | 38 | #include <qpe/ir.h> |
39 | #include <qpe/resource.h> | 39 | #include <qpe/resource.h> |
40 | #include <qpe/qpemessagebox.h> | 40 | #include <qpe/qpemessagebox.h> |
41 | #include <qpe/alarmserver.h> | 41 | #include <qpe/alarmserver.h> |
42 | #include <qpe/timestring.h> | ||
43 | #include <qpe/qpeapplication.h> | 42 | #include <qpe/qpeapplication.h> |
44 | 43 | ||
45 | #include <qmenubar.h> | 44 | #include <qmenubar.h> |
46 | #include <qmessagebox.h> | 45 | #include <qmessagebox.h> |
47 | #include <qtoolbar.h> | ||
48 | #include <qpopupmenu.h> | ||
49 | #include <qpushbutton.h> | 46 | #include <qpushbutton.h> |
50 | #include <qwidgetstack.h> | ||
51 | #include <qaction.h> | 47 | #include <qaction.h> |
52 | #include <qtimer.h> | 48 | #include <qtimer.h> |
53 | #include <qvbox.h> | ||
54 | #include <qlayout.h> | 49 | #include <qlayout.h> |
55 | #include <qlineedit.h> | ||
56 | #include <qwhatsthis.h> | 50 | #include <qwhatsthis.h> |
57 | 51 | ||
58 | #include "quickeditimpl.h" | 52 | #include "quickeditimpl.h" |
59 | #include "todotemplatemanager.h" | 53 | #include "todotemplatemanager.h" |
60 | #include "templateeditor.h" | 54 | #include "templateeditor.h" |
61 | #include "tableview.h" | 55 | #include "tableview.h" |
62 | 56 | ||
63 | #include "textviewshow.h" | 57 | #include "textviewshow.h" |