From 1217cd2c190627b1e89f735ec20b35dfacc7115f Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Tue, 14 Dec 2010 22:18:56 +0000 Subject: [PATCH] a better name, so that upon reading it is clear that there is a signal called renderCompleted as well as a slot (by changing the name of the (private) slot to something other than renderCompleted) svn path=/trunk/KDE/kdelibs/; revision=1206548 --- private/wallpaper_p.h | 6 +++--- wallpaper.cpp | 12 ++++++------ wallpaper.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/private/wallpaper_p.h b/private/wallpaper_p.h index ed61e5a49..e7e276910 100644 --- a/private/wallpaper_p.h +++ b/private/wallpaper_p.h @@ -54,9 +54,9 @@ public: bool findInCache(const QString &key, unsigned int lastModified = 0); - void renderCompleted(WallpaperRenderThread *renderer,int token, const QImage &image, - const QString &sourceImagePath, const QSize &size, - int resizeMethod, const QColor &color); + void newRenderCompleted(WallpaperRenderThread *renderer,int token, const QImage &image, + const QString &sourceImagePath, const QSize &size, + int resizeMethod, const QColor &color); void setupScriptSupport(); static QList s_renderers; diff --git a/wallpaper.cpp b/wallpaper.cpp index 3eb4f845e..d0b9b09a7 100644 --- a/wallpaper.cpp +++ b/wallpaper.cpp @@ -440,7 +440,7 @@ void Wallpaper::render(const QString &sourceImagePath, const QSize &size, WallpaperPrivate::s_renderers.append(renderThread); d->renderToken = renderThread->render(sourceImagePath, size, resizeMethod, color); connect(renderThread, SIGNAL(done(WallpaperRenderThread*,int,QImage,QString,QSize,int,QColor)), - this, SLOT(renderCompleted(WallpaperRenderThread*,int,QImage,QString,QSize,int,QColor)), Qt::UniqueConnection); + this, SLOT(newRenderCompleted(WallpaperRenderThread*,int,QImage,QString,QSize,int,QColor)), Qt::UniqueConnection); } else { WallpaperPrivate::RenderRequest request; request.parent = this; @@ -510,12 +510,12 @@ QString WallpaperPrivate::cachePath(const QString &key) const return KGlobal::dirs()->locateLocal("cache", "plasma-wallpapers/" + key + ".png"); } -void WallpaperPrivate::renderCompleted(WallpaperRenderThread *currentRenderer, int token, const QImage &image, - const QString &sourceImagePath, const QSize &size, - int resizeMethod, const QColor &color) +void WallpaperPrivate::newRenderCompleted(WallpaperRenderThread *currentRenderer, int token, const QImage &image, + const QString &sourceImagePath, const QSize &size, + int resizeMethod, const QColor &color) { q->disconnect(currentRenderer, SIGNAL(done(WallpaperRenderThread*,int,QImage,QString,QSize,int,QColor)), - q, SLOT(renderCompleted(WallpaperRenderThread*,int,QImage,QString,QSize,int,QColor))); + q, SLOT(newRenderCompleted(WallpaperRenderThread*,int,QImage,QString,QSize,int,QColor))); if (!s_renderQueue.isEmpty()) { while (!s_renderQueue.isEmpty()) { @@ -528,7 +528,7 @@ void WallpaperPrivate::renderCompleted(WallpaperRenderThread *currentRenderer, i currentRenderer->wait(); request.parent.data()->d->renderToken = currentRenderer->render(request.file, request.size, request.resizeMethod, request.color); QObject::connect(currentRenderer, SIGNAL(done(WallpaperRenderThread*,int,QImage,QString,QSize,int,QColor)), - request.parent.data(), SLOT(renderCompleted(WallpaperRenderThread*,int,QImage,QString,QSize,int,QColor)), Qt::UniqueConnection); + request.parent.data(), SLOT(newRenderCompleted(WallpaperRenderThread*,int,QImage,QString,QSize,int,QColor)), Qt::UniqueConnection); break; } diff --git a/wallpaper.h b/wallpaper.h index 7b4d2ad1f..3b364cf5d 100644 --- a/wallpaper.h +++ b/wallpaper.h @@ -508,9 +508,9 @@ class PLASMA_EXPORT Wallpaper : public QObject void setPreviewDuringConfiguration(const bool preview); private: - Q_PRIVATE_SLOT(d, void renderCompleted(WallpaperRenderThread *renderer, int token, const QImage &image, - const QString &sourceImagePath, const QSize &size, - int resizeMethod, const QColor &color)) + Q_PRIVATE_SLOT(d, void newRenderCompleted(WallpaperRenderThread *renderer, int token, const QImage &image, + const QString &sourceImagePath, const QSize &size, + int resizeMethod, const QColor &color)) Q_PRIVATE_SLOT(d, void initScript()) friend class WallpaperPackage;