alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usingDiskCache -> usingRenderingCache; removes the implementation detail that it's caching to a disk from the method names; also revert the eroneous setter i added to Wallpaper, it was already there as isUsingRenderingCache

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=967627
This commit is contained in:
Aaron J. Seigo 2009-05-13 16:13:56 +00:00
parent 0ab881867d
commit 170e38756f
4 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
svg.cpp
View File

@ -607,12 +607,12 @@ QString Svg::imagePath() const
return d->themed ? d->themePath : d->path; return d->themed ? d->themePath : d->path;
} }
void Svg::setUsingDiskCache(bool useCache) void Svg::setUsingRenderingCache(bool useCache)
{ {
d->cacheRendering = useCache; d->cacheRendering = useCache;
} }
bool Svg::usingDiskCache() const bool Svg::isUsingRenderingCache() const
{ {
return d->cacheRendering; return d->cacheRendering;
} }

6
svg.h
View File

@ -59,7 +59,7 @@ class PLASMA_EXPORT Svg : public QObject
Q_PROPERTY(QSize size READ size) Q_PROPERTY(QSize size READ size)
Q_PROPERTY(bool multipleImages READ containsMultipleImages WRITE setContainsMultipleImages) Q_PROPERTY(bool multipleImages READ containsMultipleImages WRITE setContainsMultipleImages)
Q_PROPERTY(QString imagePath READ imagePath WRITE setImagePath) Q_PROPERTY(QString imagePath READ imagePath WRITE setImagePath)
Q_PROPERTY(bool usingDiskCache READ usingDiskCache WRITE setUsingDiskCache) Q_PROPERTY(bool usingRenderingCache READ isUsingRenderingCache WRITE setUsingRenderingCache)
public: public:
@ -232,12 +232,12 @@ class PLASMA_EXPORT Svg : public QObject
* @param useCache true to cache rendered pixmaps * @param useCache true to cache rendered pixmaps
* @since 4.3 * @since 4.3
*/ */
void setUsingDiskCache(bool useCache); void setUsingRenderingCache(bool useCache);
/** /**
* @return true if the Svgis using caching for rendering results * @return true if the Svgis using caching for rendering results
*/ */
bool usingDiskCache() const; bool isUsingRenderingCache() const;
Q_SIGNALS: Q_SIGNALS:
void repaintNeeded(); void repaintNeeded();

9
wallpaper.cpp
View File

@ -288,21 +288,16 @@ void Wallpaper::setConfigurationRequired(bool needsConfig, const QString &reason
emit configurationRequired(needsConfig); emit configurationRequired(needsConfig);
} }
bool Wallpaper::isUsingDiskCache() const bool Wallpaper::isUsingRenderingCache() const
{ {
return d->cacheRendering; return d->cacheRendering;
} }
void Wallpaper::setUsingDiskCache(bool useCache) void Wallpaper::setUsingRenderingCache(bool useCache)
{ {
d->cacheRendering = useCache; d->cacheRendering = useCache;
} }
bool Wallpaper::usingDiskCache() const
{
return d->cacheRendering;
}
void Wallpaper::setResizeMethodHint(Wallpaper::ResizeMethod resizeMethod) void Wallpaper::setResizeMethodHint(Wallpaper::ResizeMethod resizeMethod)
{ {
d->lastResizeMethod = resizeMethod; d->lastResizeMethod = resizeMethod;

13
wallpaper.h
View File

@ -60,7 +60,7 @@ class PLASMA_EXPORT Wallpaper : public QObject
Q_PROPERTY(QString icon READ icon) Q_PROPERTY(QString icon READ icon)
Q_PROPERTY(KServiceAction renderingMode READ renderingMode) Q_PROPERTY(KServiceAction renderingMode READ renderingMode)
Q_PROPERTY(QList<KServiceAction> listRenderingModes READ listRenderingModes) Q_PROPERTY(QList<KServiceAction> listRenderingModes READ listRenderingModes)
Q_PROPERTY(bool usingDiskCache READ usingDiskCache WRITE setUsingDiskCache) Q_PROPERTY(bool usingRenderingCache READ isUsingRenderingCache WRITE setUsingRenderingCache)
public: public:
/** /**
@ -275,7 +275,7 @@ class PLASMA_EXPORT Wallpaper : public QObject
* @return true if disk caching is turned on. * @return true if disk caching is turned on.
* @since 4.3 * @since 4.3
*/ */
bool isUsingDiskCache() const; bool isUsingRenderingCache() const;
/** /**
* Allows one to set rendering hints that may differ from the actualities of the * Allows one to set rendering hints that may differ from the actualities of the
@ -397,12 +397,7 @@ class PLASMA_EXPORT Wallpaper : public QObject
* @param useCache true to cache rendered papers on disk, false not to cache * @param useCache true to cache rendered papers on disk, false not to cache
* @since 4.3 * @since 4.3
*/ */
void setUsingDiskCache(bool useCache); void setUsingRenderingCache(bool useCache);
/**
* @return true if the wallpaper is using disk caching for render results
*/
bool usingDiskCache() const;
/** /**
* Tries to load pixmap with the specified key from cache. * Tries to load pixmap with the specified key from cache.
@ -418,7 +413,7 @@ class PLASMA_EXPORT Wallpaper : public QObject
bool findInCache(const QString &key, QImage &image, unsigned int lastModified = 0); bool findInCache(const QString &key, QImage &image, unsigned int lastModified = 0);
/** /**
* Insert specified pixmap into the cache if usingDiskCache. * Insert specified pixmap into the cache if usingRenderingCache.
* If the cache already contains pixmap with the specified key then it is * If the cache already contains pixmap with the specified key then it is
* overwritten. * overwritten.
* *