summaryrefslogtreecommitdiff
authorzecke <zecke>2004-01-27 18:56:29 (UTC)
committer zecke <zecke>2004-01-27 18:56:29 (UTC)
commitec32e99fae963a97b527c2c54813a96c284d99cf (patch) (unidiff)
tree6ccfe6c127c8f9a32e1fa6cf6eb5385bd18f9267
parent829b13ec0e4ffb359ab39c16c564719908173ffa (diff)
downloadopie-ec32e99fae963a97b527c2c54813a96c284d99cf.zip
opie-ec32e99fae963a97b527c2c54813a96c284d99cf.tar.gz
opie-ec32e99fae963a97b527c2c54813a96c284d99cf.tar.bz2
Guess what? return QS_FALSE;
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/otaskbarapplet.h2
-rw-r--r--noncore/todayplugins/fortune/fortunepluginimpl.cpp4
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp4
-rw-r--r--noncore/todayplugins/weather/weatherpluginimpl.cpp3
4 files changed, 10 insertions, 3 deletions
diff --git a/libopie2/opieui/otaskbarapplet.h b/libopie2/opieui/otaskbarapplet.h
index 686b91a..773aba4 100644
--- a/libopie2/opieui/otaskbarapplet.h
+++ b/libopie2/opieui/otaskbarapplet.h
@@ -1,129 +1,131 @@
1/* 1/*
2                 This file is part of the Opie Project 2                 This file is part of the Opie Project
3 3
4              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> 4              Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
5 =. 5 =.
6 .=l. 6 .=l.
7           .>+-= 7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can 8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under 9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software 11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License, 12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version. 13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_. 14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that 15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of 17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more 20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details. 21++=   -.     .`     .: details.
22 :     =  ...= . :.=- 22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU 23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with 24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB. 25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation, 26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 28 Boston, MA 02111-1307, USA.
29 29
30*/ 30*/
31 31
32#ifndef OTASKBARAPPLET_H 32#ifndef OTASKBARAPPLET_H
33#define OTASKBARAPPLET_H 33#define OTASKBARAPPLET_H
34 34
35#include <qpe/taskbarappletinterface.h> 35#include <qpe/taskbarappletinterface.h>
36 36
37/*====================================================================================== 37/*======================================================================================
38 * OTaskbarAppletWrapper 38 * OTaskbarAppletWrapper
39 *======================================================================================*/ 39 *======================================================================================*/
40 40
41template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface 41template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
42{ 42{
43 public: 43 public:
44 OTaskbarAppletWrapper():_applet( 0 ), ref( 0 ) 44 OTaskbarAppletWrapper():_applet( 0 ), ref( 0 )
45 { 45 {
46 } 46 }
47 47
48 virtual ~OTaskbarAppletWrapper() 48 virtual ~OTaskbarAppletWrapper()
49 { 49 {
50 delete _applet; 50 delete _applet;
51 } 51 }
52 52
53 QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface ) 53 QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface )
54 { 54 {
55 qDebug( "OTaskbarAppletWrapper::queryInterface()" ); 55 qDebug( "OTaskbarAppletWrapper::queryInterface()" );
56 *iface = 0; 56 *iface = 0;
57 if ( uuid == IID_QUnknown ) 57 if ( uuid == IID_QUnknown )
58 *iface = this; 58 *iface = this;
59 else if ( uuid == IID_TaskbarApplet ) 59 else if ( uuid == IID_TaskbarApplet )
60 *iface = this; 60 *iface = this;
61 else
62 return QS_FALSE;
61 63
62 if ( *iface ) (*iface)->addRef(); 64 if ( *iface ) (*iface)->addRef();
63 return QS_OK; 65 return QS_OK;
64 } 66 }
65 67
66 Q_REFCOUNT 68 Q_REFCOUNT
67 69
68 virtual T* applet( QWidget* parent ) 70 virtual T* applet( QWidget* parent )
69 { 71 {
70 if ( !_applet ) _applet = new T( parent ); 72 if ( !_applet ) _applet = new T( parent );
71 return _applet; 73 return _applet;
72 } 74 }
73 75
74 virtual int position() const 76 virtual int position() const
75 { 77 {
76 return T::position(); 78 return T::position();
77 } 79 }
78 80
79 private: 81 private:
80 T* _applet; 82 T* _applet;
81 ulong ref; 83 ulong ref;
82}; 84};
83 85
84#include <qframe.h> 86#include <qframe.h>
85#include <qwidget.h> 87#include <qwidget.h>
86#include <qpe/qpeapplication.h> 88#include <qpe/qpeapplication.h>
87 89
88class QMouseEvent; 90class QMouseEvent;
89 91
90/*====================================================================================== 92/*======================================================================================
91 * OTaskbarApplet 93 * OTaskbarApplet
92 *======================================================================================*/ 94 *======================================================================================*/
93 95
94// Must be inline until after we shipped Opie 1.0 96// Must be inline until after we shipped Opie 1.0
95 97
96// Having OTaskBarApplet reside in libopieui2 is not possible 98// Having OTaskBarApplet reside in libopieui2 is not possible
97// until we link the launcher binary against libopieui2 - 99// until we link the launcher binary against libopieui2 -
98// otherwise the necessary symbols are not present, when 100// otherwise the necessary symbols are not present, when
99// the dynamic loader [dlopen] tries to resolve an applet which 101// the dynamic loader [dlopen] tries to resolve an applet which
100// inherits OTaskbarApplet 102// inherits OTaskbarApplet
101 103
102class OTaskbarApplet : public QWidget 104class OTaskbarApplet : public QWidget
103{ 105{
104 public: 106 public:
105 OTaskbarApplet( QWidget* parent, const char* name = 0 ):QWidget( parent, name ) 107 OTaskbarApplet( QWidget* parent, const char* name = 0 ):QWidget( parent, name )
106 { 108 {
107 setFixedHeight( 18 ); 109 setFixedHeight( 18 );
108 setFixedWidth( 14 ); 110 setFixedWidth( 14 );
109 } 111 }
110 112
111 virtual ~OTaskbarApplet() 113 virtual ~OTaskbarApplet()
112 { 114 {
113 } 115 }
114 116
115 protected: 117 protected:
116 virtual void popup( QWidget* widget ) 118 virtual void popup( QWidget* widget )
117 { 119 {
118 QPoint curPos = mapToGlobal( QPoint( 0, 0 ) ); 120 QPoint curPos = mapToGlobal( QPoint( 0, 0 ) );
119 int w = widget->sizeHint().width(); 121 int w = widget->sizeHint().width();
120 int x = curPos.x() - (w/2 ); 122 int x = curPos.x() - (w/2 );
121 if ( (x+w) > QPEApplication::desktop()->width() ) 123 if ( (x+w) > QPEApplication::desktop()->width() )
122 x = QPEApplication::desktop()->width()-w; 124 x = QPEApplication::desktop()->width()-w;
123 widget->move( x, curPos.y()-widget->sizeHint().height() ); 125 widget->move( x, curPos.y()-widget->sizeHint().height() );
124 widget->show(); 126 widget->show();
125 } 127 }
126}; 128};
127 129
128#endif 130#endif
129 131
diff --git a/noncore/todayplugins/fortune/fortunepluginimpl.cpp b/noncore/todayplugins/fortune/fortunepluginimpl.cpp
index 466e322..090aaa7 100644
--- a/noncore/todayplugins/fortune/fortunepluginimpl.cpp
+++ b/noncore/todayplugins/fortune/fortunepluginimpl.cpp
@@ -1,49 +1,51 @@
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 delete fortunePlugin;
28} 28}
29 29
30 30
31TodayPluginObject* FortunePluginImpl::guiPart() 31TodayPluginObject* FortunePluginImpl::guiPart()
32{ 32{
33 return fortunePlugin; 33 return fortunePlugin;
34} 34}
35 35
36QRESULT FortunePluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) 36QRESULT FortunePluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface )
37{ 37{
38 *iface = 0; 38 *iface = 0;
39 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { 39 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
40 *iface = this, (*iface)->addRef(); 40 *iface = this, (*iface)->addRef();
41 } 41 }else
42 return QS_FALSE;
43
42 return QS_OK; 44 return QS_OK;
43 45
44} 46}
45 47
46Q_EXPORT_INTERFACE() 48Q_EXPORT_INTERFACE()
47{ 49{
48 Q_CREATE_INSTANCE( FortunePluginImpl ); 50 Q_CREATE_INSTANCE( FortunePluginImpl );
49} 51}
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
index c17781b..ec3e34d 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.cpp
@@ -1,46 +1,48 @@
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 delete stocktickerPlugin;
28} 28}
29 29
30 30
31TodayPluginObject* StockTickerPluginImpl::guiPart() { 31TodayPluginObject* StockTickerPluginImpl::guiPart() {
32 return stocktickerPlugin; 32 return stocktickerPlugin;
33} 33}
34 34
35QRESULT StockTickerPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { 35QRESULT StockTickerPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) {
36 *iface = 0; 36 *iface = 0;
37 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { 37 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) {
38 *iface = this, (*iface)->addRef(); 38 *iface = this, (*iface)->addRef();
39 } 39 }else
40 return QS_FALSE;
41
40 return QS_OK; 42 return QS_OK;
41 43
42} 44}
43 45
44Q_EXPORT_INTERFACE() { 46Q_EXPORT_INTERFACE() {
45 Q_CREATE_INSTANCE( StockTickerPluginImpl ); 47 Q_CREATE_INSTANCE( StockTickerPluginImpl );
46} 48}
diff --git a/noncore/todayplugins/weather/weatherpluginimpl.cpp b/noncore/todayplugins/weather/weatherpluginimpl.cpp
index 1a7c27b..fd32a44 100644
--- a/noncore/todayplugins/weather/weatherpluginimpl.cpp
+++ b/noncore/todayplugins/weather/weatherpluginimpl.cpp
@@ -1,62 +1,63 @@
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 delete weatherPlugin;
40} 40}
41 41
42 42
43TodayPluginObject* WeatherPluginImpl::guiPart() 43TodayPluginObject* WeatherPluginImpl::guiPart()
44{ 44{
45 return weatherPlugin; 45 return weatherPlugin;
46} 46}
47 47
48QRESULT WeatherPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 48QRESULT WeatherPluginImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
49{ 49{
50 *iface = 0; 50 *iface = 0;
51 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) 51 if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )
52 { 52 {
53 *iface = this, (*iface)->addRef(); 53 *iface = this, (*iface)->addRef();
54 } 54 }else
55 return QS_FALSE;
55 56
56 return QS_OK; 57 return QS_OK;
57} 58}
58 59
59Q_EXPORT_INTERFACE() 60Q_EXPORT_INTERFACE()
60{ 61{
61 Q_CREATE_INSTANCE( WeatherPluginImpl ); 62 Q_CREATE_INSTANCE( WeatherPluginImpl );
62} 63}