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
@@ -66,9 +66,11 @@ bool AddressBookPlugin::excludeFromRefresh() const {
 void AddressBookPlugin::refresh()
 {
-    m_abWidget->refresh( NULL );
+    if(m_abWidget)
+        m_abWidget->refresh( 0l );
 }
 
 void AddressBookPlugin::reinitialize()
 {
-    m_abWidget->reinitialize();
+    if(m_abWidget)
+        m_abWidget->reinitialize();
 }
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
@@ -35,6 +35,6 @@ public:
     ~AddressBookPluginWidget();
 
-    void reinitialize();
 public slots:
+    void reinitialize();
     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
@@ -24,5 +24,4 @@
 
 class DateBookEvent: public Opie::Ui::OClickableLabel {
-
      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
@@ -19,9 +19,8 @@
 
 
-DatebookPlugin::DatebookPlugin()  {
+DatebookPlugin::DatebookPlugin() {
 }
 
 DatebookPlugin::~DatebookPlugin() {
-    delete (DatebookPluginWidget*)m_widget;
 }
 
@@ -39,7 +38,5 @@ QString DatebookPlugin::pixmapNameWidget() const {
 
 QWidget* DatebookPlugin::widget( QWidget* wid ) {
-    if(!m_widget) {
-        m_widget = new DatebookPluginWidget( wid,  "Datebook" );
-    }
+    m_widget = new DatebookPluginWidget( wid,  "Datebook" );
     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
@@ -23,6 +23,4 @@
 #include <opie2/todayplugininterface.h>
 
-#include <qguardedptr.h>
-
 class DatebookPlugin : public TodayPluginObject {
 
@@ -43,5 +41,5 @@ public:
 
  private:
-    QGuardedPtr<DatebookPluginWidget> m_widget;
+    DatebookPluginWidget *m_widget;
 };
 
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
@@ -23,5 +23,4 @@ MailPlugin::MailPlugin() {
 
 MailPlugin::~MailPlugin() {
-    delete (MailPluginWidget*)m_widget;
 }
 
@@ -39,7 +38,5 @@ QString MailPlugin::pixmapNameWidget() const {
 
 QWidget* MailPlugin::widget( QWidget * wid ) {
-    if(!m_widget) {
-        m_widget = new MailPluginWidget( wid,  "Datebook" );
-    }
+    m_widget = new MailPluginWidget( wid,  "Datebook" );
     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
@@ -24,9 +24,4 @@
 #include <opie2/todayconfigwidget.h>
 
-#include <qwidget.h>
-#include <qguardedptr.h>
-
-
-
 
 class MailPlugin : public TodayPluginObject {
@@ -48,5 +43,5 @@ public:
 
  private:
-   QGuardedPtr<MailPluginWidget> m_widget;
+   MailPluginWidget* m_widget;
 };
 
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
@@ -18,9 +18,10 @@
 #include "todopluginconfig.h"
 
-TodolistPlugin::TodolistPlugin() {
+TodolistPlugin::TodolistPlugin() 
+    : m_widget(0l)
+{
 }
 
 TodolistPlugin::~TodolistPlugin() {
-    delete (TodolistPluginWidget*)m_widget;
 }
 
@@ -38,7 +39,5 @@ QString TodolistPlugin::pixmapNameWidget() const {
 
 QWidget* TodolistPlugin::widget( QWidget *wid ) {
-       if(!m_widget) {
-        m_widget = new TodolistPluginWidget( wid, "Todolist" );
-       }
+    m_widget = new TodolistPluginWidget( wid, "Todolist" );
     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
@@ -47,5 +47,5 @@ public:
 
  private:
-    QGuardedPtr<TodolistPluginWidget> m_widget;
+    TodolistPluginWidget* m_widget;
 };
 
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
@@ -7,10 +7,10 @@
 #include "exampleplugin.h"
 
-ExamplePlugin::ExamplePlugin() {
-    m_widget = 0l;
+ExamplePlugin::ExamplePlugin() 
+    : m_widget(0l)
+{
 }
 
 ExamplePlugin::~ExamplePlugin() {
-    delete (ExamplePluginWidget*)m_widget;
 }
 
@@ -29,7 +29,5 @@ QString ExamplePlugin::pixmapNameWidget() const {
 
 QWidget* ExamplePlugin::widget( QWidget * wid ) {
-    if(!m_widget) {
-        m_widget = new ExamplePluginWidget( wid,  "Example" );
-    }
+    m_widget = new ExamplePluginWidget( wid,  "Example" );
     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
@@ -10,7 +10,4 @@
 #define EXAMPLE_PLUGIN_H
 
-#include <qwidget.h>
-#include <qguardedptr.h>
-
 #include <opie2/todayplugininterface.h>
 #include <opie2/todayconfigwidget.h>
@@ -35,7 +32,6 @@ public:
     void refresh();
     void reinitialize();
-
- private:
-   QGuardedPtr<ExamplePluginWidget> m_widget;
+private:    
+    ExamplePluginWidget *m_widget;
 };
 
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
@@ -57,5 +57,5 @@ TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ )
 {
 //    return new FortunePluginConfig( wid , "Fortune" );
-        return NULL;
+        return 0l;
 }
 
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
@@ -21,7 +21,4 @@
 #include <opie2/todayplugininterface.h>
 
-#include <qstring.h>
-#include <qwidget.h>
-
 class FortunePlugin : public TodayPluginObject
 {