diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/hsutils/src/hswallpaperimagereader.cpp --- a/homescreenapp/hsutils/src/hswallpaperimagereader.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/hsutils/src/hswallpaperimagereader.cpp Thu May 27 12:46:08 2010 +0300 @@ -24,7 +24,7 @@ Constructor. */ HsWallpaperImageReader::HsWallpaperImageReader(QObject *parent): - QObject(parent), + QThread(parent), mCenterTarget(false) { @@ -49,7 +49,7 @@ /*! Returns image source path */ -QString HsWallpaperImageReader::getSourcePath() const +QString HsWallpaperImageReader::sourcePath() const { return mSourcePath; } @@ -65,7 +65,7 @@ /*! Returns source rect */ -QRect HsWallpaperImageReader::getSourceRect() const +QRect HsWallpaperImageReader::sourceRect() const { return mSourceRect; } @@ -81,7 +81,7 @@ /*! Returns target rect */ -QRect HsWallpaperImageReader::getTargetRect() const +QRect HsWallpaperImageReader::targetRect() const { return mTargetRect; } @@ -97,7 +97,7 @@ /*! Returns target centering */ -bool HsWallpaperImageReader::getCenterTarget() +bool HsWallpaperImageReader::centerTarget() { return mCenterTarget; } @@ -105,7 +105,7 @@ /*! Returns processed image */ -QImage HsWallpaperImageReader::getProcessedImage() const +QImage HsWallpaperImageReader::processedImage() const { return mProcessedImage; } @@ -117,10 +117,10 @@ Pass empty set sourceRect to empty to use full size source image as starting point. Returns processed image or null image if operation fails. */ -void HsWallpaperImageReader::processImage() +void HsWallpaperImageReader::run() { QImageReader imageReader(mSourcePath); - + QRect tempTargetRect = mTargetRect; QRect tempSourceRect = mSourceRect; @@ -130,7 +130,7 @@ // If sourceRect not defined, uses full size image as source. tempSourceRect.setRect(0, 0, sourceSize.width(), sourceSize.height()); } - sourceSize.scale(tempTargetRect.width(), tempTargetRect.height(), + sourceSize.scale(tempTargetRect.width(), tempTargetRect.height(), Qt::KeepAspectRatioByExpanding); imageReader.setScaledSize(sourceSize); @@ -142,5 +142,4 @@ } else { mProcessedImage = QImage(); } - emit processingFinished(); }