From b35d3c7b650ce20906fe60615db5037d8bc69699 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Wed, 23 Feb 2011 09:46:17 +0100 Subject: [PATCH] clean-up headers to make shadow cache and configuration decoration independent. --- clients/oxygen/oxygenshadowcache.cpp | 2 +- clients/oxygen/oxygenshadowcache.h | 8 ++++---- clients/oxygen/oxygenshadowconfiguration.cpp | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/clients/oxygen/oxygenshadowcache.cpp b/clients/oxygen/oxygenshadowcache.cpp index 68c5ca8b88..66f69d47b1 100644 --- a/clients/oxygen/oxygenshadowcache.cpp +++ b/clients/oxygen/oxygenshadowcache.cpp @@ -40,7 +40,7 @@ namespace Oxygen { return x*x; } //_______________________________________________________ - ShadowCache::ShadowCache( DecoHelper& helper ): + ShadowCache::ShadowCache( Helper& helper ): helper_( helper ), activeShadowConfiguration_( ShadowConfiguration( QPalette::Active ) ), inactiveShadowConfiguration_( ShadowConfiguration( QPalette::Inactive ) ) diff --git a/clients/oxygen/oxygenshadowcache.h b/clients/oxygen/oxygenshadowcache.h index b6a61e9d18..99f18e440c 100644 --- a/clients/oxygen/oxygenshadowcache.h +++ b/clients/oxygen/oxygenshadowcache.h @@ -28,7 +28,7 @@ ////////////////////////////////////////////////////////////////////////////// #include "oxygenshadowconfiguration.h" -#include "oxygendecohelper.h" +#include "oxygenhelper.h" #include #include @@ -42,7 +42,7 @@ namespace Oxygen public: //! constructor - ShadowCache( DecoHelper& ); + ShadowCache( Helper& ); //! destructor virtual ~ShadowCache( void ) @@ -172,7 +172,7 @@ namespace Oxygen protected: - DecoHelper& helper( void ) const + Helper& helper( void ) const { return helper_; } //! square utility function @@ -238,7 +238,7 @@ namespace Oxygen private: //! helper - DecoHelper& helper_; + Helper& helper_; //! defines overlap between shadows and body enum { overlap = 4 }; diff --git a/clients/oxygen/oxygenshadowconfiguration.cpp b/clients/oxygen/oxygenshadowconfiguration.cpp index f94e88a7b7..3106ad4fd4 100644 --- a/clients/oxygen/oxygenshadowconfiguration.cpp +++ b/clients/oxygen/oxygenshadowconfiguration.cpp @@ -27,7 +27,6 @@ #include "oxygenshadowconfiguration.h" #include -#include namespace Oxygen {