4 files changed, 6 insertions, 6 deletions

diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp
index 2ac7d01..f095478 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.cpp
+++ b/core/pim/today/plugins/datebook/datebookplugin.cpp
@@ -20,17 +20,16 @@
 #include "datebookevent.h"
 #include "datebookplugin.h"
 #include "datebookpluginconfig.h"
 
 
 DatebookPlugin::DatebookPlugin()  {
-    m_widget = 0;
 }
 
 DatebookPlugin::~DatebookPlugin() {
-    delete m_widget;
+    delete (DatebookPluginWidget*)m_widget;
 }
 
 QString DatebookPlugin::pluginName() const {
     return QObject::tr( "Datebook plugin");
 }
 
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h
index 644a614..eb7a401 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.h
+++ b/core/pim/today/plugins/datebook/datebookplugin.h
@@ -15,12 +15,13 @@
  ***************************************************************************/
 
 #ifndef DATEBOOK_PLUGIN_H
 #define DATEBOOK_PLUGIN_H
 
 #include <qstring.h>
+#include <qguardedptr.h>
 #include <qwidget.h>
 
 #include <opie/oclickablelabel.h>
 #include <opie/todayplugininterface.h>
 
 #include "datebookpluginwidget.h"
@@ -39,11 +40,11 @@ public:
     TodayConfigWidget* configWidget( QWidget *);
     QString appName() const;
     bool excludeFromRefresh() const;
     void refresh();
 
  private:
-    DatebookPluginWidget *m_widget;
+    QGuardedPtr<DatebookPluginWidget> m_widget;
 };
 
 
 #endif
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp
index 1238f92..bff0eba 100644
--- a/core/pim/today/plugins/todolist/todoplugin.cpp
+++ b/core/pim/today/plugins/todolist/todoplugin.cpp
@@ -18,17 +18,16 @@
 
 #include "todoplugin.h"
 #include "todopluginconfig.h"
 
 
 TodolistPlugin::TodolistPlugin() {
-    m_widget = 0l;
 }
 
 TodolistPlugin::~TodolistPlugin() {
-    delete m_widget;
+    delete (TodolistPluginWidget*)m_widget;
 }
 
 QString TodolistPlugin::pluginName() const {
     return QObject::tr( "Todolist plugin" );
 }
 
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h
index 6106d0c..7a2235c 100644
--- a/core/pim/today/plugins/todolist/todoplugin.h
+++ b/core/pim/today/plugins/todolist/todoplugin.h
@@ -15,12 +15,13 @@
  ***************************************************************************/
 
 #ifndef TODOLIST_PLUGIN_H
 #define TODOLIST_PLUGIN_H
 
 #include <qstring.h>
+#include <qguardedptr.h>
 #include <qwidget.h>
 
 #include <opie/tododb.h>
 #include <opie/oclickablelabel.h>
 #include <opie/todayplugininterface.h>
 
@@ -40,10 +41,10 @@ public:
     TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
     bool excludeFromRefresh() const;
     void refresh();
 
  private:
-    TodolistPluginWidget *m_widget;
+    QGuardedPtr<TodolistPluginWidget> m_widget;
 };
 
 #endif