From 025e7a585991acfa56c6a997a286bd018cbe9872 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Sat, 29 Jan 2011 18:10:00 +0000 Subject: [PATCH] Fixed some coding style. Changed tileset definition so that all shadow pixmaps have same size. svn path=/trunk/KDE/kdebase/workspace/; revision=1217933 --- clients/oxygen/oxygenshadowcache.cpp | 9 ++++----- clients/oxygen/oxygenshadowcache.h | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/clients/oxygen/oxygenshadowcache.cpp b/clients/oxygen/oxygenshadowcache.cpp index 1ade55e967..1ea6539f11 100644 --- a/clients/oxygen/oxygenshadowcache.cpp +++ b/clients/oxygen/oxygenshadowcache.cpp @@ -25,7 +25,6 @@ ////////////////////////////////////////////////////////////////////////////// #include "oxygenshadowcache.h" -#include "oxygenhelper.h" #include #include @@ -70,13 +69,13 @@ namespace Oxygen TileSet* ShadowCache::tileSet( const Key& key ) { - // check if tileset already in cache + // check if tileSet already in cache int hash( key.hash() ); if( enabled_ && shadowCache_.contains(hash) ) return shadowCache_.object(hash); - // create tileset otherwise + // create tileSet otherwise qreal size( shadowSize() ); - TileSet* tileSet = new TileSet( shadowPixmap( key, key.active ), size, size, 1, 1); + TileSet* tileSet = new TileSet( shadowPixmap( key, key.active ), size, size, size, size, size, size, 1, 1); shadowCache_.insert( hash, tileSet ); return tileSet; @@ -93,7 +92,7 @@ namespace Oxygen // construct key key.index = index; - // check if tileset already in cache + // check if tileSet already in cache int hash( key.hash() ); if( enabled_ && animatedShadowCache_.contains(hash) ) return animatedShadowCache_.object(hash); diff --git a/clients/oxygen/oxygenshadowcache.h b/clients/oxygen/oxygenshadowcache.h index 78d3685157..ced1ed6a10 100644 --- a/clients/oxygen/oxygenshadowcache.h +++ b/clients/oxygen/oxygenshadowcache.h @@ -27,14 +27,13 @@ // IN THE SOFTWARE. ////////////////////////////////////////////////////////////////////////////// -#include "oxygendecohelper.h" #include "oxygenshadowconfiguration.h" +#include "oxygendecohelper.h" #include #include #include - namespace Oxygen { @@ -43,7 +42,7 @@ namespace Oxygen public: //! constructor - ShadowCache( DecoHelper& helper ); + ShadowCache( DecoHelper& ); //! destructor virtual ~ShadowCache( void ) @@ -240,12 +239,12 @@ namespace Oxygen }; - private: - //! draw gradient into rect /*! a separate method is used in order to properly account for corners */ void renderGradient( QPainter&, const QRectF&, const QRadialGradient&, bool hasBorder = true ) const; + private: + //! helper DecoHelper& helper_;