diff options
author | hjk <hjk@qt.io> | 2018-02-02 10:08:21 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-02-06 11:58:15 +0000 |
commit | 713b8636ea740502597b79b1a74382d1b3a70ab6 (patch) | |
tree | a1ece14ba7f98d1fa2ce01e4880c707dc5a74082 /src/plugins/mercurial | |
parent | e7792f8f50b21889f727884ab8b94cb87f38169e (diff) |
Vcs/Text search: Remove a few addAutoReleaseObject uses
Using a QObject parent suffices here.
Change-Id: I4dc5448511d55bf14fbd8f810e91336a49e94094
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r-- | src/plugins/mercurial/mercurialplugin.cpp | 11 | ||||
-rw-r--r-- | src/plugins/mercurial/optionspage.cpp | 4 | ||||
-rw-r--r-- | src/plugins/mercurial/optionspage.h | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 0cf0dcbfb5..12accd6747 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -124,7 +124,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString * m_client = new MercurialClient; auto vc = initializeVcs<MercurialControl>(context, m_client); - addAutoReleasedObject(new OptionsPage(vc)); + new OptionsPage(vc, this); connect(m_client, &VcsBaseClient::changed, vc, &MercurialControl::changed); connect(m_client, &MercurialClient::needUpdate, this, &MercurialPlugin::update); @@ -135,14 +135,13 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString * const int editorCount = sizeof(editorParameters)/sizeof(editorParameters[0]); const auto widgetCreator = []() { return new MercurialEditorWidget; }; for (int i = 0; i < editorCount; i++) - addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc)); + new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc, this); - addAutoReleasedObject(new VcsSubmitEditorFactory(&submitEditorParameters, - []() { return new CommitEditor(&submitEditorParameters); })); + new VcsSubmitEditorFactory(&submitEditorParameters, + []() { return new CommitEditor(&submitEditorParameters); }, this); const QString prefix = QLatin1String("hg"); - m_commandLocator = new Core::CommandLocator("Mercurial", prefix, prefix); - addAutoReleasedObject(m_commandLocator); + m_commandLocator = new Core::CommandLocator("Mercurial", prefix, prefix, this); createMenu(context); diff --git a/src/plugins/mercurial/optionspage.cpp b/src/plugins/mercurial/optionspage.cpp index 541d883c89..06f0ea1bb4 100644 --- a/src/plugins/mercurial/optionspage.cpp +++ b/src/plugins/mercurial/optionspage.cpp @@ -68,8 +68,8 @@ void OptionsPageWidget::setSettings(const VcsBaseClientSettings &s) m_ui.timeout->setValue(s.intValue(MercurialSettings::timeoutKey)); } -OptionsPage::OptionsPage(Core::IVersionControl *control) : - VcsClientOptionsPage(control, MercurialPlugin::client()) +OptionsPage::OptionsPage(Core::IVersionControl *control, QObject *parent) : + VcsClientOptionsPage(control, MercurialPlugin::client(), parent) { setId(VcsBase::Constants::VCS_ID_MERCURIAL); setDisplayName(tr("Mercurial")); diff --git a/src/plugins/mercurial/optionspage.h b/src/plugins/mercurial/optionspage.h index e8f181d907..625eeb30f5 100644 --- a/src/plugins/mercurial/optionspage.h +++ b/src/plugins/mercurial/optionspage.h @@ -53,7 +53,7 @@ class OptionsPage : public VcsBase::VcsClientOptionsPage Q_OBJECT public: - OptionsPage(Core::IVersionControl *control); + OptionsPage(Core::IVersionControl *control, QObject *parent); }; } // namespace Internal |