13 files changed, 15 insertions, 37 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
@@ -67,3 +67,4 @@ void AddressBookPlugin::refresh()
 {
-    m_abWidget->refresh( NULL );
+    if(m_abWidget)
+        m_abWidget->refresh( 0l );
 }
@@ -72,2 +73,3 @@ void AddressBookPlugin::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
@@ -36,4 +36,4 @@ public:
 
-    void reinitialize();
 public slots:
+    void reinitialize();
     void refresh( const Opie::OPimContactAccess* db );
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
@@ -25,3 +25,2 @@
 class DateBookEvent: public Opie::Ui::OClickableLabel {
-
      Q_OBJECT
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
@@ -24,3 +24,2 @@ DatebookPlugin::DatebookPlugin()  {
 DatebookPlugin::~DatebookPlugin() {
-    delete (DatebookPluginWidget*)m_widget;
 }
@@ -40,5 +39,3 @@ QString DatebookPlugin::pixmapNameWidget() const {
 QWidget* DatebookPlugin::widget( QWidget* wid ) {
-    if(!m_widget) {
         m_widget = new DatebookPluginWidget( wid,  "Datebook" );
-    }
     return m_widget;
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
@@ -24,4 +24,2 @@
 
-#include <qguardedptr.h>
-
 class DatebookPlugin : public TodayPluginObject {
@@ -44,3 +42,3 @@ public:
  private:
-    QGuardedPtr<DatebookPluginWidget> m_widget;
+    DatebookPluginWidget *m_widget;
 };
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
@@ -24,3 +24,2 @@ MailPlugin::MailPlugin() {
 MailPlugin::~MailPlugin() {
-    delete (MailPluginWidget*)m_widget;
 }
@@ -40,5 +39,3 @@ QString MailPlugin::pixmapNameWidget() const {
 QWidget* MailPlugin::widget( QWidget * wid ) {
-    if(!m_widget) {
         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
@@ -25,7 +25,2 @@
 
-#include <qwidget.h>
-#include <qguardedptr.h>
-
-
-
 
@@ -49,3 +44,3 @@ public:
  private:
-   QGuardedPtr<MailPluginWidget> m_widget;
+   MailPluginWidget* m_widget;
 };
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
@@ -19,3 +19,5 @@
 
-TodolistPlugin::TodolistPlugin() {
+TodolistPlugin::TodolistPlugin() 
+    : m_widget(0l)
+{
 }
@@ -23,3 +25,2 @@ TodolistPlugin::TodolistPlugin() {
 TodolistPlugin::~TodolistPlugin() {
-    delete (TodolistPluginWidget*)m_widget;
 }
@@ -39,5 +40,3 @@ QString TodolistPlugin::pixmapNameWidget() const {
 QWidget* TodolistPlugin::widget( QWidget *wid ) {
-       if(!m_widget) {
         m_widget = new TodolistPluginWidget( wid, "Todolist" );
-       }
     return m_widget;
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
@@ -48,3 +48,3 @@ public:
  private:
-    QGuardedPtr<TodolistPluginWidget> m_widget;
+    TodolistPluginWidget* m_widget;
 };
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
@@ -8,4 +8,5 @@
 
-ExamplePlugin::ExamplePlugin() {
-    m_widget = 0l;
+ExamplePlugin::ExamplePlugin() 
+    : m_widget(0l)
+{
 }
@@ -13,3 +14,2 @@ ExamplePlugin::ExamplePlugin() {
 ExamplePlugin::~ExamplePlugin() {
-    delete (ExamplePluginWidget*)m_widget;
 }
@@ -30,5 +30,3 @@ QString ExamplePlugin::pixmapNameWidget() const {
 QWidget* ExamplePlugin::widget( QWidget * wid ) {
-    if(!m_widget) {
         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
@@ -11,5 +11,2 @@
 
-#include <qwidget.h>
-#include <qguardedptr.h>
-
 #include <opie2/todayplugininterface.h>
@@ -36,5 +33,4 @@ public:
     void reinitialize();
-
  private:
-   QGuardedPtr<ExamplePluginWidget> m_widget;
+    ExamplePluginWidget *m_widget;
 };
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
@@ -58,3 +58,3 @@ TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ )
 //    return new FortunePluginConfig( wid , "Fortune" );
-        return NULL;
+        return 0l;
 }
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
@@ -22,5 +22,2 @@
 
-#include <qstring.h>
-#include <qwidget.h>
-
 class FortunePlugin : public TodayPluginObject