summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/decorations/flat/flat.cpp4
-rw-r--r--noncore/decorations/flat/flat.h1
-rw-r--r--noncore/decorations/liquid/liquid.cpp4
-rw-r--r--noncore/decorations/liquid/liquid.h2
-rw-r--r--noncore/decorations/polished/polished.cpp4
-rw-r--r--noncore/decorations/polished/polished.h2
-rw-r--r--noncore/styles/flat/flat.cpp2
-rw-r--r--noncore/styles/flat/flat.h1
-rw-r--r--noncore/styles/fresh/fresh.cpp4
-rw-r--r--noncore/styles/fresh/fresh.h1
-rw-r--r--noncore/styles/liquid/plugin.cpp4
-rw-r--r--noncore/styles/liquid/plugin.h1
-rw-r--r--noncore/styles/metal/plugin.cpp4
-rw-r--r--noncore/styles/metal/plugin.h2
-rw-r--r--noncore/styles/theme/plugin.cpp4
-rw-r--r--noncore/styles/theme/plugin.h1
-rw-r--r--noncore/todayplugins/fortune/fortunepluginimpl.h1
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h1
-rw-r--r--noncore/todayplugins/weather/weatherpluginimpl.h1
19 files changed, 22 insertions, 22 deletions
diff --git a/noncore/decorations/flat/flat.cpp b/noncore/decorations/flat/flat.cpp
index b6a81a3..a2f12be 100644
--- a/noncore/decorations/flat/flat.cpp
+++ b/noncore/decorations/flat/flat.cpp
@@ -179,49 +179,49 @@ static const char * maximize_xpm[] = {
179" +++++ +++++ ", 179" +++++ +++++ ",
180" ++++++++++++ ", 180" ++++++++++++ ",
181" ++++++++ ", 181" ++++++++ ",
182" ", 182" ",
183" "}; 183" "};
184 184
185static QImage scaleButton( const QImage &img, int height ) 185static QImage scaleButton( const QImage &img, int height )
186{ 186{
187 if ( img.height() != height ) { 187 if ( img.height() != height ) {
188 return img.smoothScale( img.width()*height/img.height(), height ); 188 return img.smoothScale( img.width()*height/img.height(), height );
189 } else { 189 } else {
190 return img; 190 return img;
191 } 191 }
192} 192}
193 193
194static void colorize( QImage &img, const QColor &c, bool rev ) 194static void colorize( QImage &img, const QColor &c, bool rev )
195{ 195{
196 for ( int i = 0; i < img.numColors(); i++ ) { 196 for ( int i = 0; i < img.numColors(); i++ ) {
197 bool sc = (img.color(i) & 0xff000000); 197 bool sc = (img.color(i) & 0xff000000);
198 if ( rev ) sc = !sc; 198 if ( rev ) sc = !sc;
199 img.setColor(i, sc ? c.rgb() : 0x00000000 ); 199 img.setColor(i, sc ? c.rgb() : 0x00000000 );
200 } 200 }
201} 201}
202 202
203FlatDecoration::FlatDecoration() : ref(0), buttonCache(16) 203FlatDecoration::FlatDecoration() : buttonCache(16)
204{ 204{
205 buttonCache.setAutoDelete(TRUE); 205 buttonCache.setAutoDelete(TRUE);
206} 206}
207 207
208FlatDecoration::~FlatDecoration() 208FlatDecoration::~FlatDecoration()
209{ 209{
210} 210}
211 211
212int FlatDecoration::metric( Metric m, const WindowData *wd ) const 212int FlatDecoration::metric( Metric m, const WindowData *wd ) const
213{ 213{
214 switch ( m ) { 214 switch ( m ) {
215 case TopBorder: 215 case TopBorder:
216 return 1; 216 return 1;
217 break; 217 break;
218 case LeftBorder: 218 case LeftBorder:
219 case RightBorder: 219 case RightBorder:
220 return 2; 220 return 2;
221 case BottomBorder: 221 case BottomBorder:
222 return 4; 222 return 4;
223 case TitleHeight: 223 case TitleHeight:
224 if ( QApplication::desktop()->height() > 320 ) 224 if ( QApplication::desktop()->height() > 320 )
225 return 20; 225 return 20;
226 else 226 else
227 return 18; 227 return 18;
@@ -326,35 +326,37 @@ void FlatDecoration::drawButton( Button b, QPainter *p, const WindowData *wd, in
326} 326}
327 327
328QRegion FlatDecoration::mask( const WindowData *wd ) const 328QRegion FlatDecoration::mask( const WindowData *wd ) const
329{ 329{
330 return WindowDecorationInterface::mask( wd ); 330 return WindowDecorationInterface::mask( wd );
331} 331}
332 332
333QString FlatDecoration::name() const 333QString FlatDecoration::name() const
334{ 334{
335 return qApp->translate( "Decoration", "Flat" ); 335 return qApp->translate( "Decoration", "Flat" );
336} 336}
337 337
338QPixmap FlatDecoration::icon() const 338QPixmap FlatDecoration::icon() const
339{ 339{
340 return QPixmap(); 340 return QPixmap();
341} 341}
342 342
343QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 343QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
344{ 344{
345 *iface = 0; 345 *iface = 0;
346 if ( uuid == IID_QUnknown ) 346 if ( uuid == IID_QUnknown )
347 *iface = this; 347 *iface = this;
348 else if ( uuid == IID_WindowDecoration ) 348 else if ( uuid == IID_WindowDecoration )
349 *iface = this; 349 *iface = this;
350 else
351 return QS_FALSE;
350 352
351 if ( *iface ) 353 if ( *iface )
352 (*iface)->addRef(); 354 (*iface)->addRef();
353 return QS_OK; 355 return QS_OK;
354} 356}
355 357
356Q_EXPORT_INTERFACE() 358Q_EXPORT_INTERFACE()
357{ 359{
358 Q_CREATE_INSTANCE( FlatDecoration ) 360 Q_CREATE_INSTANCE( FlatDecoration )
359} 361}
360 362
diff --git a/noncore/decorations/flat/flat.h b/noncore/decorations/flat/flat.h
index 3d8a18b..96ceb1f 100644
--- a/noncore/decorations/flat/flat.h
+++ b/noncore/decorations/flat/flat.h
@@ -21,29 +21,28 @@
21#ifndef FLAT_H 21#ifndef FLAT_H
22#define FLAT_H 22#define FLAT_H
23 23
24#include <qtopia/windowdecorationinterface.h> 24#include <qtopia/windowdecorationinterface.h>
25#include <qcache.h> 25#include <qcache.h>
26#include <qimage.h> 26#include <qimage.h>
27 27
28class FlatDecoration : public WindowDecorationInterface 28class FlatDecoration : public WindowDecorationInterface
29{ 29{
30public: 30public:
31 FlatDecoration(); 31 FlatDecoration();
32 virtual ~FlatDecoration(); 32 virtual ~FlatDecoration();
33 33
34 virtual int metric( Metric m, const WindowData * ) const; 34 virtual int metric( Metric m, const WindowData * ) const;
35 virtual void drawArea( Area a, QPainter *, const WindowData * ) const; 35 virtual void drawArea( Area a, QPainter *, const WindowData * ) const;
36 virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const; 36 virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const;
37 virtual QRegion mask( const WindowData * ) const; 37 virtual QRegion mask( const WindowData * ) const;
38 virtual QString name() const; 38 virtual QString name() const;
39 virtual QPixmap icon() const; 39 virtual QPixmap icon() const;
40 40
41 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 41 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
42 Q_REFCOUNT 42 Q_REFCOUNT
43 43
44private: 44private:
45 ulong ref;
46 QCache<QImage> buttonCache; 45 QCache<QImage> buttonCache;
47}; 46};
48 47
49#endif 48#endif
diff --git a/noncore/decorations/liquid/liquid.cpp b/noncore/decorations/liquid/liquid.cpp
index 75b1fc9..ef2ac3c 100644
--- a/noncore/decorations/liquid/liquid.cpp
+++ b/noncore/decorations/liquid/liquid.cpp
@@ -1,33 +1,33 @@
1#include "liquid.h" 1#include "liquid.h"
2 2
3#include <qapplication.h> 3#include <qapplication.h>
4#include <qpainter.h> 4#include <qpainter.h>
5#include <qpalette.h> 5#include <qpalette.h>
6#include <qdrawutil.h> 6#include <qdrawutil.h>
7 7
8 8
9LiquidDecoInterface::LiquidDecoInterface ( ) : ref ( 0 ) 9LiquidDecoInterface::LiquidDecoInterface ( )
10{ 10{
11} 11}
12 12
13LiquidDecoInterface::~LiquidDecoInterface ( ) 13LiquidDecoInterface::~LiquidDecoInterface ( )
14{ 14{
15} 15}
16 16
17 17
18 18
19QString LiquidDecoInterface::name ( ) const 19QString LiquidDecoInterface::name ( ) const
20{ 20{
21 return qApp-> translate ( "Decoration", "Liquid" ); 21 return qApp-> translate ( "Decoration", "Liquid" );
22} 22}
23 23
24 24
25QPixmap LiquidDecoInterface::icon ( ) const 25QPixmap LiquidDecoInterface::icon ( ) const
26{ 26{
27 return QPixmap ( ); 27 return QPixmap ( );
28} 28}
29 29
30void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const 30void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const
31{ 31{
32 QRect r = wd-> rect; 32 QRect r = wd-> rect;
33 int th = metric ( TitleHeight, wd ); 33 int th = metric ( TitleHeight, wd );
@@ -101,36 +101,38 @@ void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd )
101 p-> fillRect ( br.left() - 1, tr. top ( ), br. width ( ) + 2, tr. height ( ), fillcol); 101 p-> fillRect ( br.left() - 1, tr. top ( ), br. width ( ) + 2, tr. height ( ), fillcol);
102 102
103 p-> setPen ( shadecol ); 103 p-> setPen ( shadecol );
104 p-> drawText ( br, align, wd-> caption ); 104 p-> drawText ( br, align, wd-> caption );
105 p-> setPen ( textcol ); 105 p-> setPen ( textcol );
106 br. moveBy ( -1, -1 ); 106 br. moveBy ( -1, -1 );
107 p-> drawText ( br, align, wd-> caption ); 107 p-> drawText ( br, align, wd-> caption );
108 break; 108 break;
109 } 109 }
110 default: { 110 default: {
111 WindowDecorationInterface::drawArea ( a, p, wd ); 111 WindowDecorationInterface::drawArea ( a, p, wd );
112 break; 112 break;
113 } 113 }
114 } 114 }
115} 115}
116 116
117QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) 117QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
118{ 118{
119 *iface = 0; 119 *iface = 0;
120 120
121 if ( uuid == IID_QUnknown ) 121 if ( uuid == IID_QUnknown )
122 *iface = this; 122 *iface = this;
123 else if ( uuid == IID_WindowDecoration ) 123 else if ( uuid == IID_WindowDecoration )
124 *iface = this; 124 *iface = this;
125 else
126 return QS_FALSE;
125 127
126 if ( *iface ) 128 if ( *iface )
127 (*iface)-> addRef ( ); 129 (*iface)-> addRef ( );
128 130
129 return QS_OK; 131 return QS_OK;
130} 132}
131 133
132Q_EXPORT_INTERFACE() 134Q_EXPORT_INTERFACE()
133{ 135{
134 Q_CREATE_INSTANCE( LiquidDecoInterface ) 136 Q_CREATE_INSTANCE( LiquidDecoInterface )
135} 137}
136 138
diff --git a/noncore/decorations/liquid/liquid.h b/noncore/decorations/liquid/liquid.h
index ec55132..bbe433e 100644
--- a/noncore/decorations/liquid/liquid.h
+++ b/noncore/decorations/liquid/liquid.h
@@ -1,25 +1,23 @@
1#ifndef __OPIE_LIQUIDDECO_PLUGIN_H__ 1#ifndef __OPIE_LIQUIDDECO_PLUGIN_H__
2#define __OPIE_LIQUIDDECO_PLUGIN_H__ 2#define __OPIE_LIQUIDDECO_PLUGIN_H__
3 3
4#include <qpe/windowdecorationinterface.h> 4#include <qpe/windowdecorationinterface.h>
5 5
6class LiquidSettings; 6class LiquidSettings;
7 7
8class LiquidDecoInterface : public WindowDecorationInterface { 8class LiquidDecoInterface : public WindowDecorationInterface {
9public: 9public:
10 LiquidDecoInterface ( ); 10 LiquidDecoInterface ( );
11 virtual ~LiquidDecoInterface ( ); 11 virtual ~LiquidDecoInterface ( );
12 12
13 QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); 13 QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
14 Q_REFCOUNT 14 Q_REFCOUNT
15 15
16 virtual void drawArea( Area a, QPainter *, const WindowData * ) const; 16 virtual void drawArea( Area a, QPainter *, const WindowData * ) const;
17 17
18 virtual QString name ( ) const; 18 virtual QString name ( ) const;
19 virtual QPixmap icon ( ) const; 19 virtual QPixmap icon ( ) const;
20 20
21private:
22 ulong ref;
23}; 21};
24 22
25#endif 23#endif
diff --git a/noncore/decorations/polished/polished.cpp b/noncore/decorations/polished/polished.cpp
index 30f1a84..43179be 100644
--- a/noncore/decorations/polished/polished.cpp
+++ b/noncore/decorations/polished/polished.cpp
@@ -1,49 +1,49 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "polished.h" 21#include "polished.h"
22#include <qpainter.h> 22#include <qpainter.h>
23#include <qapplication.h> 23#include <qapplication.h>
24 24
25PolishedDecoration::PolishedDecoration() : ref(0) 25PolishedDecoration::PolishedDecoration()
26{ 26{
27} 27}
28 28
29PolishedDecoration::~PolishedDecoration() 29PolishedDecoration::~PolishedDecoration()
30{ 30{
31} 31}
32 32
33int PolishedDecoration::metric( Metric m, const WindowData *wd ) const 33int PolishedDecoration::metric( Metric m, const WindowData *wd ) const
34{ 34{
35 switch ( m ) { 35 switch ( m ) {
36 case TopBorder: 36 case TopBorder:
37 return 1; 37 return 1;
38 break; 38 break;
39 case LeftBorder: 39 case LeftBorder:
40 case RightBorder: 40 case RightBorder:
41 return 2; 41 return 2;
42 case BottomBorder: 42 case BottomBorder:
43 return 6; 43 return 6;
44 case TitleHeight: 44 case TitleHeight:
45 if ( QApplication::desktop()->height() > 320 ) 45 if ( QApplication::desktop()->height() > 320 )
46 return 20; 46 return 20;
47 else 47 else
48 return 18; 48 return 18;
49 default: 49 default:
@@ -137,35 +137,37 @@ void PolishedDecoration::drawBlend( QPainter *p, const QRect &r, const QColor &c
137 int split = r.height()/3; 137 int split = r.height()/3;
138 138
139 for ( int j = 0; j < split; j++ ) { 139 for ( int j = 0; j < split; j++ ) {
140 p->setPen( QColor( h1 + ((h2-h1)*(j+split))/(2*split-1), 140 p->setPen( QColor( h1 + ((h2-h1)*(j+split))/(2*split-1),
141 s1 + ((s2-s1)*(j+split))/(2*split-1), 141 s1 + ((s2-s1)*(j+split))/(2*split-1),
142 v1 + ((v2-v1)*(j+split))/(2*split-1), QColor::Hsv ) ); 142 v1 + ((v2-v1)*(j+split))/(2*split-1), QColor::Hsv ) );
143 p->drawLine( r.x(), r.y()+j, r.right(), r.y()+j ); 143 p->drawLine( r.x(), r.y()+j, r.right(), r.y()+j );
144 } 144 }
145 145
146 for ( int j = 0; j < r.height()-split; j++ ) { 146 for ( int j = 0; j < r.height()-split; j++ ) {
147 p->setPen( QColor( h1 + ((h2-h1)*j)/(r.height()-split-1), 147 p->setPen( QColor( h1 + ((h2-h1)*j)/(r.height()-split-1),
148 s1 + ((s2-s1)*j)/(r.height()-split-1), 148 s1 + ((s2-s1)*j)/(r.height()-split-1),
149 v1 + ((v2-v1)*j)/(r.height()-split-1), QColor::Hsv ) ); 149 v1 + ((v2-v1)*j)/(r.height()-split-1), QColor::Hsv ) );
150 p->drawLine( r.x(), r.bottom()-j, r.right(), r.bottom()-j ); 150 p->drawLine( r.x(), r.bottom()-j, r.right(), r.bottom()-j );
151 } 151 }
152} 152}
153 153
154QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 154QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
155{ 155{
156 *iface = 0; 156 *iface = 0;
157 if ( uuid == IID_QUnknown ) 157 if ( uuid == IID_QUnknown )
158 *iface = this; 158 *iface = this;
159 else if ( uuid == IID_WindowDecoration ) 159 else if ( uuid == IID_WindowDecoration )
160 *iface = this; 160 *iface = this;
161 else
162 return QS_FALSE;
161 163
162 if ( *iface ) 164 if ( *iface )
163 (*iface)->addRef(); 165 (*iface)->addRef();
164 return QS_OK; 166 return QS_OK;
165} 167}
166 168
167Q_EXPORT_INTERFACE() 169Q_EXPORT_INTERFACE()
168{ 170{
169 Q_CREATE_INSTANCE( PolishedDecoration ) 171 Q_CREATE_INSTANCE( PolishedDecoration )
170} 172}
171 173
diff --git a/noncore/decorations/polished/polished.h b/noncore/decorations/polished/polished.h
index e5c19c0..d661427 100644
--- a/noncore/decorations/polished/polished.h
+++ b/noncore/decorations/polished/polished.h
@@ -21,29 +21,27 @@
21#ifndef POLISHED_H 21#ifndef POLISHED_H
22#define POLISHED_H 22#define POLISHED_H
23 23
24#include <qtopia/windowdecorationinterface.h> 24#include <qtopia/windowdecorationinterface.h>
25 25
26class PolishedDecoration : public WindowDecorationInterface 26class PolishedDecoration : public WindowDecorationInterface
27{ 27{
28public: 28public:
29 PolishedDecoration(); 29 PolishedDecoration();
30 virtual ~PolishedDecoration(); 30 virtual ~PolishedDecoration();
31 31
32 virtual int metric( Metric m, const WindowData * ) const; 32 virtual int metric( Metric m, const WindowData * ) const;
33 virtual void drawArea( Area a, QPainter *, const WindowData * ) const; 33 virtual void drawArea( Area a, QPainter *, const WindowData * ) const;
34 virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const; 34 virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const;
35 virtual QRegion mask( const WindowData * ) const; 35 virtual QRegion mask( const WindowData * ) const;
36 virtual QString name() const; 36 virtual QString name() const;
37 virtual QPixmap icon() const; 37 virtual QPixmap icon() const;
38 38
39 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 39 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
40 Q_REFCOUNT 40 Q_REFCOUNT
41 41
42protected: 42protected:
43 void PolishedDecoration::drawBlend( QPainter *, const QRect &r, const QColor &c1, const QColor&c2 ) const; 43 void PolishedDecoration::drawBlend( QPainter *, const QRect &r, const QColor &c1, const QColor&c2 ) const;
44 44
45private:
46 ulong ref;
47}; 45};
48 46
49#endif 47#endif
diff --git a/noncore/styles/flat/flat.cpp b/noncore/styles/flat/flat.cpp
index 24366f6..f3bacf9 100644
--- a/noncore/styles/flat/flat.cpp
+++ b/noncore/styles/flat/flat.cpp
@@ -1037,49 +1037,49 @@ void FlatStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
1037 white, white, 1037 white, white,
1038 dis ? discol : white, 1038 dis ? discol : white,
1039 discol, white ); 1039 discol, white );
1040 drawArrow( p, RightArrow, FALSE, 1040 drawArrow( p, RightArrow, FALSE,
1041 x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, 1041 x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2,
1042 dim, dim, g2, TRUE ); 1042 dim, dim, g2, TRUE );
1043 } else { 1043 } else {
1044 drawArrow( p, RightArrow, 1044 drawArrow( p, RightArrow,
1045 FALSE, 1045 FALSE,
1046 x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, 1046 x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2,
1047 dim, dim, g, mi->isEnabled() ); 1047 dim, dim, g, mi->isEnabled() );
1048 } 1048 }
1049 } 1049 }
1050#endif 1050#endif
1051} 1051}
1052 1052
1053void FlatStyle::getButtonShift( int &x, int &y ) 1053void FlatStyle::getButtonShift( int &x, int &y )
1054{ 1054{
1055 x = 0; y = 0; 1055 x = 0; y = 0;
1056} 1056}
1057 1057
1058//=========================================================================== 1058//===========================================================================
1059 1059
1060FlatStyleImpl::FlatStyleImpl() 1060FlatStyleImpl::FlatStyleImpl()
1061 : flat(0), ref(0) 1061 : flat(0)
1062{ 1062{
1063} 1063}
1064 1064
1065FlatStyleImpl::~FlatStyleImpl() 1065FlatStyleImpl::~FlatStyleImpl()
1066{ 1066{
1067 // We do not delete the style because Qt does that when a new style 1067 // We do not delete the style because Qt does that when a new style
1068 // is set. 1068 // is set.
1069} 1069}
1070 1070
1071QStyle *FlatStyleImpl::style() 1071QStyle *FlatStyleImpl::style()
1072{ 1072{
1073 if ( !flat ) 1073 if ( !flat )
1074 flat = new FlatStyle(); 1074 flat = new FlatStyle();
1075 return flat; 1075 return flat;
1076} 1076}
1077 1077
1078QString FlatStyleImpl::name() const 1078QString FlatStyleImpl::name() const
1079{ 1079{
1080 return qApp->translate("FlatStyle", "Flat", "Name of the style Flat"); 1080 return qApp->translate("FlatStyle", "Flat", "Name of the style Flat");
1081} 1081}
1082 1082
1083QRESULT FlatStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 1083QRESULT FlatStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
1084{ 1084{
1085 *iface = 0; 1085 *iface = 0;
diff --git a/noncore/styles/flat/flat.h b/noncore/styles/flat/flat.h
index ebea95b..4591852 100644
--- a/noncore/styles/flat/flat.h
+++ b/noncore/styles/flat/flat.h
@@ -91,28 +91,27 @@ private:
91 bool fillBtnBorder; 91 bool fillBtnBorder;
92 QColor btnBg; 92 QColor btnBg;
93 // Disabled copy constructor and operator= 93 // Disabled copy constructor and operator=
94#if defined(Q_DISABLE_COPY) 94#if defined(Q_DISABLE_COPY)
95 FlatStyle( const FlatStyle & ); 95 FlatStyle( const FlatStyle & );
96 FlatStyle& operator=( const FlatStyle & ); 96 FlatStyle& operator=( const FlatStyle & );
97#endif 97#endif
98}; 98};
99 99
100 100
101class FlatStyleImpl : public StyleInterface 101class FlatStyleImpl : public StyleInterface
102{ 102{
103public: 103public:
104 FlatStyleImpl(); 104 FlatStyleImpl();
105 virtual ~FlatStyleImpl(); 105 virtual ~FlatStyleImpl();
106 106
107 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 107 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
108 Q_REFCOUNT 108 Q_REFCOUNT
109 109
110 virtual QStyle *style(); 110 virtual QStyle *style();
111 virtual QString name() const; 111 virtual QString name() const;
112 112
113private: 113private:
114 FlatStyle *flat; 114 FlatStyle *flat;
115 ulong ref;
116}; 115};
117 116
118#endif // FLATSTYLE_H 117#endif // FLATSTYLE_H
diff --git a/noncore/styles/fresh/fresh.cpp b/noncore/styles/fresh/fresh.cpp
index 0730329..831b620 100644
--- a/noncore/styles/fresh/fresh.cpp
+++ b/noncore/styles/fresh/fresh.cpp
@@ -783,64 +783,66 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
783 int dim = (h-2*motifItemFrame) / 2; 783 int dim = (h-2*motifItemFrame) / 2;
784 if ( act ) { 784 if ( act ) {
785 if ( !dis ) 785 if ( !dis )
786 discol = white; 786 discol = white;
787 QColorGroup g2( discol, g.highlight(), 787 QColorGroup g2( discol, g.highlight(),
788 white, white, 788 white, white,
789 dis ? discol : white, 789 dis ? discol : white,
790 discol, white ); 790 discol, white );
791 drawArrow( p, RightArrow, FALSE, 791 drawArrow( p, RightArrow, FALSE,
792 x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, 792 x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2,
793 dim, dim, g2, TRUE ); 793 dim, dim, g2, TRUE );
794 } else { 794 } else {
795 drawArrow( p, RightArrow, 795 drawArrow( p, RightArrow,
796 FALSE, 796 FALSE,
797 x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, 797 x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2,
798 dim, dim, g, mi->isEnabled() ); 798 dim, dim, g, mi->isEnabled() );
799 } 799 }
800 } 800 }
801#endif 801#endif
802} 802}
803 803
804//=========================================================================== 804//===========================================================================
805 805
806FreshStyleImpl::FreshStyleImpl() 806FreshStyleImpl::FreshStyleImpl()
807 : fresh(0), ref(0) 807 : fresh(0)
808{ 808{
809} 809}
810 810
811FreshStyleImpl::~FreshStyleImpl() 811FreshStyleImpl::~FreshStyleImpl()
812{ 812{
813 // We do not delete the style because Qt does that when a new style 813 // We do not delete the style because Qt does that when a new style
814 // is set. 814 // is set.
815} 815}
816 816
817QStyle *FreshStyleImpl::style() 817QStyle *FreshStyleImpl::style()
818{ 818{
819 if ( !fresh ) 819 if ( !fresh )
820 fresh = new FreshStyle(); 820 fresh = new FreshStyle();
821 return fresh; 821 return fresh;
822} 822}
823 823
824QString FreshStyleImpl::name() const 824QString FreshStyleImpl::name() const
825{ 825{
826 return QString("Fresh"); 826 return QString("Fresh");
827} 827}
828 828
829QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 829QRESULT FreshStyleImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
830{ 830{
831 *iface = 0; 831 *iface = 0;
832 if ( uuid == IID_QUnknown ) 832 if ( uuid == IID_QUnknown )
833 *iface = this; 833 *iface = this;
834 else if ( uuid == IID_Style ) 834 else if ( uuid == IID_Style )
835 *iface = this; 835 *iface = this;
836 else
837 return QS_FALSE;
836 838
837 if ( *iface ) 839 if ( *iface )
838 (*iface)->addRef(); 840 (*iface)->addRef();
839 return QS_OK; 841 return QS_OK;
840} 842}
841 843
842Q_EXPORT_INTERFACE() 844Q_EXPORT_INTERFACE()
843{ 845{
844 Q_CREATE_INSTANCE( FreshStyleImpl ) 846 Q_CREATE_INSTANCE( FreshStyleImpl )
845} 847}
846 848
diff --git a/noncore/styles/fresh/fresh.h b/noncore/styles/fresh/fresh.h
index b4be7f3..a72a83f 100644
--- a/noncore/styles/fresh/fresh.h
+++ b/noncore/styles/fresh/fresh.h
@@ -73,28 +73,27 @@ public:
73 QSize scrollBarExtent() const; 73 QSize scrollBarExtent() const;
74 74
75 private:// Disabled copy constructor and operator= 75 private:// Disabled copy constructor and operator=
76#if defined(Q_DISABLE_COPY) 76#if defined(Q_DISABLE_COPY)
77 FreshStyle( const FreshStyle & ); 77 FreshStyle( const FreshStyle & );
78 FreshStyle& operator=( const FreshStyle & ); 78 FreshStyle& operator=( const FreshStyle & );
79#endif 79#endif
80}; 80};
81 81
82 82
83class FreshStyleImpl : public StyleInterface 83class FreshStyleImpl : public StyleInterface
84{ 84{
85public: 85public:
86 FreshStyleImpl(); 86 FreshStyleImpl();
87 virtual ~FreshStyleImpl(); 87 virtual ~FreshStyleImpl();
88 88
89 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 89 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
90 Q_REFCOUNT 90 Q_REFCOUNT
91 91
92 virtual QStyle *style(); 92 virtual QStyle *style();
93 virtual QString name() const; 93 virtual QString name() const;
94 94
95private: 95private:
96 FreshStyle *fresh; 96 FreshStyle *fresh;
97 ulong ref;
98}; 97};
99 98
100#endif // FRESHSTYLE_H 99#endif // FRESHSTYLE_H
diff --git a/noncore/styles/liquid/plugin.cpp b/noncore/styles/liquid/plugin.cpp
index 6813fc5..fb322a9 100644
--- a/noncore/styles/liquid/plugin.cpp
+++ b/noncore/styles/liquid/plugin.cpp
@@ -1,33 +1,33 @@
1#include <qapplication.h> 1#include <qapplication.h>
2 2
3#include "liquid.h" 3#include "liquid.h"
4#include "liquidset.h" 4#include "liquidset.h"
5#include "plugin.h" 5#include "plugin.h"
6 6
7 7
8 8
9LiquidInterface::LiquidInterface ( ) : ref ( 0 ) 9LiquidInterface::LiquidInterface ( )
10{ 10{
11 m_widget = 0; 11 m_widget = 0;
12} 12}
13 13
14LiquidInterface::~LiquidInterface ( ) 14LiquidInterface::~LiquidInterface ( )
15{ 15{
16} 16}
17 17
18QStyle *LiquidInterface::style ( ) 18QStyle *LiquidInterface::style ( )
19{ 19{
20 return new LiquidStyle ( ); 20 return new LiquidStyle ( );
21} 21}
22 22
23QString LiquidInterface::name ( ) const 23QString LiquidInterface::name ( ) const
24{ 24{
25 return qApp-> translate ( "Styles", "Liquid" ); 25 return qApp-> translate ( "Styles", "Liquid" );
26} 26}
27 27
28QString LiquidInterface::description ( ) const 28QString LiquidInterface::description ( ) const
29{ 29{
30 return qApp-> translate ( "Styles", "High Performance Liquid style by Mosfet" ); 30 return qApp-> translate ( "Styles", "High Performance Liquid style by Mosfet" );
31} 31}
32 32
33bool LiquidInterface::hasSettings ( ) const 33bool LiquidInterface::hasSettings ( ) const
@@ -44,36 +44,38 @@ QWidget *LiquidInterface::create ( QWidget *parent, const char *name )
44 44
45bool LiquidInterface::accept ( ) 45bool LiquidInterface::accept ( )
46{ 46{
47 if ( !m_widget ) 47 if ( !m_widget )
48 return false; 48 return false;
49 49
50 return m_widget-> writeConfig ( ); 50 return m_widget-> writeConfig ( );
51} 51}
52 52
53void LiquidInterface::reject ( ) 53void LiquidInterface::reject ( )
54{ 54{
55} 55}
56 56
57 57
58QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) 58QRESULT LiquidInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
59{ 59{
60 *iface = 0; 60 *iface = 0;
61 61
62 if ( uuid == IID_QUnknown ) 62 if ( uuid == IID_QUnknown )
63 *iface = this; 63 *iface = this;
64 else if ( uuid == IID_Style ) 64 else if ( uuid == IID_Style )
65 *iface = this; 65 *iface = this;
66 else if ( uuid == IID_StyleExtended ) 66 else if ( uuid == IID_StyleExtended )
67 *iface = this; 67 *iface = this;
68 else
69 return QS_FALSE;
68 70
69 if ( *iface ) 71 if ( *iface )
70 (*iface)-> addRef ( ); 72 (*iface)-> addRef ( );
71 73
72 return QS_OK; 74 return QS_OK;
73} 75}
74 76
75Q_EXPORT_INTERFACE() 77Q_EXPORT_INTERFACE()
76{ 78{
77 Q_CREATE_INSTANCE( LiquidInterface ) 79 Q_CREATE_INSTANCE( LiquidInterface )
78} 80}
79 81
diff --git a/noncore/styles/liquid/plugin.h b/noncore/styles/liquid/plugin.h
index 6a9b7ac..9188a09 100644
--- a/noncore/styles/liquid/plugin.h
+++ b/noncore/styles/liquid/plugin.h
@@ -7,28 +7,27 @@ class LiquidSettings;
7 7
8class LiquidInterface : public StyleExtendedInterface { 8class LiquidInterface : public StyleExtendedInterface {
9public: 9public:
10 LiquidInterface ( ); 10 LiquidInterface ( );
11 virtual ~LiquidInterface ( ); 11 virtual ~LiquidInterface ( );
12 12
13 QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); 13 QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
14 Q_REFCOUNT 14 Q_REFCOUNT
15 15
16 virtual QStyle *style ( ); 16 virtual QStyle *style ( );
17 17
18 virtual QString name ( ) const; 18 virtual QString name ( ) const;
19 19
20 virtual QString description ( ) const; 20 virtual QString description ( ) const;
21 21
22 virtual bool hasSettings ( ) const; 22 virtual bool hasSettings ( ) const;
23 23
24 virtual QWidget *create ( QWidget *parent, const char *name = 0 ); 24 virtual QWidget *create ( QWidget *parent, const char *name = 0 );
25 25
26 virtual bool accept ( ); 26 virtual bool accept ( );
27 virtual void reject ( ); 27 virtual void reject ( );
28 28
29private: 29private:
30 LiquidSettings *m_widget; 30 LiquidSettings *m_widget;
31 ulong ref;
32}; 31};
33 32
34#endif 33#endif
diff --git a/noncore/styles/metal/plugin.cpp b/noncore/styles/metal/plugin.cpp
index 4c9f64d..2f0f530 100644
--- a/noncore/styles/metal/plugin.cpp
+++ b/noncore/styles/metal/plugin.cpp
@@ -1,45 +1,47 @@
1#include <qapplication.h> 1#include <qapplication.h>
2 2
3#include "metal.h" 3#include "metal.h"
4#include "plugin.h" 4#include "plugin.h"
5 5
6 6
7MetalInterface::MetalInterface ( ) : ref ( 0 ) 7MetalInterface::MetalInterface ( )
8{ 8{
9} 9}
10 10
11MetalInterface::~MetalInterface ( ) 11MetalInterface::~MetalInterface ( )
12{ 12{
13} 13}
14 14
15QStyle *MetalInterface::style ( ) 15QStyle *MetalInterface::style ( )
16{ 16{
17 return new MetalStyle ( ); 17 return new MetalStyle ( );
18} 18}
19 19
20QString MetalInterface::name ( ) const 20QString MetalInterface::name ( ) const
21{ 21{
22 return qApp-> translate ( "Styles", "Metal" ); 22 return qApp-> translate ( "Styles", "Metal" );
23} 23}
24 24
25 25
26QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) 26QRESULT MetalInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
27{ 27{
28 *iface = 0; 28 *iface = 0;
29 29
30 if ( uuid == IID_QUnknown ) 30 if ( uuid == IID_QUnknown )
31 *iface = this; 31 *iface = this;
32 else if ( uuid == IID_Style ) 32 else if ( uuid == IID_Style )
33 *iface = this; 33 *iface = this;
34 else
35 return QS_FALSE;
34 36
35 if ( *iface ) 37 if ( *iface )
36 (*iface)-> addRef ( ); 38 (*iface)-> addRef ( );
37 39
38 return QS_OK; 40 return QS_OK;
39} 41}
40 42
41Q_EXPORT_INTERFACE() 43Q_EXPORT_INTERFACE()
42{ 44{
43 Q_CREATE_INSTANCE( MetalInterface ) 45 Q_CREATE_INSTANCE( MetalInterface )
44} 46}
45 47
diff --git a/noncore/styles/metal/plugin.h b/noncore/styles/metal/plugin.h
index 545aea9..7a38d62 100644
--- a/noncore/styles/metal/plugin.h
+++ b/noncore/styles/metal/plugin.h
@@ -1,22 +1,20 @@
1#ifndef __OPIE_METAL_PLUGIN_H__ 1#ifndef __OPIE_METAL_PLUGIN_H__
2#define __OPIE_METAL_PLUGIN_H__ 2#define __OPIE_METAL_PLUGIN_H__
3 3
4#include <qpe/styleinterface.h> 4#include <qpe/styleinterface.h>
5 5
6 6
7class MetalInterface : public StyleInterface { 7class MetalInterface : public StyleInterface {
8public: 8public:
9 MetalInterface ( ); 9 MetalInterface ( );
10 virtual ~MetalInterface ( ); 10 virtual ~MetalInterface ( );
11 11
12 QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); 12 QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
13 Q_REFCOUNT 13 Q_REFCOUNT
14 14
15 virtual QStyle *style ( ); 15 virtual QStyle *style ( );
16 virtual QString name ( ) const; 16 virtual QString name ( ) const;
17 17
18private:
19 ulong ref;
20}; 18};
21 19
22#endif 20#endif
diff --git a/noncore/styles/theme/plugin.cpp b/noncore/styles/theme/plugin.cpp
index 2560720..dca8685 100644
--- a/noncore/styles/theme/plugin.cpp
+++ b/noncore/styles/theme/plugin.cpp
@@ -1,33 +1,33 @@
1#include <qapplication.h> 1#include <qapplication.h>
2 2
3#include "othemestyle.h" 3#include "othemestyle.h"
4#include "themeset.h" 4#include "themeset.h"
5#include "plugin.h" 5#include "plugin.h"
6 6
7 7
8 8
9ThemeInterface::ThemeInterface ( ) : ref ( 0 ) 9ThemeInterface::ThemeInterface ( )
10{ 10{
11 m_widget = 0; 11 m_widget = 0;
12} 12}
13 13
14ThemeInterface::~ThemeInterface ( ) 14ThemeInterface::~ThemeInterface ( )
15{ 15{
16} 16}
17 17
18QStyle *ThemeInterface::style ( ) 18QStyle *ThemeInterface::style ( )
19{ 19{
20 return new OThemeStyle ( "" ); 20 return new OThemeStyle ( "" );
21} 21}
22 22
23QString ThemeInterface::name ( ) const 23QString ThemeInterface::name ( ) const
24{ 24{
25 return qApp-> translate ( "Styles", "Themed style" ); 25 return qApp-> translate ( "Styles", "Themed style" );
26} 26}
27 27
28QString ThemeInterface::description ( ) const 28QString ThemeInterface::description ( ) const
29{ 29{
30 return qApp-> translate ( "Styles", "KDE2 theme compatible style engine" ); 30 return qApp-> translate ( "Styles", "KDE2 theme compatible style engine" );
31} 31}
32 32
33bool ThemeInterface::hasSettings ( ) const 33bool ThemeInterface::hasSettings ( ) const
@@ -44,38 +44,40 @@ QWidget *ThemeInterface::create ( QWidget *parent, const char *name )
44 44
45bool ThemeInterface::accept ( ) 45bool ThemeInterface::accept ( )
46{ 46{
47 if ( !m_widget ) 47 if ( !m_widget )
48 return false; 48 return false;
49 49
50 return m_widget-> writeConfig ( ); 50 return m_widget-> writeConfig ( );
51} 51}
52 52
53void ThemeInterface::reject ( ) 53void ThemeInterface::reject ( )
54{ 54{
55} 55}
56 56
57 57
58QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) 58QRESULT ThemeInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
59{ 59{
60 *iface = 0; 60 *iface = 0;
61 61
62 if ( uuid == IID_QUnknown ) 62 if ( uuid == IID_QUnknown )
63 *iface = this; 63 *iface = this;
64 else if ( uuid == IID_Style ) 64 else if ( uuid == IID_Style )
65 *iface = this; 65 *iface = this;
66 else if ( uuid == IID_StyleExtended ) 66 else if ( uuid == IID_StyleExtended )
67 *iface = this; 67 *iface = this;
68 else
69 return QS_FALSE;
68 70
69 if ( *iface ) 71 if ( *iface )
70 (*iface)-> addRef ( ); 72 (*iface)-> addRef ( );
71 73
72 return QS_OK; 74 return QS_OK;
73} 75}
74 76
75Q_EXPORT_INTERFACE() 77Q_EXPORT_INTERFACE()
76{ 78{
77 Q_CREATE_INSTANCE( ThemeInterface ) 79 Q_CREATE_INSTANCE( ThemeInterface )
78} 80}
79 81
80 82
81 83
diff --git a/noncore/styles/theme/plugin.h b/noncore/styles/theme/plugin.h
index 60cae97..c67f1e4 100644
--- a/noncore/styles/theme/plugin.h
+++ b/noncore/styles/theme/plugin.h
@@ -6,28 +6,27 @@
6class ThemeSettings; 6class ThemeSettings;
7 7
8class ThemeInterface : public StyleExtendedInterface { 8class ThemeInterface : public StyleExtendedInterface {
9public: 9public:
10 ThemeInterface ( ); 10 ThemeInterface ( );
11 virtual ~ThemeInterface ( ); 11 virtual ~ThemeInterface ( );
12 12
13 QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); 13 QRESULT queryInterface ( const QUuid &, QUnknownInterface ** );
14 Q_REFCOUNT 14 Q_REFCOUNT
15 15
16 virtual QStyle *style ( ); 16 virtual QStyle *style ( );
17 virtual QString name ( ) const; 17 virtual QString name ( ) const;
18 18
19 virtual QString description ( ) const; 19 virtual QString description ( ) const;
20 20
21 virtual bool hasSettings ( ) const; 21 virtual bool hasSettings ( ) const;
22 22
23 virtual QWidget *create ( QWidget *parent, const char *name = 0 ); 23 virtual QWidget *create ( QWidget *parent, const char *name = 0 );
24 24
25 virtual bool accept ( ); 25 virtual bool accept ( );
26 virtual void reject ( ); 26 virtual void reject ( );
27 27
28private: 28private:
29 ThemeSettings *m_widget; 29 ThemeSettings *m_widget;
30 ulong ref;
31}; 30};
32 31
33#endif 32#endif
diff --git a/noncore/todayplugins/fortune/fortunepluginimpl.h b/noncore/todayplugins/fortune/fortunepluginimpl.h
index 070f03e..8e380f5 100644
--- a/noncore/todayplugins/fortune/fortunepluginimpl.h
+++ b/noncore/todayplugins/fortune/fortunepluginimpl.h
@@ -14,28 +14,27 @@
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef FORTUNE_PLUGIN_IMPL_H 17#ifndef FORTUNE_PLUGIN_IMPL_H
18#define FORTUNE_PLUGIN_IMPL_H 18#define FORTUNE_PLUGIN_IMPL_H
19 19
20#include <opie/todayplugininterface.h> 20#include <opie/todayplugininterface.h>
21 21
22class FortunePlugin; 22class FortunePlugin;
23 23
24class FortunePluginImpl : public TodayPluginInterface 24class FortunePluginImpl : public TodayPluginInterface
25{ 25{
26 26
27public: 27public:
28 FortunePluginImpl(); 28 FortunePluginImpl();
29 virtual ~FortunePluginImpl(); 29 virtual ~FortunePluginImpl();
30 30
31 QRESULT queryInterface( const QUuid &, QUnknownInterface** ); 31 QRESULT queryInterface( const QUuid &, QUnknownInterface** );
32 Q_REFCOUNT 32 Q_REFCOUNT
33 33
34 virtual TodayPluginObject *guiPart(); 34 virtual TodayPluginObject *guiPart();
35 35
36private: 36private:
37 FortunePlugin *fortunePlugin; 37 FortunePlugin *fortunePlugin;
38 ulong ref;
39}; 38};
40 39
41#endif 40#endif
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h
index 300c545..db5b8f9 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginimpl.h
@@ -13,28 +13,27 @@
13 * (at your option) any later version. * 13 * (at your option) any later version. *
14 * * 14 * *
15 ***************************************************************************/ 15 ***************************************************************************/
16 16
17#ifndef STOCKTICKER_PLUGIN_IMPL_H 17#ifndef STOCKTICKER_PLUGIN_IMPL_H
18#define STOCKTICKER_PLUGIN_IMPL_H 18#define STOCKTICKER_PLUGIN_IMPL_H
19 19
20#include <opie/todayplugininterface.h> 20#include <opie/todayplugininterface.h>
21 21
22class StockTickerPlugin; 22class StockTickerPlugin;
23 23
24class StockTickerPluginImpl : public TodayPluginInterface{ 24class StockTickerPluginImpl : public TodayPluginInterface{
25 25
26public: 26public:
27 StockTickerPluginImpl(); 27 StockTickerPluginImpl();
28 virtual ~StockTickerPluginImpl(); 28 virtual ~StockTickerPluginImpl();
29 29
30 QRESULT queryInterface( const QUuid &, QUnknownInterface** ); 30 QRESULT queryInterface( const QUuid &, QUnknownInterface** );
31 Q_REFCOUNT 31 Q_REFCOUNT
32 32
33 virtual TodayPluginObject *guiPart(); 33 virtual TodayPluginObject *guiPart();
34 34
35private: 35private:
36 StockTickerPlugin *stocktickerPlugin; 36 StockTickerPlugin *stocktickerPlugin;
37 ulong ref;
38}; 37};
39 38
40#endif 39#endif
diff --git a/noncore/todayplugins/weather/weatherpluginimpl.h b/noncore/todayplugins/weather/weatherpluginimpl.h
index aad8958..eaaae1d 100644
--- a/noncore/todayplugins/weather/weatherpluginimpl.h
+++ b/noncore/todayplugins/weather/weatherpluginimpl.h
@@ -25,28 +25,27 @@
25 Boston, MA 02111-1307, USA. 25 Boston, MA 02111-1307, USA.
26 26
27*/ 27*/
28 28
29#ifndef WEATHER_PLUGIN_IMPL_H 29#ifndef WEATHER_PLUGIN_IMPL_H
30#define WEATHER_PLUGIN_IMPL_H 30#define WEATHER_PLUGIN_IMPL_H
31 31
32#include <opie/todayplugininterface.h> 32#include <opie/todayplugininterface.h>
33 33
34class WeatherPlugin; 34class WeatherPlugin;
35 35
36class WeatherPluginImpl : public TodayPluginInterface 36class WeatherPluginImpl : public TodayPluginInterface
37{ 37{
38 public: 38 public:
39 WeatherPluginImpl(); 39 WeatherPluginImpl();
40 virtual ~WeatherPluginImpl(); 40 virtual ~WeatherPluginImpl();
41 41
42 QRESULT queryInterface( const QUuid &, QUnknownInterface ** ); 42 QRESULT queryInterface( const QUuid &, QUnknownInterface ** );
43 Q_REFCOUNT 43 Q_REFCOUNT
44 44
45 virtual TodayPluginObject *guiPart(); 45 virtual TodayPluginObject *guiPart();
46 46
47 private: 47 private:
48 WeatherPlugin *weatherPlugin; 48 WeatherPlugin *weatherPlugin;
49 ulong ref;
50}; 49};
51 50
52#endif 51#endif