author | harlekin <harlekin> | 2003-02-21 18:19:56 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-02-21 18:19:56 (UTC) |
commit | 3b37e71ad7dd41555763d15a16c691b503780de8 (patch) (unidiff) | |
tree | 9fa7d1145a1e4dc30da8c90fef55e1c3b0d1065c | |
parent | 0bb9d0f9e7da80f0ae3b91d4ebbb7aab4d2b9df7 (diff) | |
download | opie-3b37e71ad7dd41555763d15a16c691b503780de8.zip opie-3b37e71ad7dd41555763d15a16c691b503780de8.tar.gz opie-3b37e71ad7dd41555763d15a16c691b503780de8.tar.bz2 |
got rid of some unneeded includes
-rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginwidget.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.h | 1 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 8 | ||||
-rw-r--r-- | core/pim/today/today.h | 7 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 1 |
5 files changed, 3 insertions, 18 deletions
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp index 3a7360d..97fb77e 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp | |||
@@ -6,50 +6,50 @@ | |||
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | 17 | ||
18 | #include "datebookpluginwidget.h" | 18 | #include "datebookpluginwidget.h" |
19 | 19 | ||
20 | #include <qpe/timestring.h> | 20 | #include <qpe/timestring.h> |
21 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
22 | 22 | ||
23 | #include <qdatetime.h> | 23 | #include <qdatetime.h> |
24 | #include <qlabel.h> | 24 | #include <qlabel.h> |
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | #include <qtl.h> | 26 | #include <qtl.h> |
27 | #include <qscrollview.h> | 27 | #include <qscrollview.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
29 | 29 | ||
30 | DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name) | 30 | DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name ) |
31 | : QWidget(parent, name ) { | 31 | : QWidget(parent, name ) { |
32 | 32 | ||
33 | db = 0l; | 33 | db = 0l; |
34 | m_layoutDates = 0l; | 34 | m_layoutDates = 0l; |
35 | 35 | ||
36 | if ( db ) { | 36 | if ( db ) { |
37 | delete db; | 37 | delete db; |
38 | } | 38 | } |
39 | db = new DateBookDB; | 39 | db = new DateBookDB; |
40 | 40 | ||
41 | if ( m_layoutDates ) { | 41 | if ( m_layoutDates ) { |
42 | delete m_layoutDates; | 42 | delete m_layoutDates; |
43 | } | 43 | } |
44 | m_layoutDates = new QVBoxLayout( this ); | 44 | m_layoutDates = new QVBoxLayout( this ); |
45 | m_layoutDates->setAutoAdd( true ); | 45 | m_layoutDates->setAutoAdd( true ); |
46 | 46 | ||
47 | m_eventsList.setAutoDelete( true ); | 47 | m_eventsList.setAutoDelete( true ); |
48 | 48 | ||
49 | readConfig(); | 49 | readConfig(); |
50 | getDates(); | 50 | getDates(); |
51 | } | 51 | } |
52 | 52 | ||
53 | DatebookPluginWidget::~DatebookPluginWidget() { | 53 | DatebookPluginWidget::~DatebookPluginWidget() { |
54 | delete db; | 54 | delete db; |
55 | delete m_layoutDates; | 55 | delete m_layoutDates; |
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index 7a2235c..d7b51b4 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h | |||
@@ -1,48 +1,47 @@ | |||
1 | /* | 1 | /* |
2 | * todoplugin.h | 2 | * todoplugin.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #ifndef TODOLIST_PLUGIN_H | 17 | #ifndef TODOLIST_PLUGIN_H |
18 | #define TODOLIST_PLUGIN_H | 18 | #define TODOLIST_PLUGIN_H |
19 | 19 | ||
20 | #include <qstring.h> | 20 | #include <qstring.h> |
21 | #include <qguardedptr.h> | 21 | #include <qguardedptr.h> |
22 | #include <qwidget.h> | 22 | #include <qwidget.h> |
23 | 23 | ||
24 | #include <opie/tododb.h> | ||
25 | #include <opie/oclickablelabel.h> | 24 | #include <opie/oclickablelabel.h> |
26 | #include <opie/todayplugininterface.h> | 25 | #include <opie/todayplugininterface.h> |
27 | 26 | ||
28 | #include "todopluginwidget.h" | 27 | #include "todopluginwidget.h" |
29 | 28 | ||
30 | class TodolistPlugin : public TodayPluginObject { | 29 | class TodolistPlugin : public TodayPluginObject { |
31 | 30 | ||
32 | public: | 31 | public: |
33 | TodolistPlugin(); | 32 | TodolistPlugin(); |
34 | ~TodolistPlugin(); | 33 | ~TodolistPlugin(); |
35 | 34 | ||
36 | QString pluginName() const; | 35 | QString pluginName() const; |
37 | double versionNumber() const; | 36 | double versionNumber() const; |
38 | QString pixmapNameWidget() const; | 37 | QString pixmapNameWidget() const; |
39 | QWidget* widget(QWidget *); | 38 | QWidget* widget(QWidget *); |
40 | QString pixmapNameConfig() const; | 39 | QString pixmapNameConfig() const; |
41 | TodayConfigWidget* configWidget(QWidget *); | 40 | TodayConfigWidget* configWidget(QWidget *); |
42 | QString appName() const; | 41 | QString appName() const; |
43 | bool excludeFromRefresh() const; | 42 | bool excludeFromRefresh() const; |
44 | void refresh(); | 43 | void refresh(); |
45 | 44 | ||
46 | private: | 45 | private: |
47 | QGuardedPtr<TodolistPluginWidget> m_widget; | 46 | QGuardedPtr<TodolistPluginWidget> m_widget; |
48 | }; | 47 | }; |
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 2497ee1..5e5d373 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -1,64 +1,56 @@ | |||
1 | /* | 1 | /* |
2 | * today.cpp | 2 | * today.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | 17 | ||
18 | 18 | ||
19 | #define QTOPIA_INTERNAL_LANGLIST | 19 | #define QTOPIA_INTERNAL_LANGLIST |
20 | 20 | ||
21 | #include "today.h" | 21 | #include "today.h" |
22 | #include <opie/todayconfigwidget.h> | ||
23 | 22 | ||
24 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
25 | #include <qpe/qcopenvelope_qws.h> | 24 | #include <qpe/qcopenvelope_qws.h> |
26 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
27 | #include <qpe/global.h> | 26 | #include <qpe/global.h> |
28 | #include <qpe/qpeapplication.h> | 27 | #include <qpe/qpeapplication.h> |
29 | #include <qpe/contact.h> | 28 | #include <qpe/contact.h> |
30 | 29 | ||
31 | #include <qdir.h> | 30 | #include <qdir.h> |
32 | #include <qfile.h> | 31 | #include <qfile.h> |
33 | #include <qpushbutton.h> | ||
34 | #include <qlabel.h> | ||
35 | #include <qtimer.h> | 32 | #include <qtimer.h> |
36 | #include <qpixmap.h> | ||
37 | #include <qlayout.h> | ||
38 | #include <qhbox.h> | ||
39 | #include <opie/otabwidget.h> | ||
40 | #include <qdialog.h> | ||
41 | #include <qwhatsthis.h> | 33 | #include <qwhatsthis.h> |
42 | #include <qtranslator.h> | 34 | #include <qtranslator.h> |
43 | 35 | ||
44 | struct TodayPlugin { | 36 | struct TodayPlugin { |
45 | TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} | 37 | TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} |
46 | QLibrary *library; | 38 | QLibrary *library; |
47 | QInterfacePtr<TodayPluginInterface> iface; | 39 | QInterfacePtr<TodayPluginInterface> iface; |
48 | TodayPluginObject *guiPart; | 40 | TodayPluginObject *guiPart; |
49 | QWidget *guiBox; | 41 | QWidget *guiBox; |
50 | QString name; | 42 | QString name; |
51 | bool active; | 43 | bool active; |
52 | bool excludeRefresh; | 44 | bool excludeRefresh; |
53 | int pos; | 45 | int pos; |
54 | }; | 46 | }; |
55 | 47 | ||
56 | static QValueList<TodayPlugin> pluginList; | 48 | static QValueList<TodayPlugin> pluginList; |
57 | 49 | ||
58 | Today::Today( QWidget* parent, const char* name, WFlags fl ) | 50 | Today::Today( QWidget* parent, const char* name, WFlags fl ) |
59 | : TodayBase( parent, name, fl ) { | 51 | : TodayBase( parent, name, fl ) { |
60 | 52 | ||
61 | QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) ); | 53 | QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) ); |
62 | QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this, SLOT( editCard() ) ); | 54 | QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this, SLOT( editCard() ) ); |
63 | 55 | ||
64 | #if defined(Q_WS_QWS) | 56 | #if defined(Q_WS_QWS) |
diff --git a/core/pim/today/today.h b/core/pim/today/today.h index 24f5611..3802feb 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h | |||
@@ -1,55 +1,50 @@ | |||
1 | /* | 1 | /* |
2 | * today.h | 2 | * today.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | 17 | ||
18 | #ifndef TODAY_H | 18 | #ifndef TODAY_H |
19 | #define TODAY_H | 19 | #define TODAY_H |
20 | 20 | ||
21 | #include <opie/tododb.h> | ||
22 | |||
23 | #include <qdatetime.h> | ||
24 | #include <qlist.h> | ||
25 | #include <qhbox.h> | ||
26 | 21 | ||
27 | #include <qpe/qlibrary.h> | 22 | #include <qpe/qlibrary.h> |
28 | #include <qpe/event.h> | ||
29 | 23 | ||
30 | #include "todayconfig.h" | 24 | #include "todayconfig.h" |
31 | #include "todaybase.h" | 25 | #include "todaybase.h" |
26 | |||
32 | #include <opie/todayplugininterface.h> | 27 | #include <opie/todayplugininterface.h> |
33 | 28 | ||
34 | class QVBoxLayout; | 29 | class QVBoxLayout; |
35 | class OClickableLabel; | 30 | class OClickableLabel; |
36 | 31 | ||
37 | 32 | ||
38 | class Today : public TodayBase { | 33 | class Today : public TodayBase { |
39 | 34 | ||
40 | Q_OBJECT | 35 | Q_OBJECT |
41 | 36 | ||
42 | public: | 37 | public: |
43 | Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 38 | Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
44 | ~Today(); | 39 | ~Today(); |
45 | 40 | ||
46 | private slots: | 41 | private slots: |
47 | void startConfig(); | 42 | void startConfig(); |
48 | void startApplication(); | 43 | void startApplication(); |
49 | void editCard(); | 44 | void editCard(); |
50 | void refresh(); | 45 | void refresh(); |
51 | 46 | ||
52 | private: | 47 | private: |
53 | void init(); | 48 | void init(); |
54 | void setOwnerField(); | 49 | void setOwnerField(); |
55 | void setOwnerField(QString &string); | 50 | void setOwnerField(QString &string); |
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index 9a93b56..826e253 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp | |||
@@ -1,43 +1,42 @@ | |||
1 | /* | 1 | /* |
2 | * todaybase.cpp | 2 | * todaybase.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #include "todaybase.h" | 17 | #include "todaybase.h" |
18 | 18 | ||
19 | #include <qframe.h> | ||
20 | #include <qlabel.h> | 19 | #include <qlabel.h> |
21 | #include <qimage.h> | 20 | #include <qimage.h> |
22 | #include <qpixmap.h> | 21 | #include <qpixmap.h> |
23 | #include <qapplication.h> | 22 | #include <qapplication.h> |
24 | #include <qwhatsthis.h> | 23 | #include <qwhatsthis.h> |
25 | 24 | ||
26 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
27 | 26 | ||
28 | 27 | ||
29 | TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) | 28 | TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) |
30 | : QWidget( parent, name, WStyle_ContextHelp ) { | 29 | : QWidget( parent, name, WStyle_ContextHelp ) { |
31 | 30 | ||
32 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo | 31 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo |
33 | QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla | 32 | QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla |
34 | QPixmap config = Resource::loadPixmap( "today/config" ); // config icon | 33 | QPixmap config = Resource::loadPixmap( "today/config" ); // config icon |
35 | 34 | ||
36 | layout = new QVBoxLayout( this ); | 35 | layout = new QVBoxLayout( this ); |
37 | 36 | ||
38 | QPalette pal = this->palette(); | 37 | QPalette pal = this->palette(); |
39 | QColor col = pal.color( QPalette::Active, QColorGroup::Background ); | 38 | QColor col = pal.color( QPalette::Active, QColorGroup::Background ); |
40 | pal.setColor( QPalette::Active, QColorGroup::Button, col ); | 39 | pal.setColor( QPalette::Active, QColorGroup::Button, col ); |
41 | pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); | 40 | pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); |
42 | pal.setColor( QPalette::Normal, QColorGroup::Button, col ); | 41 | pal.setColor( QPalette::Normal, QColorGroup::Button, col ); |
43 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); | 42 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); |