FCL/sf/mw/hb: comparison src/hbcore/effects/hbeffectgroup.cpp

equal deleted inserted replaced

-:730c025d4b77
+:f378acbc9cfb
 #include "hbvgeffect_p.h"
 #include "hbvgchainedeffect_p.h"
 #endif
 HbEffectGroup::HbEffectGroup(
 const QString &effectEventType,
 QGraphicsItem *registrationItem,
 QGraphicsItem *targetItem,
 const QString &itemType)
 : mRegistrationItem(registrationItem),
 mTargetItem(targetItem),
 mEffectEventType(effectEventType),
 for (int i = last; i >= 0; --i) {
 HbEffectAbstract *effect = mEffects[i];
 if (effect->name() == HB_EFFECT_NAME_SCALE) {
 // Move scale effect second last in the effect list
 mEffects.takeAt(i);
-mEffects.insert(mEffects.size()-1, effect);
+mEffects.insert(mEffects.size() - 1, effect);
 }
 }
 }
 }
 mEffectFinishedSlotName = effectFinishedSlotName;
 }
 void HbEffectGroup::updateItemTransform()
 {
 QGraphicsView *gv(0);
 // support for graphics view transforms
 if (mTargetItem->type() == HbGVWrapperItemType) {
-HbGVWrapperItem *gvw = static_cast<HbGVWrapperItem*>(mTargetItem);
+HbGVWrapperItem *gvw = static_cast<HbGVWrapperItem *>(mTargetItem);
-if (gvw)
+if (gvw) {
 gv = gvw->mainWindow();
+}
 }
 QTransform transform;
-foreach (HbEffectAbstract *effect, mEffects) {
+foreach(HbEffectAbstract * effect, mEffects) {
-if (effect)
+if (effect) {
 effect->updateItemTransform(transform);
+}
 }
 if (!gv) {
 mTargetItem->setTransform(transform);
 } else {
 gv->setTransform(transform);
 mDirty = dirty;
 }
 int HbEffectGroup::effectCount() const
 {
-	return mEffects.count();
+return mEffects.count();
 }
 bool HbEffectGroup::isRunning() const
 {
 return mRunningState != NotRunning;
 return mLooping;
 }
 void HbEffectGroup::pause()
 {
-foreach (HbEffectAbstract *effect, mEffects) {
+foreach(HbEffectAbstract * effect, mEffects) {
 effect->pause();
 }
 }
 void HbEffectGroup::resume()
 {
-foreach (HbEffectAbstract *effect, mEffects) {
+foreach(HbEffectAbstract * effect, mEffects) {
 effect->resume();
 }
 }
 const QVariant &HbEffectGroup::userData() const
 }
 // First resolve parameters and set the start states for all the effects.
 // This is done before starting the effect animations to avoid screen flickering.
 QTransform transform;
-foreach (HbEffectAbstract *effect, mEffects) {
+foreach(HbEffectAbstract * effect, mEffects) {
 // Resolve parameters etc.
 effect->init();
 if (effect->interval() == 0) {
 // Set start state if effect starts immediately
 effect->setStartState(transform);
 mRegItemHidden = false;
 mTargetItemHidden = false;
 if (mEffects.empty()) {
 // No effect exists but user wants notification when effect finishes.
 // Let the user do whatever he wanted to do when effect finishes.
 invokeObserver(Hb::EffectNotStarted);
 } else {
 // Start state has been set for all the effects,
 // next step is to start the effect animations.
 // Before that, resolve the view where the effect belongs if the effect is looping.
 // This is needed for being able to pause looping effects when their view is inactive.
 if (isLooping()) {
 resolveView();
 }
-foreach (HbEffectAbstract *effect, mEffects) {
+foreach(HbEffectAbstract * effect, mEffects) {
 // If the starttime is zero, start effect immediately
 if (effect->interval() == 0) {
 effect->start(); // This may call group's effectFinished if the effect was empty.
 } else {
 //Else register the effect to timeline to wait its turn.
 if (!mView && mTargetItem) {
 QGraphicsScene *scene = mTargetItem->scene();
 if (scene) {
 // Resolve the main window having the same scene that the item belongs to
 QList<HbMainWindow *> windowList = hbInstance->allMainWindows();
-foreach (const HbMainWindow *window, windowList) {
+foreach(const HbMainWindow * window, windowList) {
 if (window->scene() == scene) {
 mView = window->currentView();
 break;
 }
 }
 }
 }
 bool HbEffectGroup::hasTranslateEffect() const
 {
-foreach (HbEffectAbstract *effect, mEffects) {
+foreach(HbEffectAbstract * effect, mEffects) {
 if (effect->name() == HB_EFFECT_NAME_TRANSLATE) {
 return true;
 }
 }
 return false;
 }
 bool HbEffectGroup::hasRotateEffect() const
 {
-foreach (HbEffectAbstract *effect, mEffects) {
+foreach(HbEffectAbstract * effect, mEffects) {
 if (effect->name() == HB_EFFECT_NAME_ROTATE) {
 return true;
 }
 }
 return false;
 }
 bool HbEffectGroup::hasScaleEffect() const
 {
-foreach (HbEffectAbstract *effect, mEffects) {
+foreach(HbEffectAbstract * effect, mEffects) {
 if (effect->name() == HB_EFFECT_NAME_SCALE) {
 return true;
 }
 }
 return false;
 }
 bool HbEffectGroup::hasOpacityEffect() const
 {
-foreach (HbEffectAbstract *effect, mEffects) {
+foreach(HbEffectAbstract * effect, mEffects) {
 if (effect->name() == HB_EFFECT_NAME_OPACITY) {
 return true;
 }
 }
 return false;
 // Hide opacity effect by setting item fully opaque regardless of what
 // its opacity value was before the effect.
 mTargetItem->setOpacity(1.0f);
 }
 // Reset filter effects.
 #ifdef HB_FILTER_EFFECTS
 deactivateVgEffect();
 #endif
 }
 void HbEffectGroup::cancelAll(bool sendCallback, bool itemIsValid, bool clearEffect, const QTransform &initialItemTransform)
 {
 // No checks for running state here. The cancellation (esp. the clearing of
 // state.
 QTransform transform;
 bool opacityEffectUsed = false;
-foreach (HbEffectAbstract *effect, mEffects) {
+foreach(HbEffectAbstract * effect, mEffects) {
 if (effect) {
 HbTimer::instance()->unregisterEntry(effect);
 effect->cancel(transform, itemIsValid);
 if (effect->name() == HB_EFFECT_NAME_OPACITY) {
 opacityEffectUsed = true;
 status.item = mRegistrationItem;
 status.effectEvent = mEffectEventType;
 status.userData = mUserData;
 status.reason = reason;
 QObject *observer = mObserver;
 // Clear the observer to make sure it is not sent more than once.
 // This is done before invokeMethod to avoid crash if the callback
 // deletes this object.
 mObserver = 0;

branch	GCC_SURGE
changeset 15	f378acbc9cfb
parent 5	627c4a0fd0e7
child 21	4633027730f5
child 34	ed14f46c0e55