author | zecke <zecke> | 2004-02-05 17:42:00 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-05 17:42:00 (UTC) |
commit | c79bbb6696edf7539ebeda64092f3f91f65ba500 (patch) (side-by-side diff) | |
tree | cb05c94b563d42bb27628d398dbb28beebdee46d /noncore/decorations | |
parent | 4ce8201e80a0b60a8e5d9d875bf00602303d6a0b (diff) | |
download | opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.zip opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.tar.gz opie-c79bbb6696edf7539ebeda64092f3f91f65ba500.tar.bz2 |
Janitor: remove ulong ref
-rw-r--r-- | noncore/decorations/flat/flat.cpp | 4 | ||||
-rw-r--r-- | noncore/decorations/flat/flat.h | 1 | ||||
-rw-r--r-- | noncore/decorations/liquid/liquid.cpp | 4 | ||||
-rw-r--r-- | noncore/decorations/liquid/liquid.h | 2 | ||||
-rw-r--r-- | noncore/decorations/polished/polished.cpp | 4 | ||||
-rw-r--r-- | noncore/decorations/polished/polished.h | 2 |
6 files changed, 9 insertions, 8 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[] = { " +++++ +++++ ", " ++++++++++++ ", " ++++++++ ", " ", " "}; static QImage scaleButton( const QImage &img, int height ) { if ( img.height() != height ) { return img.smoothScale( img.width()*height/img.height(), height ); } else { return img; } } static void colorize( QImage &img, const QColor &c, bool rev ) { for ( int i = 0; i < img.numColors(); i++ ) { bool sc = (img.color(i) & 0xff000000); if ( rev ) sc = !sc; img.setColor(i, sc ? c.rgb() : 0x00000000 ); } } -FlatDecoration::FlatDecoration() : ref(0), buttonCache(16) +FlatDecoration::FlatDecoration() : buttonCache(16) { buttonCache.setAutoDelete(TRUE); } FlatDecoration::~FlatDecoration() { } int FlatDecoration::metric( Metric m, const WindowData *wd ) const { switch ( m ) { case TopBorder: return 1; break; case LeftBorder: case RightBorder: return 2; case BottomBorder: return 4; case TitleHeight: if ( QApplication::desktop()->height() > 320 ) return 20; else return 18; @@ -326,35 +326,37 @@ void FlatDecoration::drawButton( Button b, QPainter *p, const WindowData *wd, in } QRegion FlatDecoration::mask( const WindowData *wd ) const { return WindowDecorationInterface::mask( wd ); } QString FlatDecoration::name() const { return qApp->translate( "Decoration", "Flat" ); } QPixmap FlatDecoration::icon() const { return QPixmap(); } QRESULT FlatDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { *iface = 0; if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_WindowDecoration ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*iface)->addRef(); return QS_OK; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( FlatDecoration ) } 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 @@ #ifndef FLAT_H #define FLAT_H #include <qtopia/windowdecorationinterface.h> #include <qcache.h> #include <qimage.h> class FlatDecoration : public WindowDecorationInterface { public: FlatDecoration(); virtual ~FlatDecoration(); virtual int metric( Metric m, const WindowData * ) const; virtual void drawArea( Area a, QPainter *, const WindowData * ) const; virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const; virtual QRegion mask( const WindowData * ) const; virtual QString name() const; virtual QPixmap icon() const; QRESULT queryInterface( const QUuid&, QUnknownInterface** ); Q_REFCOUNT private: - ulong ref; QCache<QImage> buttonCache; }; #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 @@ #include "liquid.h" #include <qapplication.h> #include <qpainter.h> #include <qpalette.h> #include <qdrawutil.h> -LiquidDecoInterface::LiquidDecoInterface ( ) : ref ( 0 ) +LiquidDecoInterface::LiquidDecoInterface ( ) { } LiquidDecoInterface::~LiquidDecoInterface ( ) { } QString LiquidDecoInterface::name ( ) const { return qApp-> translate ( "Decoration", "Liquid" ); } QPixmap LiquidDecoInterface::icon ( ) const { return QPixmap ( ); } void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const { QRect r = wd-> rect; int th = metric ( TitleHeight, wd ); @@ -101,36 +101,38 @@ void LiquidDecoInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) p-> fillRect ( br.left() - 1, tr. top ( ), br. width ( ) + 2, tr. height ( ), fillcol); p-> setPen ( shadecol ); p-> drawText ( br, align, wd-> caption ); p-> setPen ( textcol ); br. moveBy ( -1, -1 ); p-> drawText ( br, align, wd-> caption ); break; } default: { WindowDecorationInterface::drawArea ( a, p, wd ); break; } } } QRESULT LiquidDecoInterface::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) { *iface = 0; if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_WindowDecoration ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*iface)-> addRef ( ); return QS_OK; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( LiquidDecoInterface ) } 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 @@ #ifndef __OPIE_LIQUIDDECO_PLUGIN_H__ #define __OPIE_LIQUIDDECO_PLUGIN_H__ #include <qpe/windowdecorationinterface.h> class LiquidSettings; class LiquidDecoInterface : public WindowDecorationInterface { public: LiquidDecoInterface ( ); virtual ~LiquidDecoInterface ( ); QRESULT queryInterface ( const QUuid &, QUnknownInterface ** ); Q_REFCOUNT virtual void drawArea( Area a, QPainter *, const WindowData * ) const; virtual QString name ( ) const; virtual QPixmap icon ( ) const; -private: - ulong ref; }; #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 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "polished.h" #include <qpainter.h> #include <qapplication.h> -PolishedDecoration::PolishedDecoration() : ref(0) +PolishedDecoration::PolishedDecoration() { } PolishedDecoration::~PolishedDecoration() { } int PolishedDecoration::metric( Metric m, const WindowData *wd ) const { switch ( m ) { case TopBorder: return 1; break; case LeftBorder: case RightBorder: return 2; case BottomBorder: return 6; case TitleHeight: if ( QApplication::desktop()->height() > 320 ) return 20; else return 18; default: @@ -137,35 +137,37 @@ void PolishedDecoration::drawBlend( QPainter *p, const QRect &r, const QColor &c int split = r.height()/3; for ( int j = 0; j < split; j++ ) { p->setPen( QColor( h1 + ((h2-h1)*(j+split))/(2*split-1), s1 + ((s2-s1)*(j+split))/(2*split-1), v1 + ((v2-v1)*(j+split))/(2*split-1), QColor::Hsv ) ); p->drawLine( r.x(), r.y()+j, r.right(), r.y()+j ); } for ( int j = 0; j < r.height()-split; j++ ) { p->setPen( QColor( h1 + ((h2-h1)*j)/(r.height()-split-1), s1 + ((s2-s1)*j)/(r.height()-split-1), v1 + ((v2-v1)*j)/(r.height()-split-1), QColor::Hsv ) ); p->drawLine( r.x(), r.bottom()-j, r.right(), r.bottom()-j ); } } QRESULT PolishedDecoration::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) { *iface = 0; if ( uuid == IID_QUnknown ) *iface = this; else if ( uuid == IID_WindowDecoration ) *iface = this; + else + return QS_FALSE; if ( *iface ) (*iface)->addRef(); return QS_OK; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( PolishedDecoration ) } 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 @@ #ifndef POLISHED_H #define POLISHED_H #include <qtopia/windowdecorationinterface.h> class PolishedDecoration : public WindowDecorationInterface { public: PolishedDecoration(); virtual ~PolishedDecoration(); virtual int metric( Metric m, const WindowData * ) const; virtual void drawArea( Area a, QPainter *, const WindowData * ) const; virtual void drawButton( Button b, QPainter *, const WindowData *, int x, int y, int w, int h, QWSButton::State ) const; virtual QRegion mask( const WindowData * ) const; virtual QString name() const; virtual QPixmap icon() const; QRESULT queryInterface( const QUuid&, QUnknownInterface** ); Q_REFCOUNT protected: void PolishedDecoration::drawBlend( QPainter *, const QRect &r, const QColor &c1, const QColor&c2 ) const; -private: - ulong ref; }; #endif |