Follow the defined Ownership and have a maybe not needed

sanity check

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
@@ -52,23 +52,25 @@ QString AddressBookPlugin::pixmapNameConfig() const {
 
 TodayConfigWidget* AddressBookPlugin::configWidget( QWidget* wid ) {
     return new AddressBookPluginConfig( wid , "AddressBook" );
 }
 
 QString AddressBookPlugin::appName() const {
     return  "addressbook";
 }
 
 
 bool AddressBookPlugin::excludeFromRefresh() const {
     return false;
 }
 
 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
@@ -21,34 +21,34 @@
 
 #include <opie2/ocontactaccess.h>
 #include <opie2/oclickablelabel.h>
 
 #include <qstring.h>
 #include <qwidget.h>
 #include <qlayout.h>
 
 
 class AddressBookPluginWidget : public QWidget {
     Q_OBJECT
 
 public:
     AddressBookPluginWidget( QWidget *parent,  const char *name );
     ~AddressBookPluginWidget();
 
-    void reinitialize();
 public slots:
+    void reinitialize();
     void refresh( const Opie::OPimContactAccess* db );
 
 protected slots:
     void  startAddressBook();
 
 private:
     Opie::Ui::OClickableLabel* addressLabel;
     QVBoxLayout* layoutTodo;
     Opie::OPimContactAccess * m_contactdb;
 
     Opie::OPimContactAccess::List m_list;
     Opie::OPimContactAccess::List::Iterator m_it;
 
     void readConfig();
     void getAddress();
     int m_maxLinesTask;
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
@@ -10,33 +10,32 @@
  *   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 );
      
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
@@ -5,55 +5,52 @@
  * 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 {
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
@@ -9,41 +9,39 @@
  *                                                                         *
  *   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
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
@@ -9,51 +9,48 @@
  *                                                                         *
  *   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 "mailplugin.h"
 
 MailPlugin::MailPlugin() {
     m_widget = 0l;
 }
 
 MailPlugin::~MailPlugin() {
-    delete (MailPluginWidget*)m_widget;
 }
 
 QString MailPlugin::pluginName() const {
     return QObject::tr( "Mail plugin" );
 }
 
 double MailPlugin::versionNumber() const {
     return 0.6;
 }
 
 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;
 }
 
 
 QString MailPlugin::pixmapNameConfig() const {
     return 0l;
 }
 
 TodayConfigWidget* MailPlugin::configWidget( QWidget* ) {
     return 0l;
 }
 
 QString MailPlugin::appName() const {
     return "opiemail";
 }
 
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
@@ -10,44 +10,39 @@
  *   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 MAIL_PLUGIN_H
 #define MAIL_PLUGIN_H
 
 #include "mailpluginwidget.h"
 
 #include <opie2/todayplugininterface.h>
 #include <opie2/todayconfigwidget.h>
 
-#include <qwidget.h>
-#include <qguardedptr.h>
-
-
-
 
 class MailPlugin : public TodayPluginObject {
 
 public:
     MailPlugin();
     ~MailPlugin();
 
     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<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
@@ -4,55 +4,54 @@
  * 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 "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" );
 }
 
 double TodolistPlugin::versionNumber() const {
     return 0.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 {
     return "todo/TodoList";
 }
 
 TodayConfigWidget* TodolistPlugin::configWidget( QWidget* wid ) {
     return new TodolistPluginConfig( wid , "Todolist" );
 }
 
 QString TodolistPlugin::appName() const {
     return  "todolist";
 }
 
 
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
@@ -33,20 +33,20 @@ 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();
     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
@@ -1,49 +1,47 @@
 /*
  * exampleplugin.cpp
  *
  * email       : harlekin@handhelds.org
  *
  */
 #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" );
 }
 
 double ExamplePlugin::versionNumber() const {
     return 0.1;
 }
 
 // this sets the image that will be shown on the left side of the plugin
 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;
 }
 
 
 // that would be the icon of the config widget in todays config view
 QString ExamplePlugin::pixmapNameConfig() const {
     return 0l;
 }
 
 // No config widget yet, look at the datebook plugin for an example of that
 TodayConfigWidget* ExamplePlugin::configWidget( QWidget* /*parent*/ ) {
     return 0l;
 }
 
 // add the binary name of the app to launch here
 QString ExamplePlugin::appName() const {
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
@@ -1,42 +1,38 @@
 /*
  * exampleplugin.h
  *
  * email       : harlekin@handhelds.org
  *
  */
 
 
 #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"
 
 // implementation of the today plugin interface
 class ExamplePlugin : public TodayPluginObject {
 
 public:
     ExamplePlugin();
     ~ExamplePlugin();
 
     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<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
@@ -43,29 +43,29 @@ QString FortunePlugin::pixmapNameWidget() const
 	return "Fortune";
 }
 
 QWidget* FortunePlugin::widget( QWidget *wid )
 {
 	return new FortunePluginWidget( wid, "Fortune" );
 }
 
 QString FortunePlugin::pixmapNameConfig() const
 {
 	return "Fortune";
 }
 
 TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ )
 {
 //    return new FortunePluginConfig( wid , "Fortune" );
-	return NULL;
+	return 0l;
 }
 
 QString FortunePlugin::appName() const
 {
 	return  "fortune";
 }
 
 
 bool FortunePlugin::excludeFromRefresh() const
 {
 	return false;
 }
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
@@ -7,35 +7,32 @@
  */
 /***************************************************************************
  *                                                                         *
  *   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 FORTUNE_PLUGIN_H
 #define FORTUNE_PLUGIN_H
 
 #include <opie2/oclickablelabel.h>
 #include <opie2/todayplugininterface.h>
 
-#include <qstring.h>
-#include <qwidget.h>
-
 class FortunePlugin : public TodayPluginObject
 {
 
 public:
     FortunePlugin();
     ~FortunePlugin();
 
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget( QWidget * );
     QString pixmapNameConfig() const;
     TodayConfigWidget* configWidget( QWidget * );
     QString appName() const;
     bool excludeFromRefresh() const;
 };