3 files changed, 3 insertions, 9 deletions

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
@@ -2,49 +2,48 @@
  * datebookplugin.h
  *
  * copyright   : (c) 2002, 2003, 2004 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 DATEBOOKEVENT_PLUGIN_H
 #define DATEBOOKEVENT_PLUGIN_H
 
 #include <opie2/oclickablelabel.h>
 
 #include <qpe/datebookdb.h>
 
 
 class DateBookEvent: public Opie::Ui::OClickableLabel {
-
      Q_OBJECT
 
 public:
      DateBookEvent( const EffectiveEvent &ev,
 		    QWidget* parent = 0,
 		    bool show_location = 0,
 		    bool show_notes = 0,
 		    bool timeExtraLine = 0,
 		    int maxCharClip = 0,
 		    const char* name = 0,
 		    WFlags fl = 0 );
      ~DateBookEvent();
 
  signals:
      void editEvent( const Event &e );
      
 private slots:
     void editEventSlot( const Event &e );
     void editMe();
 
  private:
   
     QString ampmTime( QTime );
     QString differDate( QDate date );
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
@@ -1,67 +1,64 @@
 /*
  * datebookplugin.cpp
  *
  * copyright   : (c) 2002,2003, 2004 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 "datebookplugin.h"
 #include "datebookpluginconfig.h"
 
 
-DatebookPlugin::DatebookPlugin()  {
+DatebookPlugin::DatebookPlugin() {
 }
 
 DatebookPlugin::~DatebookPlugin() {
-    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/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 {
     return "datebook/DateBook";
 }
 
 TodayConfigWidget* DatebookPlugin::configWidget( QWidget* wid ) {
     return new DatebookPluginConfig( wid , "Datebook" );
 }
 
 QString DatebookPlugin::appName()  const {
     return "datebook";
 }
 
 bool DatebookPlugin::excludeFromRefresh() const {
     return false;
 }
 
 void DatebookPlugin::refresh() {
     if ( m_widget )  {
         m_widget->refresh();
     }
 }
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
@@ -1,49 +1,47 @@
 /*
  * datebookplugin.h
  *
  * copyright   : (c) 2002,2003 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 "datebookpluginwidget.h"
 
 #include <opie2/oclickablelabel.h>
 #include <opie2/todayplugininterface.h>
 
-#include <qguardedptr.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();
     void reinitialize();
 
  private:
-    QGuardedPtr<DatebookPluginWidget> m_widget;
+    DatebookPluginWidget *m_widget;
 };
 
 
 #endif