summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/addressbook/addressplugin.cpp6
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.h2
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.h1
-rw-r--r--core/pim/today/plugins/datebook/datebookplugin.cpp7
-rw-r--r--core/pim/today/plugins/datebook/datebookplugin.h4
-rw-r--r--core/pim/today/plugins/mail/mailplugin.cpp5
-rw-r--r--core/pim/today/plugins/mail/mailplugin.h7
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.cpp9
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.h2
-rw-r--r--examples/todayplugin/exampleplugin.cpp10
-rw-r--r--examples/todayplugin/exampleplugin.h8
-rw-r--r--noncore/todayplugins/fortune/fortuneplugin.cpp2
-rw-r--r--noncore/todayplugins/fortune/fortuneplugin.h3
13 files changed, 22 insertions, 44 deletions
diff --git a/core/pim/today/plugins/addressbook/addressplugin.cpp b/core/pim/today/plugins/addressbook/addressplugin.cpp
index 5d5d34c..263a0c5 100644
--- a/core/pim/today/plugins/addressbook/addressplugin.cpp
+++ b/core/pim/today/plugins/addressbook/addressplugin.cpp
@@ -65,10 +65,12 @@ bool AddressBookPlugin::excludeFromRefresh() const {
65 65
66void AddressBookPlugin::refresh() 66void AddressBookPlugin::refresh()
67{ 67{
68 m_abWidget->refresh( NULL ); 68 if(m_abWidget)
69 m_abWidget->refresh( 0l );
69} 70}
70 71
71void AddressBookPlugin::reinitialize() 72void AddressBookPlugin::reinitialize()
72{ 73{
73 m_abWidget->reinitialize(); 74 if(m_abWidget)
75 m_abWidget->reinitialize();
74} 76}
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.h b/core/pim/today/plugins/addressbook/addresspluginwidget.h
index 25b3098..b42f252 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.h
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.h
@@ -34,8 +34,8 @@ public:
34 AddressBookPluginWidget( QWidget *parent, const char *name ); 34 AddressBookPluginWidget( QWidget *parent, const char *name );
35 ~AddressBookPluginWidget(); 35 ~AddressBookPluginWidget();
36 36
37 void reinitialize();
38public slots: 37public slots:
38 void reinitialize();
39 void refresh( const Opie::OPimContactAccess* db ); 39 void refresh( const Opie::OPimContactAccess* db );
40 40
41protected slots: 41protected slots:
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h
index 973efe4..7a5843f 100644
--- a/core/pim/today/plugins/datebook/datebookevent.h
+++ b/core/pim/today/plugins/datebook/datebookevent.h
@@ -23,7 +23,6 @@
23 23
24 24
25class DateBookEvent: public Opie::Ui::OClickableLabel { 25class DateBookEvent: public Opie::Ui::OClickableLabel {
26
27 Q_OBJECT 26 Q_OBJECT
28 27
29public: 28public:
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp
index f46806f..892a0ad 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.cpp
+++ b/core/pim/today/plugins/datebook/datebookplugin.cpp
@@ -18,11 +18,10 @@
18#include "datebookpluginconfig.h" 18#include "datebookpluginconfig.h"
19 19
20 20
21DatebookPlugin::DatebookPlugin() { 21DatebookPlugin::DatebookPlugin() {
22} 22}
23 23
24DatebookPlugin::~DatebookPlugin() { 24DatebookPlugin::~DatebookPlugin() {
25 delete (DatebookPluginWidget*)m_widget;
26} 25}
27 26
28QString DatebookPlugin::pluginName() const { 27QString DatebookPlugin::pluginName() const {
@@ -38,9 +37,7 @@ QString DatebookPlugin::pixmapNameWidget() const {
38} 37}
39 38
40QWidget* DatebookPlugin::widget( QWidget* wid ) { 39QWidget* DatebookPlugin::widget( QWidget* wid ) {
41 if(!m_widget) { 40 m_widget = new DatebookPluginWidget( wid, "Datebook" );
42 m_widget = new DatebookPluginWidget( wid, "Datebook" );
43 }
44 return m_widget; 41 return m_widget;
45} 42}
46 43
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h
index 631d6a3..990c413 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.h
+++ b/core/pim/today/plugins/datebook/datebookplugin.h
@@ -22,8 +22,6 @@
22#include <opie2/oclickablelabel.h> 22#include <opie2/oclickablelabel.h>
23#include <opie2/todayplugininterface.h> 23#include <opie2/todayplugininterface.h>
24 24
25#include <qguardedptr.h>
26
27class DatebookPlugin : public TodayPluginObject { 25class DatebookPlugin : public TodayPluginObject {
28 26
29public: 27public:
@@ -42,7 +40,7 @@ public:
42 void reinitialize(); 40 void reinitialize();
43 41
44 private: 42 private:
45 QGuardedPtr<DatebookPluginWidget> m_widget; 43 DatebookPluginWidget *m_widget;
46}; 44};
47 45
48 46
diff --git a/core/pim/today/plugins/mail/mailplugin.cpp b/core/pim/today/plugins/mail/mailplugin.cpp
index b30d2a2..f590ebb 100644
--- a/core/pim/today/plugins/mail/mailplugin.cpp
+++ b/core/pim/today/plugins/mail/mailplugin.cpp
@@ -22,7 +22,6 @@ MailPlugin::MailPlugin() {
22} 22}
23 23
24MailPlugin::~MailPlugin() { 24MailPlugin::~MailPlugin() {
25 delete (MailPluginWidget*)m_widget;
26} 25}
27 26
28QString MailPlugin::pluginName() const { 27QString MailPlugin::pluginName() const {
@@ -38,9 +37,7 @@ QString MailPlugin::pixmapNameWidget() const {
38} 37}
39 38
40QWidget* MailPlugin::widget( QWidget * wid ) { 39QWidget* MailPlugin::widget( QWidget * wid ) {
41 if(!m_widget) { 40 m_widget = new MailPluginWidget( wid, "Datebook" );
42 m_widget = new MailPluginWidget( wid, "Datebook" );
43 }
44 return m_widget; 41 return m_widget;
45} 42}
46 43
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h
index 1edffef..1e694bc 100644
--- a/core/pim/today/plugins/mail/mailplugin.h
+++ b/core/pim/today/plugins/mail/mailplugin.h
@@ -23,11 +23,6 @@
23#include <opie2/todayplugininterface.h> 23#include <opie2/todayplugininterface.h>
24#include <opie2/todayconfigwidget.h> 24#include <opie2/todayconfigwidget.h>
25 25
26#include <qwidget.h>
27#include <qguardedptr.h>
28
29
30
31 26
32class MailPlugin : public TodayPluginObject { 27class MailPlugin : public TodayPluginObject {
33 28
@@ -47,7 +42,7 @@ public:
47 void reinitialize(); 42 void reinitialize();
48 43
49 private: 44 private:
50 QGuardedPtr<MailPluginWidget> m_widget; 45 MailPluginWidget* m_widget;
51}; 46};
52 47
53#endif 48#endif
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp
index 5783814..6cfcbe0 100644
--- a/core/pim/today/plugins/todolist/todoplugin.cpp
+++ b/core/pim/today/plugins/todolist/todoplugin.cpp
@@ -17,11 +17,12 @@
17#include "todoplugin.h" 17#include "todoplugin.h"
18#include "todopluginconfig.h" 18#include "todopluginconfig.h"
19 19
20TodolistPlugin::TodolistPlugin() { 20TodolistPlugin::TodolistPlugin()
21 : m_widget(0l)
22{
21} 23}
22 24
23TodolistPlugin::~TodolistPlugin() { 25TodolistPlugin::~TodolistPlugin() {
24 delete (TodolistPluginWidget*)m_widget;
25} 26}
26 27
27QString TodolistPlugin::pluginName() const { 28QString TodolistPlugin::pluginName() const {
@@ -37,9 +38,7 @@ QString TodolistPlugin::pixmapNameWidget() const {
37} 38}
38 39
39QWidget* TodolistPlugin::widget( QWidget *wid ) { 40QWidget* TodolistPlugin::widget( QWidget *wid ) {
40 if(!m_widget) { 41 m_widget = new TodolistPluginWidget( wid, "Todolist" );
41 m_widget = new TodolistPluginWidget( wid, "Todolist" );
42 }
43 return m_widget; 42 return m_widget;
44} 43}
45 44
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h
index 976dbf7..6add53e 100644
--- a/core/pim/today/plugins/todolist/todoplugin.h
+++ b/core/pim/today/plugins/todolist/todoplugin.h
@@ -46,7 +46,7 @@ public:
46 void reinitialize(); 46 void reinitialize();
47 47
48 private: 48 private:
49 QGuardedPtr<TodolistPluginWidget> m_widget; 49 TodolistPluginWidget* m_widget;
50}; 50};
51 51
52#endif 52#endif
diff --git a/examples/todayplugin/exampleplugin.cpp b/examples/todayplugin/exampleplugin.cpp
index 94a5836..41bbfe2 100644
--- a/examples/todayplugin/exampleplugin.cpp
+++ b/examples/todayplugin/exampleplugin.cpp
@@ -6,12 +6,12 @@
6 */ 6 */
7#include "exampleplugin.h" 7#include "exampleplugin.h"
8 8
9ExamplePlugin::ExamplePlugin() { 9ExamplePlugin::ExamplePlugin()
10 m_widget = 0l; 10 : m_widget(0l)
11{
11} 12}
12 13
13ExamplePlugin::~ExamplePlugin() { 14ExamplePlugin::~ExamplePlugin() {
14 delete (ExamplePluginWidget*)m_widget;
15} 15}
16 16
17QString ExamplePlugin::pluginName() const { 17QString ExamplePlugin::pluginName() const {
@@ -28,9 +28,7 @@ QString ExamplePlugin::pixmapNameWidget() const {
28} 28}
29 29
30QWidget* ExamplePlugin::widget( QWidget * wid ) { 30QWidget* ExamplePlugin::widget( QWidget * wid ) {
31 if(!m_widget) { 31 m_widget = new ExamplePluginWidget( wid, "Example" );
32 m_widget = new ExamplePluginWidget( wid, "Example" );
33 }
34 return m_widget; 32 return m_widget;
35} 33}
36 34
diff --git a/examples/todayplugin/exampleplugin.h b/examples/todayplugin/exampleplugin.h
index 94f5b37..90d3485 100644
--- a/examples/todayplugin/exampleplugin.h
+++ b/examples/todayplugin/exampleplugin.h
@@ -9,9 +9,6 @@
9#ifndef EXAMPLE_PLUGIN_H 9#ifndef EXAMPLE_PLUGIN_H
10#define EXAMPLE_PLUGIN_H 10#define EXAMPLE_PLUGIN_H
11 11
12#include <qwidget.h>
13#include <qguardedptr.h>
14
15#include <opie2/todayplugininterface.h> 12#include <opie2/todayplugininterface.h>
16#include <opie2/todayconfigwidget.h> 13#include <opie2/todayconfigwidget.h>
17 14
@@ -34,9 +31,8 @@ public:
34 bool excludeFromRefresh() const; 31 bool excludeFromRefresh() const;
35 void refresh(); 32 void refresh();
36 void reinitialize(); 33 void reinitialize();
37 34private:
38 private: 35 ExamplePluginWidget *m_widget;
39 QGuardedPtr<ExamplePluginWidget> m_widget;
40}; 36};
41 37
42#endif 38#endif
diff --git a/noncore/todayplugins/fortune/fortuneplugin.cpp b/noncore/todayplugins/fortune/fortuneplugin.cpp
index 69d2c45..4461219 100644
--- a/noncore/todayplugins/fortune/fortuneplugin.cpp
+++ b/noncore/todayplugins/fortune/fortuneplugin.cpp
@@ -56,7 +56,7 @@ QString FortunePlugin::pixmapNameConfig() const
56TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ ) 56TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ )
57{ 57{
58// return new FortunePluginConfig( wid , "Fortune" ); 58// return new FortunePluginConfig( wid , "Fortune" );
59 return NULL; 59 return 0l;
60} 60}
61 61
62QString FortunePlugin::appName() const 62QString FortunePlugin::appName() const
diff --git a/noncore/todayplugins/fortune/fortuneplugin.h b/noncore/todayplugins/fortune/fortuneplugin.h
index 9b590ad..91bd981 100644
--- a/noncore/todayplugins/fortune/fortuneplugin.h
+++ b/noncore/todayplugins/fortune/fortuneplugin.h
@@ -20,9 +20,6 @@
20#include <opie2/oclickablelabel.h> 20#include <opie2/oclickablelabel.h>
21#include <opie2/todayplugininterface.h> 21#include <opie2/todayplugininterface.h>
22 22
23#include <qstring.h>
24#include <qwidget.h>
25
26class FortunePlugin : public TodayPluginObject 23class FortunePlugin : public TodayPluginObject
27{ 24{
28 25