Diffstat (limited to 'core/pim/today/plugins/datebook') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.h | 1 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.cpp | 7 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookplugin.h | 4 |
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 @@ -20,13 +20,12 @@ #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, 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 @@ -15,17 +15,16 @@ ***************************************************************************/ #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"); } @@ -35,15 +34,13 @@ double DatebookPlugin::versionNumber() const { 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"; } 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 @@ -19,14 +19,12 @@ #include "datebookpluginwidget.h" #include <opie2/oclickablelabel.h> #include <opie2/todayplugininterface.h> -#include <qguardedptr.h> - class DatebookPlugin : public TodayPluginObject { public: DatebookPlugin(); ~DatebookPlugin(); @@ -39,11 +37,11 @@ public: QString appName() const; bool excludeFromRefresh() const; void refresh(); void reinitialize(); private: - QGuardedPtr<DatebookPluginWidget> m_widget; + DatebookPluginWidget *m_widget; }; #endif |