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

deprecate downloadPath(const QString &file) in favor of downloadPath()

Browse Source 
REVIEW: 127870

while I was at it, I make downloadPath() const as suggested by Kai
and fixed 1 spelling error.
This commit is contained in:
Allen Winter 2016-05-26 19:09:10 -04:00
parent 3e55c85167
commit 97d8cd574c
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/scriptengines/qml/plasmoid/appletinterface.cpp
View File

@ -557,7 +557,7 @@ int AppletInterface::apiVersion() const
if (plugins.isEmpty()) { if (plugins.isEmpty()) {
return -1; return -1;
} }
return plugins.first().value(QStringLiteral("X-KDE-PluginInfo-Version")).toInt(); return plugins.first().value(QStringLiteral("X-KDE-PluginInfo-Version")).toInt();
} }
@ -674,6 +674,12 @@ void AppletInterface::setConfigurationRequiredReason(const QString &reason)
} }
QString AppletInterface::downloadPath(const QString &file) QString AppletInterface::downloadPath(const QString &file)
{
Q_UNUSED(file);
return downloadPath();
}
QString AppletInterface::downloadPath() const
{ {
const QString downloadDir = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + "/Plasma/" + applet()->pluginInfo().pluginName() + '/'; const QString downloadDir = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + "/Plasma/" + applet()->pluginInfo().pluginName() + '/';

14
src/scriptengines/qml/plasmoid/appletinterface.h
View File

@ -188,7 +188,7 @@ class AppletInterface : public PlasmaQuick::AppletQuickItem
// TODO: This was moved up from ContainmentInterface because it is required by the // TODO: This was moved up from ContainmentInterface because it is required by the
// Task Manager applet (for "Show only tasks from this screen") and no Qt API exposes // Task Manager applet (for "Show only tasks from this screen") and no Qt API exposes
// screen numbering. An alternate solution that doesn't extend the applet interface // screen numbering. An alternate solution that doesn't extend the applet interface
// would be preferrable if found. // would be preferable if found.
Q_PROPERTY(int screen READ screen NOTIFY screenChanged) Q_PROPERTY(int screen READ screen NOTIFY screenChanged)
/** /**
@ -285,9 +285,17 @@ public:
Q_INVOKABLE QString file(const QString &fileType, const QString &filePath); Q_INVOKABLE QString file(const QString &fileType, const QString &filePath);
/** /**
* @returns A path where is safe to write on disk downloaded files * @returns A path where it is safe to write on disk downloaded files.
* @since 5.23
*/ */
Q_INVOKABLE QString downloadPath(const QString &file); Q_INVOKABLE QString downloadPath() const;
/**
* @returns A path where it is safe to write on disk downloaded files.
* @param file that name of the file to download (unused).
* @deprecated Use downloadPath() instead.
*/
Q_INVOKABLE PLASMA_DEPRECATED QString downloadPath(const QString &file);
/** /**
* @returns The list of files that have been downloaded * @returns The list of files that have been downloaded