GitLab: Access GitlabParameter singleton more directly

Change-Id: Ib4d333b6419bb2bdcdcf124d22d0473f6fd91cb9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/gitlab/gitlabdialog.cpp

@@ -159,12 +159,11 @@ void GitLabDialog::resetTreeView(QTreeView *treeView, QAbstractItemModel *model)
 void GitLabDialog::updateRemotes()
 {
     m_remoteComboBox->clear();
-    const GitLabParameters *global = GitLabPlugin::globalParameters();
+    for (const GitLabServer &server : std::as_const(gitLabParameters().gitLabServers))
-    for (const GitLabServer &server : std::as_const(global->gitLabServers))
         m_remoteComboBox->addItem(server.displayString(), QVariant::fromValue(server));
 
     m_remoteComboBox->setCurrentIndex(m_remoteComboBox->findData(
-                                       QVariant::fromValue(global->currentDefaultServer())));
+                   QVariant::fromValue(gitLabParameters().currentDefaultServer())));
 }
 
 void GitLabDialog::keyPressEvent(QKeyEvent *event)
@@ -198,8 +197,7 @@ void GitLabDialog::requestMainViewUpdate()
     if (!m_currentServerId.isValid())
         m_currentServerId = m_remoteComboBox->currentData().value<GitLabServer>().id;
     if (m_currentServerId.isValid()) {
-        const GitLabParameters *global = GitLabPlugin::globalParameters();
+        const GitLabServer server = gitLabParameters().serverForId(m_currentServerId);
-        const GitLabServer server = global->serverForId(m_currentServerId);
         m_remoteComboBox->setCurrentIndex(m_remoteComboBox->findData(QVariant::fromValue(server)));
     }
     m_remoteComboBox->setEnabled(!linked);

src/plugins/gitlab/gitlaboptionspage.cpp

@@ -132,7 +132,7 @@ void GitLabServerWidget::setGitLabServer(const GitLabServer &server)
 class GitLabOptionsWidget : public Core::IOptionsPageWidget
 {
 public:
-    explicit GitLabOptionsWidget(GitLabParameters *parameters);
+    GitLabOptionsWidget();
 
 private:
     void showEditServerDialog();
@@ -151,8 +151,8 @@ private:
     FilePathAspect m_curl;
 };
 
-GitLabOptionsWidget::GitLabOptionsWidget(GitLabParameters *params)
+GitLabOptionsWidget::GitLabOptionsWidget()
-    : m_parameters(params)
+    : m_parameters(&gitLabParameters())
 {
     auto defaultLabel = new QLabel(Tr::tr("Default:"), this);
     m_defaultGitLabServer = new QComboBox(this);
@@ -178,14 +178,14 @@ GitLabOptionsWidget::GitLabOptionsWidget(GitLabParameters *params)
         }, Column { m_add, m_edit, m_remove, st },
     }.attachTo(this);
 
-    m_curl.setValue(params->curl);
+    m_curl.setValue(m_parameters->curl);
 
-    for (const auto &gitLabServer : params->gitLabServers) {
+    for (const auto &gitLabServer : m_parameters->gitLabServers) {
         m_defaultGitLabServer->addItem(gitLabServer.displayString(),
                                        QVariant::fromValue(gitLabServer));
     }
 
-    const GitLabServer found = params->currentDefaultServer();
+    const GitLabServer found = m_parameters->currentDefaultServer();
     if (found.id.isValid()) {
         m_defaultGitLabServer->setCurrentIndex(m_defaultGitLabServer->findData(
                                                    QVariant::fromValue(found)));
@@ -298,12 +298,12 @@ void GitLabOptionsWidget::updateButtonsState()
 
 // GitLabOptionsPage
 
-GitLabOptionsPage::GitLabOptionsPage(GitLabParameters *p)
+GitLabOptionsPage::GitLabOptionsPage()
 {
     setId(Constants::GITLAB_SETTINGS);
     setDisplayName(Tr::tr("GitLab"));
     setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
-    setWidgetCreator([p] { return new GitLabOptionsWidget(p); });
+    setWidgetCreator([] { return new GitLabOptionsWidget; });
 }
 
 } // namespace GitLab

src/plugins/gitlab/gitlaboptionspage.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "gitlabparameters.h"
-
 #include <coreplugin/dialogs/ioptionspage.h>
 
 namespace GitLab {
@@ -14,7 +12,7 @@ namespace Constants { const char GITLAB_SETTINGS[] = "GitLab"; }
 class GitLabOptionsPage : public Core::IOptionsPage
 {
 public:
-    explicit GitLabOptionsPage(GitLabParameters *p);
+    GitLabOptionsPage();
 };
 
 } // GitLab

src/plugins/gitlab/gitlabparameters.cpp

@@ -3,6 +3,8 @@
 
 #include "gitlabparameters.h"
 
+#include <coreplugin/icore.h>
+
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcsettings.h>
@@ -202,4 +204,10 @@ GitLabServer GitLabParameters::serverForId(const Utils::Id &id) const
     });
 }
 
+GitLabParameters &gitLabParameters()
+{
+    static GitLabParameters theGitLabParameters;
+    return theGitLabParameters;
+}
+
 } // namespace GitLab

src/plugins/gitlab/gitlabparameters.h

@@ -74,6 +74,8 @@ public:
     Utils::FilePath curl;
 };
 
+GitLabParameters &gitLabParameters();
+
 } // namespace GitLab
 
 Q_DECLARE_METATYPE(GitLab::GitLabServer)

src/plugins/gitlab/gitlabplugin.cpp

@@ -45,13 +45,7 @@ public:
     void handleUser(const User &user);
     void handleEvents(const Events &events, const QDateTime &timeStamp);
 
-    void onSettingsChanged() {
+    GitLabOptionsPage optionsPage;
-        if (dialog)
-            dialog->updateRemotes();
-    }
-
-    GitLabParameters parameters;
-    GitLabOptionsPage optionsPage{&parameters};
     QHash<ProjectExplorer::Project *, GitLabProjectSettings *> projectSettings;
     QPointer<GitLabDialog> dialog;
 
@@ -80,7 +74,7 @@ GitLabPlugin::~GitLabPlugin()
 void GitLabPlugin::initialize()
 {
     dd = new GitLabPluginPrivate;
-    dd->parameters.fromSettings(Core::ICore::settings());
+    gitLabParameters().fromSettings(Core::ICore::settings());
 
     setupGitlabProjectPanel();
 
@@ -98,7 +92,7 @@ void GitLabPlugin::initialize()
 void GitLabPlugin::openView()
 {
     if (dd->dialog.isNull()) {
-        while (!dd->parameters.isValid()) {
+        while (!gitLabParameters().isValid()) {
             QMessageBox::warning(Core::ICore::dialogParent(), Tr::tr("Error"),
                                  Tr::tr("Invalid GitLab configuration. For a fully functional "
                                     "configuration, you need to set up host name or address and "
@@ -253,23 +247,6 @@ void GitLabPluginPrivate::handleEvents(const Events &events, const QDateTime &ti
         createAndSendEventsRequest(timeStamp, events.pageInfo.currentPage + 1);
 }
 
-QList<GitLabServer> GitLabPlugin::allGitLabServers()
-{
-    QTC_ASSERT(dd, return {});
-    return dd->parameters.gitLabServers;
-}
-
-GitLabServer GitLabPlugin::gitLabServerForId(const Utils::Id &id)
-{
-    QTC_ASSERT(dd, return {});
-    return dd->parameters.serverForId(id);
-}
-
-GitLabParameters *GitLabPlugin::globalParameters()
-{
-    return &dd->parameters;
-}
-
 GitLabProjectSettings *GitLabPlugin::projectSettings(ProjectExplorer::Project *project)
 {
     QTC_ASSERT(project, return nullptr);
@@ -280,17 +257,12 @@ GitLabProjectSettings *GitLabPlugin::projectSettings(ProjectExplorer::Project *p
     return settings;
 }
 
-GitLabOptionsPage *GitLabPlugin::optionsPage()
-{
-    QTC_ASSERT(dd, return {});
-    return &dd->optionsPage;
-}
-
 bool GitLabPlugin::handleCertificateIssue(const Utils::Id &serverId)
 {
     QTC_ASSERT(dd, return false);
 
-    GitLabServer server = dd->parameters.serverForId(serverId);
+    GitLabParameters &params = gitLabParameters();
+    GitLabServer server = params.serverForId(serverId);
     if (QMessageBox::question(Core::ICore::dialogParent(),
                               Tr::tr("Certificate Error"),
                               Tr::tr(
@@ -299,10 +271,12 @@ bool GitLabPlugin::handleCertificateIssue(const Utils::Id &serverId)
                                   "Note: This can expose you to man-in-the-middle attack.")
                               .arg(server.host))
             == QMessageBox::Yes) {
-        int index = dd->parameters.gitLabServers.indexOf(server);
+        int index = params.gitLabServers.indexOf(server);
         server.validateCert = false;
-        dd->parameters.gitLabServers.replace(index, server);
+        params.gitLabServers.replace(index, server);
-        dd->onSettingsChanged();
+        if (dd->dialog)
+            dd->dialog->updateRemotes();
+
         return true;
     }
     return false;

src/plugins/gitlab/gitlabplugin.h

@@ -13,7 +13,6 @@ namespace GitLab {
 
 class Events;
 class GitLabProjectSettings;
-class GitLabOptionsPage;
 
 class GitLabPlugin : public ExtensionSystem::IPlugin
 {
@@ -26,11 +25,7 @@ public:
 
     void initialize() override;
 
-    static QList<GitLabServer> allGitLabServers();
-    static GitLabServer gitLabServerForId(const Utils::Id &id);
-    static GitLabParameters *globalParameters();
     static GitLabProjectSettings *projectSettings(ProjectExplorer::Project *project);
-    static GitLabOptionsPage *optionsPage();
     static bool handleCertificateIssue(const Utils::Id &serverId);
 
     static void linkedStateChanged(bool enabled);

src/plugins/gitlab/gitlabprojectsettings.cpp

@@ -95,7 +95,7 @@ void GitLabProjectSettings::load()
     if (!m_id.isValid() || m_host.isEmpty())
         m_linked = false;
     else
-        m_linked = GitLabPlugin::globalParameters()->serverForId(m_id).id.isValid();
+        m_linked = gitLabParameters().serverForId(m_id).id.isValid();
 }
 
 void GitLabProjectSettings::save()
@@ -184,7 +184,7 @@ GitLabProjectSettingsWidget::GitLabProjectSettingsWidget(ProjectExplorer::Projec
     connect(m_hostCB, &QComboBox::currentIndexChanged, this, [this] {
         m_infoLabel->setVisible(false);
     });
-    connect(GitLabPlugin::globalParameters(), &GitLabParameters::changed,
+    connect(&gitLabParameters(), &GitLabParameters::changed,
             this, &GitLabProjectSettingsWidget::updateUi);
     updateUi();
 }
@@ -266,7 +266,7 @@ void GitLabProjectSettingsWidget::onConnectionChecked(const Project &project,
 void GitLabProjectSettingsWidget::updateUi()
 {
     m_linkedGitLabServer->clear();
-    const QList<GitLabServer> allServers = GitLabPlugin::allGitLabServers();
+    const QList<GitLabServer> allServers = gitLabParameters().gitLabServers;
     for (const GitLabServer &server : allServers) {
         const QString display = server.host + " (" + server.description + ')';
         m_linkedGitLabServer->addItem(display, QVariant::fromValue(server));
@@ -289,13 +289,13 @@ void GitLabProjectSettingsWidget::updateUi()
     const Utils::Id id = m_projectSettings->currentServer();
     const QString serverHost = m_projectSettings->currentServerHost();
     if (id.isValid()) {
-        const GitLabServer server = GitLabPlugin::gitLabServerForId(id);
+        const GitLabServer server = gitLabParameters().serverForId(id);
         auto [remoteHost, projName, port] = GitLabProjectSettings::remotePartsFromRemote(serverHost);
         if (server.id.isValid() && server.host == remoteHost) { // found config
             m_projectSettings->setLinked(true);
             m_hostCB->setCurrentIndex(m_hostCB->findData(QVariant::fromValue(serverHost)));
             m_linkedGitLabServer->setCurrentIndex(
-                        m_linkedGitLabServer->findData(QVariant::fromValue(server)));
+                m_linkedGitLabServer->findData(QVariant::fromValue(server)));
             GitLabPlugin::linkedStateChanged(true);
         } else {
             m_projectSettings->setLinked(false);

src/plugins/gitlab/queryrunner.cpp

@@ -83,8 +83,7 @@ QString Query::toString() const
 QueryRunner::QueryRunner(const Query &query, const Id &id, QObject *parent)
     : QObject(parent)
 {
-    const GitLabParameters *p = GitLabPlugin::globalParameters();
+    const auto server = gitLabParameters().serverForId(id);
-    const auto server = p->serverForId(id);
     QStringList args = server.curlArguments();
     if (query.hasPaginatedResults())
         args << "-i";
@@ -95,7 +94,7 @@ QueryRunner::QueryRunner(const Query &query, const Id &id, QObject *parent)
         url.append(':' + QString::number(server.port));
     url += query.toString();
     args << url;
-    m_process.setCommand({p->curl, args});
+    m_process.setCommand({gitLabParameters().curl, args});
     connect(&m_process, &Process::done, this, [this, id] {
         if (m_process.result() != ProcessResult::FinishedWithSuccess) {
             const int exitCode = m_process.exitCode();