Commit a4f486b8 authored by hjk's avatar hjk Committed by Eike Ziller
Browse files

manhattanstyle: don't use defines for constants



Change-Id: I19a9b86c37dfcd1be7451d6fe67322a833d7b322
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent a0d39a9a
......@@ -66,7 +66,7 @@
#include <QAbstractItemView>
// We define a currently unused state for indicating animations
#define State_Animating 0x00000040
const QStyle::State State_Animating = QStyle::State(0x00000040);
// Because designer needs to disable this for widget previews
// we have a custom property that is inherited
......@@ -415,7 +415,7 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
Animation *anim = d->animator.widgetAnimation(widget);
QStyleOption opt = *option;
opt.state = (QStyle::State)oldState;
opt.state |= (State)State_Animating;
opt.state |= State_Animating;
startImage.fill(0);
Transition *t = new Transition;
t->setWidget(w);
......@@ -427,7 +427,7 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
d->animator.stopAnimation(widget);
}
QStyleOption endOpt = *option;
endOpt.state |= (State)State_Animating;
endOpt.state |= State_Animating;
t->setStartImage(startImage);
d->animator.startAnimation(t);
endImage.fill(0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment