diff -r 6df133bd92e1 -r 075425b8d9a4 radioapp/radiowidgets/src/radiofadinglabel.cpp --- a/radioapp/radiowidgets/src/radiofadinglabel.cpp Fri Jun 04 10:21:36 2010 +0100 +++ b/radioapp/radiowidgets/src/radiofadinglabel.cpp Fri Jun 11 13:38:32 2010 +0300 @@ -20,11 +20,11 @@ // User includes #include "radiofadinglabel.h" #include "radiologger.h" -#include "radiouiutilities.h" +#include "radioutil.h" // Constants -const QString KHideEffect = "hide"; -const QString KShowEffect = "show"; +const QString HIDE_EFFECT = "hide"; +const QString SHOW_EFFECT = "show"; #ifdef USE_DEPRECATED_ORBIT_APIS # define SET_CONTENT setText @@ -42,9 +42,9 @@ mFadingEnabled( false ) { QEffectList effectList; -// effectList.append( EffectInfo( this, ":/effects/fade_in.fxml", KShowEffect ) ); -// effectList.append( EffectInfo( this, ":/effects/fade_out.fxml", KHideEffect ) ); - RadioUiUtilities::addEffects( effectList ); +// effectList.append( EffectInfo( this, ":/effects/fade_in.fxml", SHOW_EFFECT ) ); +// effectList.append( EffectInfo( this, ":/effects/fade_out.fxml", HIDE_EFFECT ) ); + RadioUtil::addEffects( effectList ); } /*! @@ -78,15 +78,15 @@ if ( newText.isEmpty() ) { if ( isVisible() ) { mTextHolder = ""; - startEffect( KHideEffect, "effectFinished" ); + startEffect( HIDE_EFFECT, "effectFinished" ); } } else { if ( GET_CONTENT().isEmpty() ) { HbLabel::SET_CONTENT( trimHtml( newText ) ); - startEffect( KShowEffect ); + startEffect( SHOW_EFFECT ); } else { mTextHolder = newText; - startEffect( KHideEffect, "effectFinished" ); + startEffect( HIDE_EFFECT, "effectFinished" ); } } } else { @@ -103,7 +103,7 @@ if ( status.reason == Hb::EffectFinished ) { HbLabel::SET_CONTENT( trimHtml( mTextHolder ) ); if ( !mTextHolder.isEmpty() ) { - HbEffect::start( this, KShowEffect ); + HbEffect::start( this, SHOW_EFFECT ); } mTextHolder = ""; }