summaryrefslogtreecommitdiff
authorsimon <simon>2002-11-21 12:08:00 (UTC)
committer simon <simon>2002-11-21 12:08:00 (UTC)
commit50058bc62134e4a23da48bb9f797a66fb25b1f91 (patch) (unidiff)
tree59ec820e2ce7ceba4a01c6b3cc95c1013cbd9b58
parent58715bab157ca913a08b7ce26c230bbc0be5f70b (diff)
downloadopie-50058bc62134e4a23da48bb9f797a66fb25b1f91.zip
opie-50058bc62134e4a23da48bb9f797a66fb25b1f91.tar.gz
opie-50058bc62134e4a23da48bb9f797a66fb25b1f91.tar.bz2
- delete the guiPart object in the destructor
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/mail/mailpluginimpl.cpp1
-rw-r--r--core/pim/today/plugins/todolist/todopluginimpl.cpp1
-rw-r--r--noncore/todayplugins/fortune/fortunepluginimpl.cpp1
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp1
-rw-r--r--noncore/todayplugins/weather/weatherpluginimpl.cpp1
5 files changed, 5 insertions, 0 deletions
diff --git a/core/pim/today/plugins/mail/mailpluginimpl.cpp b/core/pim/today/plugins/mail/mailpluginimpl.cpp
index e5a1e05..bd57bc9 100644
--- a/core/pim/today/plugins/mail/mailpluginimpl.cpp
+++ b/core/pim/today/plugins/mail/mailpluginimpl.cpp
@@ -1,45 +1,46 @@
1/* 1/*
2 * mailpluginimpl.cpp 2 * mailpluginimpl.cpp
3 * 3 *
4 * copyright : (c) 2002 by Maximilian Rei� 4 * copyright : (c) 2002 by Maximilian Rei�
5 * email : harlekin@handhelds.org 5 * email : harlekin@handhelds.org
6 * 6 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17 17
18 18
19#include "mailplugin.h" 19#include "mailplugin.h"
20#include "mailpluginimpl.h" 20#include "mailpluginimpl.h"
21 21
22MailPluginImpl::MailPluginImpl() { 22MailPluginImpl::MailPluginImpl() {
23 mailPlugin = new MailPlugin(); 23 mailPlugin = new MailPlugin();
24} 24}
25 25
26MailPluginImpl::~MailPluginImpl() { 26MailPluginImpl::~MailPluginImpl() {
27 delete mailPlugin;
27} 28}
28 29
29 30
30TodayPluginObject* MailPluginImpl::guiPart() { 31TodayPluginObject* MailPluginImpl::guiPart() {
31 return mailPlugin; 32 return mailPlugin;
32} 33}
33 34
34QRESULT MailPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { 35QRESULT MailPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) {
35 *iface = 0; 36 *iface = 0;
36 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { 37 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
37 *iface = this, (*iface)->addRef(); 38 *iface = this, (*iface)->addRef();
38 } 39 }
39 return QS_OK; 40 return QS_OK;
40 41
41} 42}
42 43
43Q_EXPORT_INTERFACE() { 44Q_EXPORT_INTERFACE() {
44 Q_CREATE_INSTANCE( MailPluginImpl ); 45 Q_CREATE_INSTANCE( MailPluginImpl );
45} 46}
diff --git a/core/pim/today/plugins/todolist/todopluginimpl.cpp b/core/pim/today/plugins/todolist/todopluginimpl.cpp
index b1849ff..c64113c 100644
--- a/core/pim/today/plugins/todolist/todopluginimpl.cpp
+++ b/core/pim/today/plugins/todolist/todopluginimpl.cpp
@@ -1,43 +1,44 @@
1/* 1/*
2 * todopluginimpl.cpp 2 * todopluginimpl.cpp
3 * 3 *
4 * copyright : (c) 2002 by Maximilian Rei� 4 * copyright : (c) 2002 by Maximilian Rei�
5 * email : harlekin@handhelds.org 5 * email : harlekin@handhelds.org
6 * 6 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#include "todoplugin.h" 17#include "todoplugin.h"
18#include "todopluginimpl.h" 18#include "todopluginimpl.h"
19 19
20TodolistPluginImpl::TodolistPluginImpl() { 20TodolistPluginImpl::TodolistPluginImpl() {
21 todolistPlugin = new TodolistPlugin(); 21 todolistPlugin = new TodolistPlugin();
22} 22}
23 23
24TodolistPluginImpl::~TodolistPluginImpl() { 24TodolistPluginImpl::~TodolistPluginImpl() {
25 delete todolistPlugin;
25} 26}
26 27
27 28
28TodayPluginObject* TodolistPluginImpl::guiPart() { 29TodayPluginObject* TodolistPluginImpl::guiPart() {
29 return todolistPlugin; 30 return todolistPlugin;
30} 31}
31 32
32QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { 33QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) {
33 *iface = 0; 34 *iface = 0;
34 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { 35 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
35 *iface = this, (*iface)->addRef(); 36 *iface = this, (*iface)->addRef();
36 } 37 }
37 return QS_OK; 38 return QS_OK;
38 39
39} 40}
40 41
41Q_EXPORT_INTERFACE() { 42Q_EXPORT_INTERFACE() {
42 Q_CREATE_INSTANCE( TodolistPluginImpl ); 43 Q_CREATE_INSTANCE( TodolistPluginImpl );
43} 44}
diff --git a/noncore/todayplugins/fortune/fortunepluginimpl.cpp b/noncore/todayplugins/fortune/fortunepluginimpl.cpp
index 4844f74..466e322 100644
--- a/noncore/todayplugins/fortune/fortunepluginimpl.cpp
+++ b/noncore/todayplugins/fortune/fortunepluginimpl.cpp
@@ -1,48 +1,49 @@
1/* 1/*
2 * fortunepluginimpl.cpp 2 * fortunepluginimpl.cpp
3 * 3 *
4 * copyright : (c) 2002 by Chris Larson 4 * copyright : (c) 2002 by Chris Larson
5 * email : kergoth@handhelds.org 5 * email : kergoth@handhelds.org
6 * 6 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#include "fortuneplugin.h" 17#include "fortuneplugin.h"
18#include "fortunepluginimpl.h" 18#include "fortunepluginimpl.h"
19 19
20FortunePluginImpl::FortunePluginImpl() 20FortunePluginImpl::FortunePluginImpl()
21{ 21{
22 fortunePlugin = new FortunePlugin(); 22 fortunePlugin = new FortunePlugin();
23} 23}
24 24
25FortunePluginImpl::~FortunePluginImpl() 25FortunePluginImpl::~FortunePluginImpl()
26{ 26{
27 delete fortunePlugin;
27} 28}
28 29
29 30
30TodayPluginObject* FortunePluginImpl::guiPart() 31TodayPluginObject* FortunePluginImpl::guiPart()
31{ 32{
32 return fortunePlugin; 33 return fortunePlugin;
33} 34}
34 35
35QRESULT FortunePluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) 36QRESULT FortunePluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface )
36{ 37{
37 *iface = 0; 38 *iface = 0;
38 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { 39 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
39 *iface = this, (*iface)->addRef(); 40 *iface = this, (*iface)->addRef();
40 } 41 }
41 return QS_OK; 42 return QS_OK;
42 43
43} 44}
44 45
45Q_EXPORT_INTERFACE() 46Q_EXPORT_INTERFACE()
46{ 47{
47 Q_CREATE_INSTANCE( FortunePluginImpl ); 48 Q_CREATE_INSTANCE( FortunePluginImpl );
48} 49}
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
index 9a640d4..c17781b 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
@@ -1,45 +1,46 @@
1/* 1/*
2 * stocktickerpluginimpl.cpp 2 * stocktickerpluginimpl.cpp
3 * 3 *
4 * copyright : (c) 2002 by L.J. Potter 4 * copyright : (c) 2002 by L.J. Potter
5 * email : llornkcor@handhelds.org 5 * email : llornkcor@handhelds.org
6 * 6 *
7 */ 7 */
8/*************************************************************************** 8/***************************************************************************
9 * * 9 * *
10 * This program is free software; you can redistribute it and/or modify * 10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by * 11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or * 12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17 17
18 18
19#include "stocktickerplugin.h" 19#include "stocktickerplugin.h"
20#include "stocktickerpluginimpl.h" 20#include "stocktickerpluginimpl.h"
21 21
22StockTickerPluginImpl::StockTickerPluginImpl() { 22StockTickerPluginImpl::StockTickerPluginImpl() {
23 stocktickerPlugin = new StockTickerPlugin(); 23 stocktickerPlugin = new StockTickerPlugin();
24} 24}
25 25
26StockTickerPluginImpl::~StockTickerPluginImpl() { 26StockTickerPluginImpl::~StockTickerPluginImpl() {
27 delete stocktickerPlugin;
27} 28}
28 29
29 30
30TodayPluginObject* StockTickerPluginImpl::guiPart() { 31TodayPluginObject* StockTickerPluginImpl::guiPart() {
31 return stocktickerPlugin; 32 return stocktickerPlugin;
32} 33}
33 34
34QRESULT StockTickerPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { 35QRESULT StockTickerPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) {
35 *iface = 0; 36 *iface = 0;
36 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { 37 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
37 *iface = this, (*iface)->addRef(); 38 *iface = this, (*iface)->addRef();
38 } 39 }
39 return QS_OK; 40 return QS_OK;
40 41
41} 42}
42 43
43Q_EXPORT_INTERFACE() { 44Q_EXPORT_INTERFACE() {
44 Q_CREATE_INSTANCE( StockTickerPluginImpl ); 45 Q_CREATE_INSTANCE( StockTickerPluginImpl );
45} 46}
diff --git a/noncore/todayplugins/weather/weatherpluginimpl.cpp b/noncore/todayplugins/weather/weatherpluginimpl.cpp
index b5c7d0a..1a7c27b 100644
--- a/noncore/todayplugins/weather/weatherpluginimpl.cpp
+++ b/noncore/todayplugins/weather/weatherpluginimpl.cpp
@@ -1,61 +1,62 @@
1/* 1/*
2� � � � � � � � This file is part of the OPIE Project 2� � � � � � � � This file is part of the OPIE Project
3 =. 3 =.
4� � � � � � �.=l. Copyright (c) 2002 Dan Williams <williamsdr@acm.org> 4� � � � � � �.=l. Copyright (c) 2002 Dan Williams <williamsdr@acm.org>
5� � � � � �.>+-= 5� � � � � �.>+-=
6�_;:, � � .> � �:=|. This file is free software; you can 6�_;:, � � .> � �:=|. This file is free software; you can
7.> <`_, � > �. � <= redistribute it and/or modify it under 7.> <`_, � > �. � <= redistribute it and/or modify it under
8:`=1 )Y*s>-.-- � : the terms of the GNU General Public 8:`=1 )Y*s>-.-- � : the terms of the GNU General Public
9.="- .-=="i, � � .._ License as published by the Free Software 9.="- .-=="i, � � .._ License as published by the Free Software
10�- . � .-<_> � � .<> Foundation; either version 2 of the License, 10�- . � .-<_> � � .<> Foundation; either version 2 of the License,
11� � �._= =} � � � : or (at your option) any later version. 11� � �._= =} � � � : or (at your option) any later version.
12� � .%`+i> � � � _;_. 12� � .%`+i> � � � _;_.
13� � .i_,=:_. � � �-<s. This file is distributed in the hope that 13� � .i_,=:_. � � �-<s. This file is distributed in the hope that
14� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY; 14� � �+ �. �-:. � � � = it will be useful, but WITHOUT ANY WARRANTY;
15� � : .. � �.:, � � . . . without even the implied warranty of 15� � : .. � �.:, � � . . . without even the implied warranty of
16� � =_ � � � �+ � � =;=|` MERCHANTABILITY or FITNESS FOR A 16� � =_ � � � �+ � � =;=|` MERCHANTABILITY or FITNESS FOR A
17� _.=:. � � � : � �:=>`: PARTICULAR PURPOSE. See the GNU General 17� _.=:. � � � : � �:=>`: PARTICULAR PURPOSE. See the GNU General
18..}^=.= � � � = � � � ; Public License for more details. 18..}^=.= � � � = � � � ; Public License for more details.
19++= � -. � � .` � � .: 19++= � -. � � .` � � .:
20�: � � = �...= . :.=- You should have received a copy of the GNU 20�: � � = �...= . :.=- You should have received a copy of the GNU
21�-. � .:....=;==+<; General Public License along with this file; 21�-. � .:....=;==+<; General Public License along with this file;
22� -_. . . � )=. �= see the file COPYING. If not, write to the 22� -_. . . � )=. �= see the file COPYING. If not, write to the
23� � -- � � � �:-=` Free Software Foundation, Inc., 23� � -- � � � �:-=` Free Software Foundation, Inc.,
24 59 Temple Place - Suite 330, 24 59 Temple Place - Suite 330,
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29#include "weatherplugin.h" 29#include "weatherplugin.h"
30#include "weatherpluginimpl.h" 30#include "weatherpluginimpl.h"
31 31
32WeatherPluginImpl::WeatherPluginImpl() 32WeatherPluginImpl::WeatherPluginImpl()
33{ 33{
34 weatherPlugin = new WeatherPlugin(); 34 weatherPlugin = new WeatherPlugin();
35} 35}
36 36
37WeatherPluginImpl::~WeatherPluginImpl() 37WeatherPluginImpl::~WeatherPluginImpl()
38{ 38{
39 delete weatherPlugin;
39} 40}
40 41
41 42
42TodayPluginObject* WeatherPluginImpl::guiPart() 43TodayPluginObject* WeatherPluginImpl::guiPart()
43{ 44{
44 return weatherPlugin; 45 return weatherPlugin;
45} 46}
46 47
47QRESULT WeatherPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 48QRESULT WeatherPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
48{ 49{
49 *iface = 0; 50 *iface = 0;
50 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) 51 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )
51 { 52 {
52 *iface = this, (*iface)->addRef(); 53 *iface = this, (*iface)->addRef();
53 } 54 }
54 55
55 return QS_OK; 56 return QS_OK;
56} 57}
57 58
58Q_EXPORT_INTERFACE() 59Q_EXPORT_INTERFACE()
59{ 60{
60 Q_CREATE_INSTANCE( WeatherPluginImpl ); 61 Q_CREATE_INSTANCE( WeatherPluginImpl );
61} 62}