diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 8ffc7a6d447..3b46022e771 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -152,16 +152,15 @@ void FetchContext::checkout() GitClient::instance()->checkout(m_repository, "FETCH_HEAD"); } -GerritPlugin::GerritPlugin(QObject *parent) - : QObject(parent) - , m_parameters(new GerritParameters) +GerritPlugin::GerritPlugin() + : m_parameters(new GerritParameters) , m_server(new GerritServer) { } GerritPlugin::~GerritPlugin() = default; -void GerritPlugin::initialize(ActionContainer *ac) +void GerritPlugin::addToMenu(ActionContainer *ac) { m_parameters->fromSettings(ICore::settings()); diff --git a/src/plugins/git/gerrit/gerritplugin.h b/src/plugins/git/gerrit/gerritplugin.h index 77d96d9f74a..8de02570827 100644 --- a/src/plugins/git/gerrit/gerritplugin.h +++ b/src/plugins/git/gerrit/gerritplugin.h @@ -29,11 +29,12 @@ class GerritServer; class GerritPlugin : public QObject { Q_OBJECT + public: - explicit GerritPlugin(QObject *parent = nullptr); + GerritPlugin(); ~GerritPlugin() override; - void initialize(Core::ActionContainer *ac); + void addToMenu(Core::ActionContainer *ac); static Utils::FilePath gitBinDirectory(); static QString branch(const Utils::FilePath &repository); diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 1ef47ff6669..a9d1cb0c6f2 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -418,7 +418,7 @@ public: QVector m_projectActions; QVector m_repositoryActions; ParameterAction *m_applyCurrentFilePatchAction = nullptr; - Gerrit::Internal::GerritPlugin *m_gerritPlugin = nullptr; + Gerrit::Internal::GerritPlugin m_gerritPlugin; GitSettings m_settings; GitClient m_gitClient{&m_settings}; @@ -1065,10 +1065,9 @@ GitPluginPrivate::GitPluginPrivate() this, &GitPluginPrivate::updateBranches, Qt::QueuedConnection); /* "Gerrit" */ - m_gerritPlugin = new Gerrit::Internal::GerritPlugin(this); - m_gerritPlugin->initialize(remoteRepositoryMenu); - m_gerritPlugin->updateActions(currentState()); - m_gerritPlugin->addToLocator(m_commandLocator); + m_gerritPlugin.addToMenu(remoteRepositoryMenu); + m_gerritPlugin.updateActions(currentState()); + m_gerritPlugin.addToLocator(m_commandLocator); connect(&m_settings, &AspectContainer::applied, this, &GitPluginPrivate::onApplySettings); @@ -1927,7 +1926,7 @@ void GitPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as) updateContinueAndAbortCommands(); updateRepositoryBrowserAction(); - m_gerritPlugin->updateActions(state); + m_gerritPlugin.updateActions(state); } void GitPluginPrivate::updateContinueAndAbortCommands() @@ -1965,7 +1964,7 @@ void GitPluginPrivate::updateContinueAndAbortCommands() void GitPluginPrivate::delayedPushToGerrit() { - m_gerritPlugin->push(m_submitRepository); + m_gerritPlugin.push(m_submitRepository); } void GitPluginPrivate::updateBranches(const FilePath &repository) @@ -2172,7 +2171,7 @@ void GitPlugin::updateBranches(const FilePath &repository) void GitPlugin::gerritPush(const FilePath &topLevel) { - dd->m_gerritPlugin->push(topLevel); + dd->m_gerritPlugin.push(topLevel); } bool GitPlugin::isCommitEditorOpen()