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
@@ -64,11 +64,13 @@ 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
@@ -33,10 +33,10 @@ class AddressBookPluginWidget : public QWidget {
 public:
     AddressBookPluginWidget( QWidget *parent,  const char *name );
     ~AddressBookPluginWidget();
 
-    void reinitialize();
 public slots:
+    void reinitialize();
     void refresh( const Opie::OPimContactAccess* db );
 
 protected slots:
     void  startAddressBook();
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
@@ -22,9 +22,8 @@
 #include <qpe/datebookdb.h>
 
 
 class DateBookEvent: public Opie::Ui::OClickableLabel {
-
      Q_OBJECT
 
 public:
      DateBookEvent( const EffectiveEvent &ev,
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
@@ -17,13 +17,12 @@
 #include "datebookplugin.h"
 #include "datebookpluginconfig.h"
 
 
-DatebookPlugin::DatebookPlugin()  {
+DatebookPlugin::DatebookPlugin() {
 }
 
 DatebookPlugin::~DatebookPlugin() {
-    delete (DatebookPluginWidget*)m_widget;
 }
 
 QString DatebookPlugin::pluginName() const {
     return QObject::tr( "Datebook plugin");
@@ -37,11 +36,9 @@ QString DatebookPlugin::pixmapNameWidget() const {
     return "datebook/DateBook";
 }
 
 QWidget* DatebookPlugin::widget( QWidget* wid ) {
-    if(!m_widget) {
-        m_widget = new DatebookPluginWidget( wid,  "Datebook" );
-    }
+    m_widget = new DatebookPluginWidget( wid,  "Datebook" );
     return m_widget;
 }
 
 QString DatebookPlugin::pixmapNameConfig() const {
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
@@ -21,10 +21,8 @@
 
 #include <opie2/oclickablelabel.h>
 #include <opie2/todayplugininterface.h>
 
-#include <qguardedptr.h>
-
 class DatebookPlugin : public TodayPluginObject {
 
 public:
     DatebookPlugin();
@@ -41,9 +39,9 @@ public:
     void refresh();
     void reinitialize();
 
  private:
-    QGuardedPtr<DatebookPluginWidget> m_widget;
+    DatebookPluginWidget *m_widget;
 };
 
 
 #endif
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
@@ -21,9 +21,8 @@ MailPlugin::MailPlugin() {
     m_widget = 0l;
 }
 
 MailPlugin::~MailPlugin() {
-    delete (MailPluginWidget*)m_widget;
 }
 
 QString MailPlugin::pluginName() const {
     return QObject::tr( "Mail plugin" );
@@ -37,11 +36,9 @@ QString MailPlugin::pixmapNameWidget() const {
     return "opiemail/desktopicon";
 }
 
 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
@@ -22,13 +22,8 @@
 
 #include <opie2/todayplugininterface.h>
 #include <opie2/todayconfigwidget.h>
 
-#include <qwidget.h>
-#include <qguardedptr.h>
-
-
-
 
 class MailPlugin : public TodayPluginObject {
 
 public:
@@ -46,8 +41,8 @@ public:
     void refresh();
     void reinitialize();
 
  private:
-   QGuardedPtr<MailPluginWidget> m_widget;
+   MailPluginWidget* m_widget;
 };
 
 #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
@@ -16,13 +16,14 @@
 
 #include "todoplugin.h"
 #include "todopluginconfig.h"
 
-TodolistPlugin::TodolistPlugin() {
+TodolistPlugin::TodolistPlugin() 
+    : m_widget(0l)
+{
 }
 
 TodolistPlugin::~TodolistPlugin() {
-    delete (TodolistPluginWidget*)m_widget;
 }
 
 QString TodolistPlugin::pluginName() const {
     return QObject::tr( "Todolist plugin" );
@@ -36,11 +37,9 @@ QString TodolistPlugin::pixmapNameWidget() const {
     return "todo/TodoList";
 }
 
 QWidget* TodolistPlugin::widget( QWidget *wid ) {
-       if(!m_widget) {
-        m_widget = new TodolistPluginWidget( wid, "Todolist" );
-       }
+    m_widget = new TodolistPluginWidget( wid, "Todolist" );
     return m_widget;
 }
 
 QString TodolistPlugin::pixmapNameConfig() const {
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
@@ -45,8 +45,8 @@ public:
     void refresh();
     void reinitialize();
 
  private:
-    QGuardedPtr<TodolistPluginWidget> m_widget;
+    TodolistPluginWidget* m_widget;
 };
 
 #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
@@ -5,14 +5,14 @@
  *
  */
 #include "exampleplugin.h"
 
-ExamplePlugin::ExamplePlugin() {
-    m_widget = 0l;
+ExamplePlugin::ExamplePlugin() 
+    : m_widget(0l)
+{
 }
 
 ExamplePlugin::~ExamplePlugin() {
-    delete (ExamplePluginWidget*)m_widget;
 }
 
 QString ExamplePlugin::pluginName() const {
     return QObject::tr( "Example plugin" );
@@ -27,11 +27,9 @@ QString ExamplePlugin::pixmapNameWidget() const {
     return QString::fromLatin1("Tux");
 }
 
 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
@@ -8,11 +8,8 @@
 
 #ifndef EXAMPLE_PLUGIN_H
 #define EXAMPLE_PLUGIN_H
 
-#include <qwidget.h>
-#include <qguardedptr.h>
-
 #include <opie2/todayplugininterface.h>
 #include <opie2/todayconfigwidget.h>
 
 #include "examplepluginwidget.h"
@@ -33,10 +30,9 @@ public:
     QString appName() const;
     bool excludeFromRefresh() const;
     void refresh();
     void reinitialize();
-
- private:
-   QGuardedPtr<ExamplePluginWidget> m_widget;
+private:    
+    ExamplePluginWidget *m_widget;
 };
 
 #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
@@ -55,9 +55,9 @@ QString FortunePlugin::pixmapNameConfig() const
 
 TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ )
 {
 //    return new FortunePluginConfig( wid , "Fortune" );
-	return NULL;
+	return 0l;
 }
 
 QString 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
@@ -19,11 +19,8 @@
 
 #include <opie2/oclickablelabel.h>
 #include <opie2/todayplugininterface.h>
 
-#include <qstring.h>
-#include <qwidget.h>
-
 class FortunePlugin : public TodayPluginObject
 {
 
 public: