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
@@ -2,53 +2,52 @@
 /*
  * datebookplugin.cpp
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 
 #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");
 }
 
 double DatebookPlugin::versionNumber() const {
     return 1.0;
 }
 
 QString DatebookPlugin::pixmapNameWidget() const {
     return "DateBook";
 }
 
 QWidget* DatebookPlugin::widget( QWidget* wid ) {
     if(!m_widget) {
         m_widget = new DatebookPluginWidget( wid,  "Datebook" );
     }
     return m_widget;
 }
 
 QString DatebookPlugin::pixmapNameConfig() const {
     return "DateBook";
 }
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
@@ -1,49 +1,50 @@
 /*
  * datebookplugin.h
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #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"
 
 class DatebookPlugin : public TodayPluginObject {
 
 public:
     DatebookPlugin();
     ~DatebookPlugin();
 
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget( QWidget *);
     QString pixmapNameConfig() const;
     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
@@ -1,52 +1,51 @@
 /*
  * todoplugin.cpp
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 
 #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" );
 }
 
 double TodolistPlugin::versionNumber() const {
     return 0.9;
 }
 
 QString TodolistPlugin::pixmapNameWidget() const {
     return "TodoList";
 }
 
 QWidget* TodolistPlugin::widget( QWidget *wid ) {
        if(!m_widget) {
         m_widget = new TodolistPluginWidget( wid, "Todolist" );
        }
     return m_widget;
 }
 
 QString TodolistPlugin::pixmapNameConfig() const {
     return "TodoList";
 }
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
@@ -1,49 +1,50 @@
 /*
  * todoplugin.h
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #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>
 
 #include "todopluginwidget.h"
 
 class TodolistPlugin : public TodayPluginObject {
 
 public:
     TodolistPlugin();
     ~TodolistPlugin();
     
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
     TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
     bool excludeFromRefresh() const;
     void refresh();
 
  private:
-    TodolistPluginWidget *m_widget;
+    QGuardedPtr<TodolistPluginWidget> m_widget;
 };
 
 #endif