diff options
author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2015-06-23 14:01:14 +0200 |
---|---|---|
committer | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-11-26 07:04:11 +0000 |
commit | eb574d77b0ab9a92b61e7738d089cd4ea4304e51 (patch) | |
tree | a022863e1bd9cdf017743e4dbb39a43ddbefd1f9 /src/libs/installer/component.h | |
parent | a81f19295745d081306f9417d6c45fda252fcb89 (diff) |
Use QQmlV4Function to correctly get empty parameters from script.
By using QQmlV4Function to get the parameters, empty strings passed
are correctly kept as empty and not null.
Task-number: QTIFW-724
Change-Id: I592e2230e574ba82e765bd0079964db29452b2e9
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/component.h')
-rw-r--r-- | src/libs/installer/component.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/libs/installer/component.h b/src/libs/installer/component.h index b184d27d2..e679be593 100644 --- a/src/libs/installer/component.h +++ b/src/libs/installer/component.h @@ -45,6 +45,7 @@ #include <QtCore/QUrl> QT_FORWARD_DECLARE_CLASS(QDebug) +QT_FORWARD_DECLARE_CLASS(QQmlV4Function) namespace KDUpdater { class Update; @@ -131,22 +132,12 @@ public: OperationList operations() const; void addOperation(Operation *operation); - Q_INVOKABLE bool addOperation(const QString &operation, const QString ¶meter1 = QString(), - const QString ¶meter2 = QString(), const QString ¶meter3 = QString(), - const QString ¶meter4 = QString(), const QString ¶meter5 = QString(), - const QString ¶meter6 = QString(), const QString ¶meter7 = QString(), - const QString ¶meter8 = QString(), const QString ¶meter9 = QString(), - const QString ¶meter10 = QString()); - Q_INVOKABLE bool addOperation(const QString &operation, const QStringList ¶meters); + Q_INVOKABLE bool addOperation(QQmlV4Function *args); + bool addOperation(const QString &operation, const QStringList ¶meters); void addElevatedOperation(Operation *operation); - Q_INVOKABLE bool addElevatedOperation(const QString &operation, - const QString ¶meter1 = QString(), const QString ¶meter2 = QString(), - const QString ¶meter3 = QString(), const QString ¶meter4 = QString(), - const QString ¶meter5 = QString(), const QString ¶meter6 = QString(), - const QString ¶meter7 = QString(), const QString ¶meter8 = QString(), - const QString ¶meter9 = QString(), const QString ¶meter10 = QString()); - Q_INVOKABLE bool addElevatedOperation(const QString &operation, const QStringList ¶meters); + Q_INVOKABLE bool addElevatedOperation(QQmlV4Function *args); + bool addElevatedOperation(const QString &operation, const QStringList ¶meters); QStringList downloadableArchives() const; Q_INVOKABLE void addDownloadableArchive(const QString &path); |