diff --git a/containment.cpp b/containment.cpp index 73889dfe9..9e6630000 100644 --- a/containment.cpp +++ b/containment.cpp @@ -890,7 +890,7 @@ void Containment::dragEnterEvent(QGraphicsSceneDragDropEvent *event) if (!event->isAccepted()) { foreach (const QString &format, formats) { - KPluginInfo::List wallpaperList = Wallpaper::listWallpaperInfoForMimetype(format); + KPluginInfo::List wallpaperList = Wallpaper::listWallpaperInfoForMimeType(format); if (!wallpaperList.isEmpty()) { event->setAccepted(true); break; diff --git a/plasma.kdev4 b/plasma.kdev4 index f96eb3c88..a412a8502 100644 --- a/plasma.kdev4 +++ b/plasma.kdev4 @@ -1,3 +1,3 @@ [Project] Manager=KDevCMakeManager -Name=plasmalibs +Name=plasmaframeworks5 diff --git a/private/containment_p.cpp b/private/containment_p.cpp index 1796b8fbb..efccedb23 100644 --- a/private/containment_p.cpp +++ b/private/containment_p.cpp @@ -643,7 +643,7 @@ void ContainmentPrivate::mimeTypeRetrieved(KIO::Job *job, const QString &mimeTyp if (wallpaper && wallpaper->supportsMimetype(mimeType)) { wallpaperList << wallpaper->d->wallpaperDescription; } else { - wallpaperList = Wallpaper::listWallpaperInfoForMimetype(mimeType); + wallpaperList = Wallpaper::listWallpaperInfoForMimeType(mimeType); } } diff --git a/wallpaper.cpp b/wallpaper.cpp index 2078d93b1..3928d19e3 100644 --- a/wallpaper.cpp +++ b/wallpaper.cpp @@ -144,7 +144,7 @@ KPluginInfo::List Wallpaper::listWallpaperInfo(const QString &formFactor) return KPluginInfo::fromServices(offers); } -KPluginInfo::List Wallpaper::listWallpaperInfoForMimetype(const QString &mimeType, const QString &formFactor) +KPluginInfo::List Wallpaper::listWallpaperInfoForMimeType(const QString &mimeType, const QString &formFactor) { QString constraint = QString("'%1' in [X-Plasma-DropMimeTypes]").arg(mimeType); if (!formFactor.isEmpty()) { diff --git a/wallpaper.h b/wallpaper.h index dc571add4..c3be59e3f 100644 --- a/wallpaper.h +++ b/wallpaper.h @@ -101,7 +101,7 @@ class PLASMA_EXPORT Wallpaper : public QObject * @arg formFactor the format of the wallpaper being search for (e.g. desktop) * @return list of wallpapers */ - static KPluginInfo::List listWallpaperInfoForMimetype(const QString &mimeType, + static KPluginInfo::List listWallpaperInfoForMimeType(const QString &mimeType, const QString &formFactor = QString()); /** @@ -554,3 +554,4 @@ K_EXPORT_PLUGIN(factory("plasma_wallpaper_" #libname)) \ K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION) #endif // multiple inclusion guard +