summaryrefslogtreecommitdiff
authorzecke <zecke>2003-02-10 22:02:47 (UTC)
committer zecke <zecke>2003-02-10 22:02:47 (UTC)
commit51452f8478edb77ed1eef61adff314c2d239712f (patch) (unidiff)
treebc301c77096a7c681623806f7409755ceaafac39
parenteb9be7ada3de060d8c5ce52590bd91120ed5e1bd (diff)
downloadopie-51452f8478edb77ed1eef61adff314c2d239712f.zip
opie-51452f8478edb77ed1eef61adff314c2d239712f.tar.gz
opie-51452f8478edb77ed1eef61adff314c2d239712f.tar.bz2
make use of QGuardedPtr
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/datebook/datebookplugin.cpp3
-rw-r--r--core/pim/today/plugins/datebook/datebookplugin.h3
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.cpp3
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.h3
4 files changed, 6 insertions, 6 deletions
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp
index 2ac7d01..f095478 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.cpp
+++ b/core/pim/today/plugins/datebook/datebookplugin.cpp
@@ -18,21 +18,20 @@
18 18
19 19
20#include "datebookevent.h" 20#include "datebookevent.h"
21#include "datebookplugin.h" 21#include "datebookplugin.h"
22#include "datebookpluginconfig.h" 22#include "datebookpluginconfig.h"
23 23
24 24
25DatebookPlugin::DatebookPlugin() { 25DatebookPlugin::DatebookPlugin() {
26 m_widget = 0;
27} 26}
28 27
29DatebookPlugin::~DatebookPlugin() { 28DatebookPlugin::~DatebookPlugin() {
30 delete m_widget; 29 delete (DatebookPluginWidget*)m_widget;
31} 30}
32 31
33QString DatebookPlugin::pluginName() const { 32QString DatebookPlugin::pluginName() const {
34 return QObject::tr( "Datebook plugin"); 33 return QObject::tr( "Datebook plugin");
35} 34}
36 35
37double DatebookPlugin::versionNumber() const { 36double DatebookPlugin::versionNumber() const {
38 return 1.0; 37 return 1.0;
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h
index 644a614..eb7a401 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.h
+++ b/core/pim/today/plugins/datebook/datebookplugin.h
@@ -13,16 +13,17 @@
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef DATEBOOK_PLUGIN_H 17#ifndef DATEBOOK_PLUGIN_H
18#define DATEBOOK_PLUGIN_H 18#define DATEBOOK_PLUGIN_H
19 19
20#include <qstring.h> 20#include <qstring.h>
21#include <qguardedptr.h>
21#include <qwidget.h> 22#include <qwidget.h>
22 23
23#include <opie/oclickablelabel.h> 24#include <opie/oclickablelabel.h>
24#include <opie/todayplugininterface.h> 25#include <opie/todayplugininterface.h>
25 26
26#include "datebookpluginwidget.h" 27#include "datebookpluginwidget.h"
27 28
28class DatebookPlugin : public TodayPluginObject { 29class DatebookPlugin : public TodayPluginObject {
@@ -37,13 +38,13 @@ public:
37 QWidget* widget( QWidget *); 38 QWidget* widget( QWidget *);
38 QString pixmapNameConfig() const; 39 QString pixmapNameConfig() const;
39 TodayConfigWidget* configWidget( QWidget *); 40 TodayConfigWidget* configWidget( QWidget *);
40 QString appName() const; 41 QString appName() const;
41 bool excludeFromRefresh() const; 42 bool excludeFromRefresh() const;
42 void refresh(); 43 void refresh();
43 44
44 private: 45 private:
45 DatebookPluginWidget *m_widget; 46 QGuardedPtr<DatebookPluginWidget> m_widget;
46}; 47};
47 48
48 49
49#endif 50#endif
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp
index 1238f92..bff0eba 100644
--- a/core/pim/today/plugins/todolist/todoplugin.cpp
+++ b/core/pim/today/plugins/todolist/todoplugin.cpp
@@ -16,21 +16,20 @@
16 16
17 17
18 18
19#include "todoplugin.h" 19#include "todoplugin.h"
20#include "todopluginconfig.h" 20#include "todopluginconfig.h"
21 21
22 22
23TodolistPlugin::TodolistPlugin() { 23TodolistPlugin::TodolistPlugin() {
24 m_widget = 0l;
25} 24}
26 25
27TodolistPlugin::~TodolistPlugin() { 26TodolistPlugin::~TodolistPlugin() {
28 delete m_widget; 27 delete (TodolistPluginWidget*)m_widget;
29} 28}
30 29
31QString TodolistPlugin::pluginName() const { 30QString TodolistPlugin::pluginName() const {
32 return QObject::tr( "Todolist plugin" ); 31 return QObject::tr( "Todolist plugin" );
33} 32}
34 33
35double TodolistPlugin::versionNumber() const { 34double TodolistPlugin::versionNumber() const {
36 return 0.9; 35 return 0.9;
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h
index 6106d0c..7a2235c 100644
--- a/core/pim/today/plugins/todolist/todoplugin.h
+++ b/core/pim/today/plugins/todolist/todoplugin.h
@@ -13,16 +13,17 @@
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef TODOLIST_PLUGIN_H 17#ifndef TODOLIST_PLUGIN_H
18#define TODOLIST_PLUGIN_H 18#define TODOLIST_PLUGIN_H
19 19
20#include <qstring.h> 20#include <qstring.h>
21#include <qguardedptr.h>
21#include <qwidget.h> 22#include <qwidget.h>
22 23
23#include <opie/tododb.h> 24#include <opie/tododb.h>
24#include <opie/oclickablelabel.h> 25#include <opie/oclickablelabel.h>
25#include <opie/todayplugininterface.h> 26#include <opie/todayplugininterface.h>
26 27
27#include "todopluginwidget.h" 28#include "todopluginwidget.h"
28 29
@@ -38,12 +39,12 @@ public:
38 QWidget* widget(QWidget *); 39 QWidget* widget(QWidget *);
39 QString pixmapNameConfig() const; 40 QString pixmapNameConfig() const;
40 TodayConfigWidget* configWidget(QWidget *); 41 TodayConfigWidget* configWidget(QWidget *);
41 QString appName() const; 42 QString appName() const;
42 bool excludeFromRefresh() const; 43 bool excludeFromRefresh() const;
43 void refresh(); 44 void refresh();
44 45
45 private: 46 private:
46 TodolistPluginWidget *m_widget; 47 QGuardedPtr<TodolistPluginWidget> m_widget;
47}; 48};
48 49
49#endif 50#endif