diff -r 730c025d4b77 -r f378acbc9cfb src/hbcore/image/hbiconanimation.cpp --- a/src/hbcore/image/hbiconanimation.cpp Thu Jul 15 14:03:49 2010 +0100 +++ b/src/hbcore/image/hbiconanimation.cpp Thu Jul 22 16:36:53 2010 +0100 @@ -56,7 +56,7 @@ mView(0), mPaused(false), mPausedDueToBackground(false) - { +{ Q_ASSERT(!(animator->d->animation)); // Set the animation in the animator, it takes ownership of this object. animator->d->animation = this; @@ -64,7 +64,7 @@ #ifdef HB_ICON_TRACES qDebug() << "HbIconAnimation created: " << mIconName; #endif - } +} HbIconAnimation::~HbIconAnimation() { @@ -98,7 +98,7 @@ { return mColor; } - + void HbIconAnimation::setColor(const QColor &color) { mColor = color; @@ -278,7 +278,7 @@ // Apply mirroring if required if (mMirrored) { QTransform t; - t.scale(-1,1); + t.scale(-1, 1); canvasPixmap = canvasPixmap.transformed(t); } @@ -381,7 +381,7 @@ delete mImageRenderer; mImageRenderer = 0; mImageRenderer = new QImageReader(mIconFileName, mType == MNG ? "MNG" : "GIF"); - + // New image reader starts from the first frame. Handle animation update. notifyAnimationStarted(); handleAnimationUpdated(); @@ -417,7 +417,7 @@ // Inform client to update display emit animationUpdated(); - + notifyAnimationStopped(); } @@ -448,7 +448,7 @@ // Apply mirroring if required if (mMirrored) { QTransform t; - t.scale(-1,1); + t.scale(-1, 1); canvasPixmap = canvasPixmap.transformed(t); } @@ -507,11 +507,11 @@ } HbIconAnimationFrameSet::HbIconAnimationFrameSet( - HbIconAnimator *animator, const QString &iconName,const QList &frames) : - HbIconAnimation(animator, iconName), - mFrames(frames), - mCurrentFrameIndex(0), - mTimerEntry(0) + HbIconAnimator *animator, const QString &iconName, const QList &frames) : + HbIconAnimation(animator, iconName), + mFrames(frames), + mCurrentFrameIndex(0), + mTimerEntry(0) { // Do not start the timer or initiate any signal emission here. // Do it in start() instead, since mFresh is true by default. @@ -623,7 +623,7 @@ if (jumpData.execCount < jumpData.repeatCount) { ++jumpData.execCount; // Before returning, the exec counts of all previous jumps in - // this frame must be resetted, because they were caused by + // this frame must be reset, because they were caused by // elements that were embedded into the that // generated this jump. for (int j = 0; j < i; ++j) { @@ -631,7 +631,7 @@ } // And similarly, all jumps in frames that fall between the // target (incl.) and the current frame (excl.) must be - // resetted. Note that jumping forward is not supported and such + // reset. Note that jumping forward is not supported and such // jumps are never generated by the animation xml parser. for (int j = jumpData.targetFrameIndex; j < mCurrentFrameIndex; ++j) { resetJumpCount(mFrames[j]);