diff -r 11d3954df52a -r 627c4a0fd0e7 src/hbcore/effects/hbeffectgroup.cpp --- a/src/hbcore/effects/hbeffectgroup.cpp Thu May 27 13:10:59 2010 +0300 +++ b/src/hbcore/effects/hbeffectgroup.cpp Fri Jun 11 13:58:22 2010 +0300 @@ -44,8 +44,8 @@ #endif HbEffectGroup::HbEffectGroup( - const QString &effectEventType, - QGraphicsItem *registrationItem, + const QString &effectEventType, + QGraphicsItem *registrationItem, QGraphicsItem *targetItem, const QString &itemType) : mRegistrationItem(registrationItem), @@ -133,7 +133,7 @@ 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); } } @@ -148,18 +148,20 @@ void HbEffectGroup::updateItemTransform() { - QGraphicsView *gv(0); + QGraphicsView *gv(0); // support for graphics view transforms if (mTargetItem->type() == HbGVWrapperItemType) { - HbGVWrapperItem *gvw = static_cast(mTargetItem); - if (gvw) + HbGVWrapperItem *gvw = static_cast(mTargetItem); + if (gvw) { gv = gvw->mainWindow(); + } } QTransform transform; - foreach (HbEffectAbstract *effect, mEffects) { - if (effect) + foreach(HbEffectAbstract * effect, mEffects) { + if (effect) { effect->updateItemTransform(transform); + } } if (!gv) { mTargetItem->setTransform(transform); @@ -180,7 +182,7 @@ int HbEffectGroup::effectCount() const { - return mEffects.count(); + return mEffects.count(); } bool HbEffectGroup::isRunning() const @@ -200,14 +202,14 @@ 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(); } } @@ -303,7 +305,7 @@ // 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) { @@ -329,7 +331,7 @@ mTargetItemHidden = false; if (mEffects.empty()) { - // No effect exists but user wants notification when effect finishes. + // 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 { @@ -340,7 +342,7 @@ 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. @@ -359,7 +361,7 @@ if (scene) { // Resolve the main window having the same scene that the item belongs to QList windowList = hbInstance->allMainWindows(); - foreach (const HbMainWindow *window, windowList) { + foreach(const HbMainWindow * window, windowList) { if (window->scene() == scene) { mView = window->currentView(); break; @@ -371,7 +373,7 @@ bool HbEffectGroup::hasTranslateEffect() const { - foreach (HbEffectAbstract *effect, mEffects) { + foreach(HbEffectAbstract * effect, mEffects) { if (effect->name() == HB_EFFECT_NAME_TRANSLATE) { return true; } @@ -381,7 +383,7 @@ bool HbEffectGroup::hasRotateEffect() const { - foreach (HbEffectAbstract *effect, mEffects) { + foreach(HbEffectAbstract * effect, mEffects) { if (effect->name() == HB_EFFECT_NAME_ROTATE) { return true; } @@ -392,7 +394,7 @@ bool HbEffectGroup::hasScaleEffect() const { - foreach (HbEffectAbstract *effect, mEffects) { + foreach(HbEffectAbstract * effect, mEffects) { if (effect->name() == HB_EFFECT_NAME_SCALE) { return true; } @@ -402,7 +404,7 @@ bool HbEffectGroup::hasOpacityEffect() const { - foreach (HbEffectAbstract *effect, mEffects) { + foreach(HbEffectAbstract * effect, mEffects) { if (effect->name() == HB_EFFECT_NAME_OPACITY) { return true; } @@ -438,9 +440,9 @@ mTargetItem->setOpacity(1.0f); } // Reset filter effects. -#ifdef HB_FILTER_EFFECTS +#ifdef HB_FILTER_EFFECTS deactivateVgEffect(); -#endif +#endif } void HbEffectGroup::cancelAll(bool sendCallback, bool itemIsValid, bool clearEffect, const QTransform &initialItemTransform) @@ -452,7 +454,7 @@ QTransform transform; bool opacityEffectUsed = false; - foreach (HbEffectAbstract *effect, mEffects) { + foreach(HbEffectAbstract * effect, mEffects) { if (effect) { HbTimer::instance()->unregisterEntry(effect); effect->cancel(transform, itemIsValid); @@ -531,8 +533,8 @@ status.userData = mUserData; status.reason = reason; - QObject *observer = mObserver; - + 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.