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 | |
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')
-rw-r--r-- | src/libs/installer/component.cpp | 80 | ||||
-rw-r--r-- | src/libs/installer/component.h | 19 | ||||
-rw-r--r-- | src/libs/installer/installer.pro | 3 |
3 files changed, 56 insertions, 46 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index b49bfe3a4..f3ba9c63c 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -56,6 +56,10 @@ #include <QtUiTools/QUiLoader> +#include <private/qv8engine_p.h> +#include <private/qv4scopedvalue_p.h> +#include <private/qv4global_p.h> + #include <algorithm> using namespace QInstaller; @@ -703,11 +707,11 @@ void Component::createOperationsForPath(const QString &path) if (fi.isFile()) { static const QString copy = QString::fromLatin1("Copy"); - addOperation(copy, fi.filePath(), target); + addOperation(copy, QStringList() << fi.filePath() << target); } else if (fi.isDir()) { qApp->processEvents(); static const QString mkdir = QString::fromLatin1("Mkdir"); - addOperation(mkdir, target); + addOperation(mkdir, QStringList(target)); QDirIterator it(fi.filePath()); while (it.hasNext()) @@ -747,7 +751,7 @@ void Component::createOperationsForArchive(const QString &archive) if (isZip) { // archives get completely extracted per default (if the script isn't doing other stuff) - addOperation(QLatin1String("Extract"), archive, QLatin1String("@TargetDir@")); + addOperation(QLatin1String("Extract"), QStringList() << archive << QLatin1String("@TargetDir@")); } else { createOperationsForPath(archive); } @@ -1009,23 +1013,44 @@ Operation *Component::createOperation(const QString &operationName, const QStrin return operation; } -/*! - Convenience method for calling the operation \a operation with up to ten parameters: - \a parameter1, \a parameter2, \a parameter3, \a parameter4, \a parameter5, \a parameter6, - \a parameter7, \a parameter8, \a parameter9, and \a parameter10. +namespace { - \sa {component::addOperation}{component.addOperation} -*/ -bool Component::addOperation(const QString &operation, const QString ¶meter1, const QString ¶meter2, - const QString ¶meter3, const QString ¶meter4, const QString ¶meter5, const QString ¶meter6, - const QString ¶meter7, const QString ¶meter8, const QString ¶meter9, const QString ¶meter10) +inline bool convert(QQmlV4Function *func, QStringList *toArgs) { - if (Operation *op = createOperation(operation, parameter1, parameter2, parameter3, parameter4, parameter5, - parameter6, parameter7, parameter8, parameter9, parameter10)) { - addOperation(op); - return true; + if (func->length() < 2) + return false; + + QV4::Scope scope(func->v4engine()); + QV4::ScopedValue val(scope); + val = (*func)[0]; + + *toArgs << val->toQString(); + for (int i = 1; i < func->length(); i++) { + val = (*func)[i]; + if (val->isObject() && val->asObject()->isArrayObject()) { + QV4::ScopedValue valtmp(scope); + QV4::Object *array = val->asObject(); + uint length = array->getLength(); + for (uint ii = 0; ii < length; ++ii) { + valtmp = array->getIndexed(ii); + *toArgs << valtmp->toQStringNoThrow(); + } + } else { + *toArgs << val->toQString(); + } } + return true; +} +} +/*! + \internal +*/ +bool Component::addOperation(QQmlV4Function *func) +{ + QStringList args; + if (convert(func, &args)) + return addOperation(args[0], args.mid(1)); return false; } @@ -1033,6 +1058,8 @@ bool Component::addOperation(const QString &operation, const QString ¶meter1 Creates and adds an installation operation for \a operation. Add any number of \a parameters. The variables that the parameters contain, such as \c @TargetDir@, are replaced with their values. + + \sa {component::addOperation}{component.addOperation} */ bool Component::addOperation(const QString &operation, const QStringList ¶meters) { @@ -1045,23 +1072,13 @@ bool Component::addOperation(const QString &operation, const QStringList ¶me } /*! - Convenience method for calling the elevated operation \a operation with up to ten parameters: - \a parameter1, \a parameter2, \a parameter3, \a parameter4, \a parameter5, \a parameter6, - \a parameter7, \a parameter8, \a parameter9, and \a parameter10. - - \sa {component::addElevatedOperation}{component.addElevatedOperation} + \internal */ -bool Component::addElevatedOperation(const QString &operation, const QString ¶meter1, - const QString ¶meter2, const QString ¶meter3, const QString ¶meter4, const QString ¶meter5, - const QString ¶meter6, const QString ¶meter7, const QString ¶meter8, const QString ¶meter9, - const QString ¶meter10) +bool Component::addElevatedOperation(QQmlV4Function *func) { - if (Operation *op = createOperation(operation, parameter1, parameter2, parameter3, parameter4, parameter5, - parameter6, parameter7, parameter8, parameter9, parameter10)) { - addElevatedOperation(op); - return true; - } - + QStringList args; + if (convert(func, &args)) + return addElevatedOperation(args[0], args.mid(1)); return false; } @@ -1070,6 +1087,7 @@ bool Component::addElevatedOperation(const QString &operation, const QString &pa The variables that the parameters contain, such as \c @TargetDir@, are replaced with their values. The operation is executed with elevated rights. + \sa {component::addElevatedOperation}{component.addElevatedOperation} */ bool Component::addElevatedOperation(const QString &operation, const QStringList ¶meters) { 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); diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index 87af31f3c..cfa83d08d 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -34,7 +34,8 @@ QT += \ xml \ concurrent \ widgets \ - core-private + core-private \ + qml-private win32:QT += winextras HEADERS += packagemanagercore.h \ |