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
@@ -67,3 +67,4 @@ void AddressBookPlugin::refresh()
67{ 67{
68 m_abWidget->refresh( NULL ); 68 if(m_abWidget)
69 m_abWidget->refresh( 0l );
69} 70}
@@ -72,3 +73,4 @@ void 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
@@ -36,4 +36,4 @@ public:
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 );
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
@@ -25,3 +25,2 @@
25class DateBookEvent: public Opie::Ui::OClickableLabel { 25class DateBookEvent: public Opie::Ui::OClickableLabel {
26
27 Q_OBJECT 26 Q_OBJECT
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
@@ -20,3 +20,3 @@
20 20
21DatebookPlugin::DatebookPlugin() { 21DatebookPlugin::DatebookPlugin() {
22} 22}
@@ -24,3 +24,2 @@ DatebookPlugin::DatebookPlugin() {
24DatebookPlugin::~DatebookPlugin() { 24DatebookPlugin::~DatebookPlugin() {
25 delete (DatebookPluginWidget*)m_widget;
26} 25}
@@ -40,5 +39,3 @@ QString DatebookPlugin::pixmapNameWidget() const {
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;
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
@@ -24,4 +24,2 @@
24 24
25#include <qguardedptr.h>
26
27class DatebookPlugin : public TodayPluginObject { 25class DatebookPlugin : public TodayPluginObject {
@@ -44,3 +42,3 @@ public:
44 private: 42 private:
45 QGuardedPtr<DatebookPluginWidget> m_widget; 43 DatebookPluginWidget *m_widget;
46}; 44};
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
@@ -24,3 +24,2 @@ MailPlugin::MailPlugin() {
24MailPlugin::~MailPlugin() { 24MailPlugin::~MailPlugin() {
25 delete (MailPluginWidget*)m_widget;
26} 25}
@@ -40,5 +39,3 @@ QString MailPlugin::pixmapNameWidget() const {
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;
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
@@ -25,7 +25,2 @@
25 25
26#include <qwidget.h>
27#include <qguardedptr.h>
28
29
30
31 26
@@ -49,3 +44,3 @@ public:
49 private: 44 private:
50 QGuardedPtr<MailPluginWidget> m_widget; 45 MailPluginWidget* m_widget;
51}; 46};
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
@@ -19,3 +19,5 @@
19 19
20TodolistPlugin::TodolistPlugin() { 20TodolistPlugin::TodolistPlugin()
21 : m_widget(0l)
22{
21} 23}
@@ -23,3 +25,2 @@ TodolistPlugin::TodolistPlugin() {
23TodolistPlugin::~TodolistPlugin() { 25TodolistPlugin::~TodolistPlugin() {
24 delete (TodolistPluginWidget*)m_widget;
25} 26}
@@ -39,5 +40,3 @@ QString TodolistPlugin::pixmapNameWidget() const {
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;
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
@@ -48,3 +48,3 @@ public:
48 private: 48 private:
49 QGuardedPtr<TodolistPluginWidget> m_widget; 49 TodolistPluginWidget* m_widget;
50}; 50};
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
@@ -8,4 +8,5 @@
8 8
9ExamplePlugin::ExamplePlugin() { 9ExamplePlugin::ExamplePlugin()
10 m_widget = 0l; 10 : m_widget(0l)
11{
11} 12}
@@ -13,3 +14,2 @@ ExamplePlugin::ExamplePlugin() {
13ExamplePlugin::~ExamplePlugin() { 14ExamplePlugin::~ExamplePlugin() {
14 delete (ExamplePluginWidget*)m_widget;
15} 15}
@@ -30,5 +30,3 @@ QString ExamplePlugin::pixmapNameWidget() const {
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;
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
@@ -11,5 +11,2 @@
11 11
12#include <qwidget.h>
13#include <qguardedptr.h>
14
15#include <opie2/todayplugininterface.h> 12#include <opie2/todayplugininterface.h>
@@ -36,5 +33,4 @@ public:
36 void reinitialize(); 33 void reinitialize();
37 34private:
38 private: 35 ExamplePluginWidget *m_widget;
39 QGuardedPtr<ExamplePluginWidget> m_widget;
40}; 36};
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
@@ -58,3 +58,3 @@ TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ )
58// return new FortunePluginConfig( wid , "Fortune" ); 58// return new FortunePluginConfig( wid , "Fortune" );
59 return NULL; 59 return 0l;
60} 60}
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
@@ -22,5 +22,2 @@
22 22
23#include <qstring.h>
24#include <qwidget.h>
25
26class FortunePlugin : public TodayPluginObject 23class FortunePlugin : public TodayPluginObject