now we can setTempRepositories from script side

 - this makes testing with autoscript more convenient

Change-Id: I93e25570cd9f2b1431412a601476947fc9a046d9
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>

4 files changed, 16 insertions, 22 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index e43033c3f..8d4c92d31 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -769,29 +769,26 @@ bool PackageManagerCore::removeWizardPageItem(Component *component, const QStrin
     return false;
 }
 
-void PackageManagerCore::addUserRepository(const QString &repositoryUrl, bool isDefault)
+void PackageManagerCore::addUserRepositories(const QStringList &repositories)
 {
-    addUserRepositories(QSet<Repository>() << Repository::fromUserInput(repositoryUrl, isDefault));
-}
+    QSet<Repository> repositorySet;
+    foreach (const QString &repository, repositories)
+        repositorySet.insert(Repository::fromUserInput(repository));
 
-void PackageManagerCore::addUserRepositories(const QSet<Repository> &repositories)
-{
-    d->m_settings.addUserRepositories(repositories);
-}
-
-
-void PackageManagerCore::setTemporaryRepository(const QString &repositoryUrl)
-{
-    setTemporaryRepositories(QSet<Repository>() << Repository::fromUserInput(repositoryUrl, false));
+    d->m_settings.addUserRepositories(repositorySet);
 }
 
 /*!
     Sets additional repository for this instance of the installer or updater.
     Will be removed after invoking it again.
 */
-void PackageManagerCore::setTemporaryRepositories(const QSet<Repository> &repositories, bool replace)
+void PackageManagerCore::setTemporaryRepositories(const QStringList &repositories, bool replace)
 {
-    d->m_settings.setTemporaryRepositories(repositories, replace);
+    QSet<Repository> repositorySet;
+    foreach (const QString &repository, repositories)
+        repositorySet.insert(Repository::fromUserInput(repository));
+
+    d->m_settings.setTemporaryRepositories(repositorySet, replace);
 }
 
 /*!
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h
index ec360d5db..3ecf067cd 100644
--- a/src/libs/installer/packagemanagercore.h
+++ b/src/libs/installer/packagemanagercore.h
@@ -150,11 +150,8 @@ public:
     bool testChecksum() const;
     void setTestChecksum(bool test);
 
-    Q_INVOKABLE void addUserRepository(const QString &repositoryUrl, bool isDefault);
-    void addUserRepositories(const QSet<Repository> &repositories);
-
-    Q_INVOKABLE void setTemporaryRepository(const QString &repositoryUrl);
-    void setTemporaryRepositories(const QSet<Repository> &repositories, bool replace = false);
+    Q_INVOKABLE void addUserRepositories(const QStringList &repositories);
+    Q_INVOKABLE void setTemporaryRepositories(const QStringList &repositories, bool replace = false);
 
     Q_INVOKABLE void autoAcceptMessageBoxes();
     Q_INVOKABLE void autoRejectMessageBoxes();
diff --git a/src/libs/installer/repository.cpp b/src/libs/installer/repository.cpp
index 8842a7899..6ebc53f1e 100644
--- a/src/libs/installer/repository.cpp
+++ b/src/libs/installer/repository.cpp
@@ -77,7 +77,7 @@ Repository::Repository(const QUrl &url, bool isDefault)
 
     Note: user and password can be inside the \a repositoryUrl string: http://user:password@repository.url
 */
-Repository Repository::fromUserInput(const QString &repositoryUrl, bool isDefault)
+Repository Repository::fromUserInput(const QString &repositoryUrl)
 {
     QStringList supportedShemes;
     supportedShemes << QLatin1String("http") << QLatin1String("https") <<  QLatin1String("ftp") <<
@@ -92,7 +92,7 @@ Repository Repository::fromUserInput(const QString &repositoryUrl, bool isDefaul
     url.setUserName(QString());
     url.setPassword(QString());
 
-    Repository repository(url, isDefault);
+    Repository repository(url, false);
     repository.setUsername(userName);
     repository.setPassword(password);
     return repository;
diff --git a/src/libs/installer/repository.h b/src/libs/installer/repository.h
index a780a53e4..7e02a74db 100644
--- a/src/libs/installer/repository.h
+++ b/src/libs/installer/repository.h
@@ -47,7 +47,7 @@ public:
     Repository(const Repository &other);
     explicit Repository(const QUrl &url, bool isDefault);
 
-    static Repository fromUserInput(const QString &repositoryUrl, bool isDefault = false);
+    static Repository fromUserInput(const QString &repositoryUrl);
 
     bool isValid() const;
     bool isDefault() const;