remove the dropUrls approach
This commit is contained in:
parent
58c27026ef
commit
3e236c281a
|
@ -47,8 +47,6 @@ void WallpaperScript::setWallpaper(Wallpaper *wallpaper)
|
|||
d->wallpaper = wallpaper;
|
||||
connect(wallpaper, SIGNAL(renderCompleted(const QImage&)),
|
||||
this, SLOT(renderCompleted(const QImage&)));
|
||||
connect(wallpaper, SIGNAL(urlDropped(const KUrl&)),
|
||||
this, SLOT(urlDropped(const KUrl&)));
|
||||
}
|
||||
|
||||
Wallpaper *WallpaperScript::wallpaper() const
|
||||
|
@ -116,12 +114,8 @@ void WallpaperScript::wheelEvent(QGraphicsSceneWheelEvent *event)
|
|||
Q_UNUSED(event)
|
||||
}
|
||||
|
||||
void WallpaperScript::setUrls(const KUrl::List urls)
|
||||
void WallpaperScript::addUrls(const KUrl::List urls)
|
||||
{
|
||||
//TODO KDE5 replace urlDropped with addUrls
|
||||
foreach (const KUrl &url, urls) {
|
||||
urlDropped(url);
|
||||
}
|
||||
}
|
||||
|
||||
bool WallpaperScript::isInitialized() const
|
||||
|
@ -223,10 +217,6 @@ void WallpaperScript::renderCompleted(const QImage &image)
|
|||
Q_UNUSED(image)
|
||||
}
|
||||
|
||||
void WallpaperScript::urlDropped(const KUrl &url)
|
||||
{
|
||||
Q_UNUSED(url)
|
||||
}
|
||||
|
||||
} // Plasma namespace
|
||||
|
||||
|
|
|
@ -139,9 +139,8 @@ public:
|
|||
|
||||
/**
|
||||
* Adds urls (e.g. from a drop)
|
||||
* @since 4.7
|
||||
*/
|
||||
void setUrls(const KUrl::List urls);
|
||||
virtual void addUrls(const KUrl::List urls);
|
||||
|
||||
protected:
|
||||
/**
|
||||
|
@ -179,7 +178,6 @@ protected:
|
|||
|
||||
protected Q_SLOTS:
|
||||
virtual void renderCompleted(const QImage &image);
|
||||
virtual void urlDropped(const KUrl &url);
|
||||
|
||||
private:
|
||||
WallpaperScriptPrivate *const d;
|
||||
|
|
|
@ -128,12 +128,7 @@ Wallpaper::~Wallpaper()
|
|||
void Wallpaper::addUrls(const KUrl::List &urls)
|
||||
{
|
||||
if (d->script) {
|
||||
d->script->setUrls(urls);
|
||||
} else {
|
||||
// provide compatibility with urlDropped
|
||||
foreach (const KUrl &url, urls) {
|
||||
emit urlDropped(url);
|
||||
}
|
||||
d->script->addUrls(urls);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -142,7 +137,7 @@ void Wallpaper::setUrls(const KUrl::List &urls)
|
|||
if (!d->initialized) {
|
||||
d->pendingUrls = urls;
|
||||
} else if (d->script) {
|
||||
d->script->setUrls(urls);
|
||||
d->script->addUrls(urls);
|
||||
} else {
|
||||
QMetaObject::invokeMethod(this, "addUrls", Q_ARG(KUrl::List, urls));
|
||||
}
|
||||
|
|
|
@ -399,14 +399,6 @@ class PLASMA_EXPORT Wallpaper : public QObject
|
|||
*/
|
||||
void renderCompleted(const QImage &image);
|
||||
|
||||
/**
|
||||
* Emitted when a URL matching X-Plasma-DropMimeTypes is dropped on the wallpaper
|
||||
*
|
||||
* @arg url the URL of the dropped file
|
||||
* @since 4.4
|
||||
*/
|
||||
KDE_DEPRECATED void urlDropped(const KUrl &url);
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue
Block a user