summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/addressbook/addressplugin.cpp6
-rw-r--r--core/pim/today/plugins/addressbook/addresspluginwidget.h2
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.h1
-rw-r--r--core/pim/today/plugins/datebook/datebookplugin.cpp7
-rw-r--r--core/pim/today/plugins/datebook/datebookplugin.h4
-rw-r--r--core/pim/today/plugins/mail/mailplugin.cpp5
-rw-r--r--core/pim/today/plugins/mail/mailplugin.h7
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.cpp9
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.h2
-rw-r--r--examples/todayplugin/exampleplugin.cpp10
-rw-r--r--examples/todayplugin/exampleplugin.h8
-rw-r--r--noncore/todayplugins/fortune/fortuneplugin.cpp2
-rw-r--r--noncore/todayplugins/fortune/fortuneplugin.h3
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
@@ -65,10 +65,12 @@ bool AddressBookPlugin::excludeFromRefresh() const {
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
@@ -34,8 +34,8 @@ public:
AddressBookPluginWidget( QWidget *parent, const char *name );
~AddressBookPluginWidget();
- void reinitialize();
public slots:
+ void reinitialize();
void refresh( const Opie::OPimContactAccess* db );
protected slots:
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
@@ -23,7 +23,6 @@
class DateBookEvent: public Opie::Ui::OClickableLabel {
-
Q_OBJECT
public:
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
@@ -18,11 +18,10 @@
#include "datebookpluginconfig.h"
-DatebookPlugin::DatebookPlugin() {
+DatebookPlugin::DatebookPlugin() {
}
DatebookPlugin::~DatebookPlugin() {
- delete (DatebookPluginWidget*)m_widget;
}
QString DatebookPlugin::pluginName() const {
@@ -38,9 +37,7 @@ QString DatebookPlugin::pixmapNameWidget() const {
}
QWidget* DatebookPlugin::widget( QWidget* wid ) {
- if(!m_widget) {
- m_widget = new DatebookPluginWidget( wid, "Datebook" );
- }
+ 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
@@ -22,8 +22,6 @@
#include <opie2/oclickablelabel.h>
#include <opie2/todayplugininterface.h>
-#include <qguardedptr.h>
-
class DatebookPlugin : public TodayPluginObject {
public:
@@ -42,7 +40,7 @@ public:
void reinitialize();
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
@@ -22,7 +22,6 @@ MailPlugin::MailPlugin() {
}
MailPlugin::~MailPlugin() {
- delete (MailPluginWidget*)m_widget;
}
QString MailPlugin::pluginName() const {
@@ -38,9 +37,7 @@ QString MailPlugin::pixmapNameWidget() const {
}
QWidget* MailPlugin::widget( QWidget * wid ) {
- if(!m_widget) {
- m_widget = new MailPluginWidget( wid, "Datebook" );
- }
+ 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
@@ -23,11 +23,6 @@
#include <opie2/todayplugininterface.h>
#include <opie2/todayconfigwidget.h>
-#include <qwidget.h>
-#include <qguardedptr.h>
-
-
-
class MailPlugin : public TodayPluginObject {
@@ -47,7 +42,7 @@ public:
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
@@ -17,11 +17,12 @@
#include "todoplugin.h"
#include "todopluginconfig.h"
-TodolistPlugin::TodolistPlugin() {
+TodolistPlugin::TodolistPlugin()
+ : m_widget(0l)
+{
}
TodolistPlugin::~TodolistPlugin() {
- delete (TodolistPluginWidget*)m_widget;
}
QString TodolistPlugin::pluginName() const {
@@ -37,9 +38,7 @@ QString TodolistPlugin::pixmapNameWidget() const {
}
QWidget* TodolistPlugin::widget( QWidget *wid ) {
- if(!m_widget) {
- m_widget = new TodolistPluginWidget( wid, "Todolist" );
- }
+ 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
@@ -46,7 +46,7 @@ public:
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
@@ -6,12 +6,12 @@
*/
#include "exampleplugin.h"
-ExamplePlugin::ExamplePlugin() {
- m_widget = 0l;
+ExamplePlugin::ExamplePlugin()
+ : m_widget(0l)
+{
}
ExamplePlugin::~ExamplePlugin() {
- delete (ExamplePluginWidget*)m_widget;
}
QString ExamplePlugin::pluginName() const {
@@ -28,9 +28,7 @@ QString ExamplePlugin::pixmapNameWidget() const {
}
QWidget* ExamplePlugin::widget( QWidget * wid ) {
- if(!m_widget) {
- m_widget = new ExamplePluginWidget( wid, "Example" );
- }
+ 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
@@ -9,9 +9,6 @@
#ifndef EXAMPLE_PLUGIN_H
#define EXAMPLE_PLUGIN_H
-#include <qwidget.h>
-#include <qguardedptr.h>
-
#include <opie2/todayplugininterface.h>
#include <opie2/todayconfigwidget.h>
@@ -34,9 +31,8 @@ public:
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
@@ -56,7 +56,7 @@ QString FortunePlugin::pixmapNameConfig() const
TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ )
{
// return new FortunePluginConfig( wid , "Fortune" );
- return NULL;
+ return 0l;
}
QString FortunePlugin::appName() const
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
@@ -20,9 +20,6 @@
#include <opie2/oclickablelabel.h>
#include <opie2/todayplugininterface.h>
-#include <qstring.h>
-#include <qwidget.h>
-
class FortunePlugin : public TodayPluginObject
{