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 | |
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>
34 files changed, 80 insertions, 79 deletions
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index d3425a7b5c1..8d6b62e29c5 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -157,7 +157,7 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag auto vcsCtrl = initializeVcs<BazaarControl>(context, m_client); connect(m_client, &VcsBaseClient::changed, vcsCtrl, &BazaarControl::changed); - addAutoReleasedObject(new OptionsPage(vcsCtrl)); + new OptionsPage(vcsCtrl, this); const auto describeFunc = [this](const QString &source, const QString &id) { m_client->view(source, id); @@ -165,14 +165,13 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag const int editorCount = sizeof(editorParameters) / sizeof(VcsBaseEditorParameters); const auto widgetCreator = []() { return new BazaarEditorWidget; }; 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); })); + (void) new VcsSubmitEditorFactory(&submitEditorParameters, + []() { return new CommitEditor(&submitEditorParameters); }, this); const QString prefix = QLatin1String("bzr"); - m_commandLocator = new CommandLocator("Bazaar", prefix, prefix); - addAutoReleasedObject(m_commandLocator); + m_commandLocator = new CommandLocator("Bazaar", prefix, prefix, this); createMenu(context); diff --git a/src/plugins/bazaar/optionspage.cpp b/src/plugins/bazaar/optionspage.cpp index 74078b88247..877a7e6dc40 100644 --- a/src/plugins/bazaar/optionspage.cpp +++ b/src/plugins/bazaar/optionspage.cpp @@ -65,8 +65,8 @@ void OptionsPageWidget::setSettings(const VcsBaseClientSettings &s) m_ui.timeout->setValue(s.intValue(BazaarSettings::timeoutKey)); } -OptionsPage::OptionsPage(Core::IVersionControl *control) : - VcsClientOptionsPage(control, BazaarPlugin::instance()->client()) +OptionsPage::OptionsPage(Core::IVersionControl *control, QObject *parent) : + VcsClientOptionsPage(control, BazaarPlugin::instance()->client(), parent) { setId(VcsBase::Constants::VCS_ID_BAZAAR); setDisplayName(tr("Bazaar")); diff --git a/src/plugins/bazaar/optionspage.h b/src/plugins/bazaar/optionspage.h index 246a277eb3f..6d981e8df2f 100644 --- a/src/plugins/bazaar/optionspage.h +++ b/src/plugins/bazaar/optionspage.h @@ -54,7 +54,7 @@ class OptionsPage : public VcsBase::VcsClientOptionsPage Q_OBJECT public: - OptionsPage(Core::IVersionControl *control); + OptionsPage(Core::IVersionControl *control, QObject *parent); }; } // namespace Internal diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 266a56e18e3..bcc1bd40f13 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -423,10 +423,10 @@ bool ClearCasePlugin::initialize(const QStringList & /*arguments */, QString *er connect(SessionManager::instance(), &SessionManager::startupProjectChanged, this, &ClearCasePlugin::projectChanged); - addAutoReleasedObject(new SettingsPage); + new SettingsPage(this); - addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters, - []() { return new ClearCaseSubmitEditor(&submitParameters); })); + new VcsSubmitEditorFactory(&submitParameters, + []() { return new ClearCaseSubmitEditor(&submitParameters); }, this); // any editor responds to describe (when clicking a version) const auto describeFunc = [this](const QString &source, const QString &changeNr) { @@ -435,13 +435,12 @@ bool ClearCasePlugin::initialize(const QStringList & /*arguments */, QString *er const int editorCount = sizeof(editorParameters)/sizeof(VcsBaseEditorParameters); const auto widgetCreator = []() { return new ClearCaseEditorWidget; }; for (int i = 0; i < editorCount; i++) - addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc)); + new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc, this); const QString description = QLatin1String("ClearCase"); const QString prefix = QLatin1String("cc"); // register cc prefix in Locator - m_commandLocator = new CommandLocator("cc", description, prefix); - addAutoReleasedObject(m_commandLocator); + m_commandLocator = new CommandLocator("cc", description, prefix, this); //register actions ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS); diff --git a/src/plugins/clearcase/settingspage.cpp b/src/plugins/clearcase/settingspage.cpp index 1f679a2a419..8414e0eaf00 100644 --- a/src/plugins/clearcase/settingspage.cpp +++ b/src/plugins/clearcase/settingspage.cpp @@ -104,7 +104,8 @@ void SettingsPageWidget::setSettings(const ClearCaseSettings &s) m_ui.indexOnlyVOBsEdit->setText(s.indexOnlyVOBs); } -SettingsPage::SettingsPage() +SettingsPage::SettingsPage(QObject *parent) + : VcsBaseOptionsPage(parent) { setId(ClearCase::Constants::VCS_ID_CLEARCASE); setDisplayName(tr("ClearCase")); diff --git a/src/plugins/clearcase/settingspage.h b/src/plugins/clearcase/settingspage.h index 257cc58faa5..cb8a96b81a9 100644 --- a/src/plugins/clearcase/settingspage.h +++ b/src/plugins/clearcase/settingspage.h @@ -57,7 +57,7 @@ class SettingsPage : public VcsBase::VcsBaseOptionsPage Q_OBJECT public: - SettingsPage(); + explicit SettingsPage(QObject *parent); QWidget *widget() override; void apply() override; diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 4341625c93c..3dbc5a8a598 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -204,10 +204,10 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage) m_client = new CvsClient; - addAutoReleasedObject(new SettingsPage(versionControl())); + new SettingsPage(versionControl(), this); - addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters, - []() { return new CvsSubmitEditor(&submitParameters); })); + new VcsSubmitEditorFactory(&submitParameters, + []() { return new CvsSubmitEditor(&submitParameters); }, this); const auto describeFunc = [this](const QString &source, const QString &changeNr) { QString errorMessage; @@ -217,11 +217,10 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage) const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]); const auto widgetCreator = []() { return new CvsEditorWidget; }; for (int i = 0; i < editorCount; i++) - addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc)); + new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc, this); const QString prefix = QLatin1String("cvs"); - m_commandLocator = new CommandLocator("CVS", prefix, prefix); - addAutoReleasedObject(m_commandLocator); + m_commandLocator = new CommandLocator("CVS", prefix, prefix, this); // Register actions ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS); diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp index 385ad586992..cf47b8a8b81 100644 --- a/src/plugins/cvs/settingspage.cpp +++ b/src/plugins/cvs/settingspage.cpp @@ -72,8 +72,8 @@ void SettingsPageWidget::setSettings(const VcsBaseClientSettings &s) m_ui.describeByCommitIdCheckBox->setChecked(s.boolValue(CvsSettings::describeByCommitIdKey)); } -SettingsPage::SettingsPage(Core::IVersionControl *control) : - VcsClientOptionsPage(control, CvsPlugin::instance()->client()) +SettingsPage::SettingsPage(Core::IVersionControl *control, QObject *parent) : + VcsClientOptionsPage(control, CvsPlugin::instance()->client(), parent) { setId(VcsBase::Constants::VCS_ID_CVS); setDisplayName(tr("CVS")); diff --git a/src/plugins/cvs/settingspage.h b/src/plugins/cvs/settingspage.h index cf1c08ee40d..a36fdd1f922 100644 --- a/src/plugins/cvs/settingspage.h +++ b/src/plugins/cvs/settingspage.h @@ -54,7 +54,7 @@ class SettingsPage : public VcsBase::VcsClientOptionsPage Q_OBJECT public: - SettingsPage(Core::IVersionControl *control); + SettingsPage(Core::IVersionControl *control, QObject *parent); }; } // namespace Cvs diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index be3e390318e..5e078d3c8e6 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -293,7 +293,7 @@ bool GerritPlugin::initialize(ActionContainer *ac) connect(pushAction, &QAction::triggered, this, [this]() { push(); }); ac->addAction(m_pushToGerritCommand); - GitPlugin::instance()->addAutoReleasedObject(new GerritOptionsPage(m_parameters)); + new GerritOptionsPage(m_parameters, this); return true; } diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp index 59b1fb95663..6854df7e469 100644 --- a/src/plugins/git/gitgrep.cpp +++ b/src/plugins/git/gitgrep.cpp @@ -218,7 +218,8 @@ static bool isGitDirectory(const QString &path) return gitVc == VcsManager::findVersionControlForDirectory(path, 0); } -GitGrep::GitGrep() +GitGrep::GitGrep(QObject *parent) + : SearchEngine(parent) { m_widget = new QWidget; auto layout = new QHBoxLayout(m_widget); diff --git a/src/plugins/git/gitgrep.h b/src/plugins/git/gitgrep.h index 9d24e88fc8f..af7a40ca304 100644 --- a/src/plugins/git/gitgrep.h +++ b/src/plugins/git/gitgrep.h @@ -39,7 +39,7 @@ class GitGrep : public TextEditor::SearchEngine Q_DECLARE_TR_FUNCTIONS(GitGrep) public: - GitGrep(); + explicit GitGrep(QObject *parent); ~GitGrep() override; QString title() const override; QString toolTip() const override; diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 9979fc49229..ddab8cd2fed 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -299,12 +299,11 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) auto vc = initializeVcs<GitVersionControl>(context, m_gitClient); // Create the settings Page - auto settingsPage = new SettingsPage(vc); - addAutoReleasedObject(settingsPage); + auto settingsPage = new SettingsPage(vc, this); connect(settingsPage, &SettingsPage::settingsChanged, this, &GitPlugin::updateRepositoryBrowserAction); - addAutoReleasedObject(new GitGrep); + new GitGrep(this); const auto describeFunc = [this](const QString &source, const QString &id) { m_gitClient->show(source, id); @@ -312,14 +311,13 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]); const auto widgetCreator = []() { return new GitEditorWidget; }; for (int i = 0; i < editorCount; i++) - addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc)); + new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc, this); - addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters, - []() { return new GitSubmitEditor(&submitParameters); })); + new VcsSubmitEditorFactory(&submitParameters, + []() { return new GitSubmitEditor(&submitParameters); }, this); const QString prefix = "git"; - m_commandLocator = new CommandLocator("Git", prefix, prefix); - addAutoReleasedObject(m_commandLocator); + m_commandLocator = new CommandLocator("Git", prefix, prefix, this); //register actions ActionContainer *toolsContainer = ActionManager::actionContainer(Core::Constants::M_TOOLS); diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp index 1f28de70f0f..123d4d29380 100644 --- a/src/plugins/git/settingspage.cpp +++ b/src/plugins/git/settingspage.cpp @@ -106,8 +106,8 @@ void SettingsPageWidget::updateNoteField() } // -------- SettingsPage -SettingsPage::SettingsPage(Core::IVersionControl *control) : - VcsClientOptionsPage(control, GitPlugin::client()) +SettingsPage::SettingsPage(Core::IVersionControl *control, QObject *parent) : + VcsClientOptionsPage(control, GitPlugin::client(), parent) { setId(VcsBase::Constants::VCS_ID_GIT); setDisplayName(tr("Git")); diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h index 3e2ca9087d6..187cf75af9e 100644 --- a/src/plugins/git/settingspage.h +++ b/src/plugins/git/settingspage.h @@ -59,7 +59,7 @@ class SettingsPage : public VcsBase::VcsClientOptionsPage Q_OBJECT public: - SettingsPage(Core::IVersionControl *control); + SettingsPage(Core::IVersionControl *control, QObject *parent); void apply() override; }; diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 0cf0dcbfb57..12accd67475 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 541d883c89a..06f0ea1bb4d 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 e8f181d9079..625eeb30f5f 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 diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index d97e4fc2a81..4a2b46755be 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -189,11 +189,11 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er m_settings.fromSettings(ICore::settings()); - addAutoReleasedObject(new SettingsPage); + new SettingsPage(this); // Editor factories - addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters, - []() { return new PerforceSubmitEditor(&submitParameters); })); + new VcsSubmitEditorFactory(&submitParameters, + []() { return new PerforceSubmitEditor(&submitParameters); }, this); const auto describeFunc = [this](const QString &source, const QString &n) { describe(source, n); @@ -201,11 +201,10 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]); const auto widgetCreator = []() { return new PerforceEditorWidget; }; for (int i = 0; i < editorCount; i++) - addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc)); + new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc, this); const QString prefix = QLatin1String("p4"); - m_commandLocator = new CommandLocator("Perforce", prefix, prefix); - addAutoReleasedObject(m_commandLocator); + m_commandLocator = new CommandLocator("Perforce", prefix, prefix, this); ActionContainer *mtools = ActionManager::actionContainer(Core::Constants::M_TOOLS); diff --git a/src/plugins/perforce/settingspage.cpp b/src/plugins/perforce/settingspage.cpp index 4a9678901c3..933ea07b80c 100644 --- a/src/plugins/perforce/settingspage.cpp +++ b/src/plugins/perforce/settingspage.cpp @@ -117,7 +117,8 @@ void SettingsPageWidget::setStatusError(const QString &t) m_ui.errorLabel->setText(t); } -SettingsPage::SettingsPage() +SettingsPage::SettingsPage(QObject *parent) + : VcsBaseOptionsPage(parent) { setId(VcsBase::Constants::VCS_ID_PERFORCE); setDisplayName(tr("Perforce")); diff --git a/src/plugins/perforce/settingspage.h b/src/plugins/perforce/settingspage.h index 4fb6dc903b3..db8fdad75f8 100644 --- a/src/plugins/perforce/settingspage.h +++ b/src/plugins/perforce/settingspage.h @@ -64,7 +64,7 @@ class SettingsPage : public VcsBase::VcsBaseOptionsPage Q_OBJECT public: - SettingsPage(); + explicit SettingsPage(QObject *parent); ~SettingsPage() override; QWidget *widget() override; diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp index a19c37e3af3..bb18277acdd 100644 --- a/src/plugins/silversearcher/findinfilessilversearcher.cpp +++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp @@ -132,8 +132,9 @@ void runSilverSeacher(FutureInterfaceType &fi, FileFindParameters parameters) namespace SilverSearcher { -FindInFilesSilverSearcher::FindInFilesSilverSearcher() - : m_widget(0), +FindInFilesSilverSearcher::FindInFilesSilverSearcher(QObject *parent) + : SearchEngine(parent), + m_widget(0), m_path("ag"), m_toolName("SilverSearcher") { diff --git a/src/plugins/silversearcher/findinfilessilversearcher.h b/src/plugins/silversearcher/findinfilessilversearcher.h index d290069cd5b..d2d6790c1b7 100644 --- a/src/plugins/silversearcher/findinfilessilversearcher.h +++ b/src/plugins/silversearcher/findinfilessilversearcher.h @@ -39,7 +39,7 @@ class FindInFilesSilverSearcher : public TextEditor::SearchEngine Q_OBJECT public: - FindInFilesSilverSearcher(); + explicit FindInFilesSilverSearcher(QObject *parent); ~FindInFilesSilverSearcher() override; // TextEditor::FileFindExtension diff --git a/src/plugins/silversearcher/silversearcherplugin.cpp b/src/plugins/silversearcher/silversearcherplugin.cpp index 7b26ddd4f96..3d3ecca4e88 100644 --- a/src/plugins/silversearcher/silversearcherplugin.cpp +++ b/src/plugins/silversearcher/silversearcherplugin.cpp @@ -35,7 +35,7 @@ bool SilverSearcherPlugin::initialize(const QStringList &arguments, QString *err Q_UNUSED(arguments) Q_UNUSED(errorString) - addAutoReleasedObject(new FindInFilesSilverSearcher); + new FindInFilesSilverSearcher(this); return true; } diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp index c6a0dbed571..2ffee34344b 100644 --- a/src/plugins/subversion/settingspage.cpp +++ b/src/plugins/subversion/settingspage.cpp @@ -80,8 +80,8 @@ void SettingsPageWidget::setSettings(const VcsBaseClientSettings &s) m_ui.logCountSpinBox->setValue(s.intValue(SubversionSettings::logCountKey)); } -SettingsPage::SettingsPage(Core::IVersionControl *control) : - VcsClientOptionsPage(control, SubversionPlugin::instance()->client()) +SettingsPage::SettingsPage(Core::IVersionControl *control, QObject *parent) : + VcsClientOptionsPage(control, SubversionPlugin::instance()->client(), parent) { setId(VcsBase::Constants::VCS_ID_SUBVERSION); setDisplayName(tr("Subversion")); diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h index d5323940278..e23e4176ff7 100644 --- a/src/plugins/subversion/settingspage.h +++ b/src/plugins/subversion/settingspage.h @@ -56,7 +56,7 @@ class SettingsPage : public VcsBase::VcsClientOptionsPage Q_OBJECT public: - SettingsPage(Core::IVersionControl *control); + SettingsPage(Core::IVersionControl *control, QObject *parent); }; } // namespace Subversion diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 7748a08c4de..8084e37603d 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -216,10 +216,10 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e m_client = new SubversionClient; - addAutoReleasedObject(new SettingsPage(versionControl())); + new SettingsPage(versionControl(), this); - addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters, - []() { return new SubversionSubmitEditor(&submitParameters); })); + new VcsSubmitEditorFactory(&submitParameters, + []() { return new SubversionSubmitEditor(&submitParameters); }, this); const auto describeFunc = [this](const QString &source, const QString &id) { describe(source, id); @@ -227,11 +227,10 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]); const auto widgetCreator = []() { return new SubversionEditorWidget; }; for (int i = 0; i < editorCount; i++) - addAutoReleasedObject(new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc)); + new VcsEditorFactory(editorParameters + i, widgetCreator, describeFunc, this); const QString prefix = QLatin1String("svn"); - m_commandLocator = new CommandLocator("Subversion", prefix, prefix); - addAutoReleasedObject(m_commandLocator); + m_commandLocator = new CommandLocator("Subversion", prefix, prefix, this); // Register actions ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS); diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index b176e6c46ea..ab29b58cff4 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -157,8 +157,8 @@ static void updateComboEntries(QComboBox *combo, bool onTop) using namespace Internal; -SearchEngine::SearchEngine() - : d(new SearchEnginePrivate) +SearchEngine::SearchEngine(QObject *parent) + : QObject(parent), d(new SearchEnginePrivate) { } diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h index d921b4f2f05..222dfd4e879 100644 --- a/src/plugins/texteditor/basefilefind.h +++ b/src/plugins/texteditor/basefilefind.h @@ -65,7 +65,7 @@ class TEXTEDITOR_EXPORT SearchEngine : public QObject { Q_OBJECT public: - SearchEngine(); + SearchEngine(QObject *parent = nullptr); ~SearchEngine(); virtual QString title() const = 0; virtual QString toolTip() const = 0; // add %1 placeholder where the find flags should be put diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp index 84edc570926..4c4083a431e 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.cpp +++ b/src/plugins/vcsbase/basevcseditorfactory.cpp @@ -52,7 +52,8 @@ namespace VcsBase { VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters *parameters, // Force copy, see QTCREATORBUG-13218 const EditorWidgetCreator editorWidgetCreator, - std::function<void(const QString &, const QString &)> describeFunc) + std::function<void(const QString &, const QString &)> describeFunc, QObject *parent) + : TextEditorFactory(parent) { setProperty("VcsEditorFactoryName", QByteArray(parameters->id)); setId(parameters->id); diff --git a/src/plugins/vcsbase/basevcseditorfactory.h b/src/plugins/vcsbase/basevcseditorfactory.h index 8c2b8cbdf67..362e2bf8db4 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.h +++ b/src/plugins/vcsbase/basevcseditorfactory.h @@ -42,7 +42,8 @@ class VCSBASE_EXPORT VcsEditorFactory : public TextEditor::TextEditorFactory public: VcsEditorFactory(const VcsBaseEditorParameters *parameters, const EditorWidgetCreator editorWidgetCreator, - std::function<void(const QString &, const QString &)> describeFunc); + std::function<void(const QString &, const QString &)> describeFunc, + QObject *parent = nullptr); static VcsBaseEditor *createEditorById(const char *id); }; diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp index a87808448b6..b2d05a28353 100644 --- a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp +++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp @@ -29,8 +29,10 @@ namespace VcsBase { VcsSubmitEditorFactory::VcsSubmitEditorFactory - (const VcsBaseSubmitEditorParameters *parameters, const EditorCreator &editorCreator) - : m_editorCreator(editorCreator) + (const VcsBaseSubmitEditorParameters *parameters, + const EditorCreator &editorCreator, + QObject *parent) + : IEditorFactory(parent), m_editorCreator(editorCreator) { setId(parameters->id); setDisplayName(QLatin1String(parameters->displayName)); diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.h b/src/plugins/vcsbase/basevcssubmiteditorfactory.h index e449aed47d9..da2e6ffaa91 100644 --- a/src/plugins/vcsbase/basevcssubmiteditorfactory.h +++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.h @@ -44,7 +44,9 @@ class VCSBASE_EXPORT VcsSubmitEditorFactory : public Core::IEditorFactory public: typedef std::function<VcsBaseSubmitEditor *()> EditorCreator; - VcsSubmitEditorFactory(const VcsBaseSubmitEditorParameters *parameters, const EditorCreator &editorCreator); + VcsSubmitEditorFactory(const VcsBaseSubmitEditorParameters *parameters, + const EditorCreator &editorCreator, + QObject *parent = nullptr); Core::IEditor *createEditor() override; diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp index fca87852e44..43fa11b729d 100644 --- a/src/plugins/vcsbase/vcsplugin.cpp +++ b/src/plugins/vcsbase/vcsplugin.cpp @@ -85,7 +85,6 @@ bool VcsPlugin::initialize(const QStringList &arguments, QString *errorMessage) }); m_settingsPage = new CommonOptionsPage; - addAutoReleasedObject(m_settingsPage); addAutoReleasedObject(VcsOutputWindow::instance()); connect(m_settingsPage, &CommonOptionsPage::settingsChanged, this, &VcsPlugin::settingsChanged); |