Vcs/Text search: Remove a few addAutoReleaseObject uses

Using a QObject parent suffices here.

Change-Id: I4dc5448511d55bf14fbd8f810e91336a49e94094
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2018-02-02 10:08:21 +01:00
parent e7792f8f50
commit 713b8636ea
34 changed files with 80 additions and 79 deletions

View File

@@ -157,7 +157,7 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag
auto vcsCtrl = initializeVcs<BazaarControl>(context, m_client); auto vcsCtrl = initializeVcs<BazaarControl>(context, m_client);
connect(m_client, &VcsBaseClient::changed, vcsCtrl, &BazaarControl::changed); 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) { const auto describeFunc = [this](const QString &source, const QString &id) {
m_client->view(source, 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 int editorCount = sizeof(editorParameters) / sizeof(VcsBaseEditorParameters);
const auto widgetCreator = []() { return new BazaarEditorWidget; }; const auto widgetCreator = []() { return new BazaarEditorWidget; };
for (int i = 0; i < editorCount; i++) 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, (void) new VcsSubmitEditorFactory(&submitEditorParameters,
[]() { return new CommitEditor(&submitEditorParameters); })); []() { return new CommitEditor(&submitEditorParameters); }, this);
const QString prefix = QLatin1String("bzr"); const QString prefix = QLatin1String("bzr");
m_commandLocator = new CommandLocator("Bazaar", prefix, prefix); m_commandLocator = new CommandLocator("Bazaar", prefix, prefix, this);
addAutoReleasedObject(m_commandLocator);
createMenu(context); createMenu(context);

View File

@@ -65,8 +65,8 @@ void OptionsPageWidget::setSettings(const VcsBaseClientSettings &s)
m_ui.timeout->setValue(s.intValue(BazaarSettings::timeoutKey)); m_ui.timeout->setValue(s.intValue(BazaarSettings::timeoutKey));
} }
OptionsPage::OptionsPage(Core::IVersionControl *control) : OptionsPage::OptionsPage(Core::IVersionControl *control, QObject *parent) :
VcsClientOptionsPage(control, BazaarPlugin::instance()->client()) VcsClientOptionsPage(control, BazaarPlugin::instance()->client(), parent)
{ {
setId(VcsBase::Constants::VCS_ID_BAZAAR); setId(VcsBase::Constants::VCS_ID_BAZAAR);
setDisplayName(tr("Bazaar")); setDisplayName(tr("Bazaar"));

View File

@@ -54,7 +54,7 @@ class OptionsPage : public VcsBase::VcsClientOptionsPage
Q_OBJECT Q_OBJECT
public: public:
OptionsPage(Core::IVersionControl *control); OptionsPage(Core::IVersionControl *control, QObject *parent);
}; };
} // namespace Internal } // namespace Internal

View File

@@ -423,10 +423,10 @@ bool ClearCasePlugin::initialize(const QStringList & /*arguments */, QString *er
connect(SessionManager::instance(), &SessionManager::startupProjectChanged, connect(SessionManager::instance(), &SessionManager::startupProjectChanged,
this, &ClearCasePlugin::projectChanged); this, &ClearCasePlugin::projectChanged);
addAutoReleasedObject(new SettingsPage); new SettingsPage(this);
addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters, new VcsSubmitEditorFactory(&submitParameters,
[]() { return new ClearCaseSubmitEditor(&submitParameters); })); []() { return new ClearCaseSubmitEditor(&submitParameters); }, this);
// any editor responds to describe (when clicking a version) // any editor responds to describe (when clicking a version)
const auto describeFunc = [this](const QString &source, const QString &changeNr) { 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 int editorCount = sizeof(editorParameters)/sizeof(VcsBaseEditorParameters);
const auto widgetCreator = []() { return new ClearCaseEditorWidget; }; const auto widgetCreator = []() { return new ClearCaseEditorWidget; };
for (int i = 0; i < editorCount; i++) 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 description = QLatin1String("ClearCase");
const QString prefix = QLatin1String("cc"); const QString prefix = QLatin1String("cc");
// register cc prefix in Locator // register cc prefix in Locator
m_commandLocator = new CommandLocator("cc", description, prefix); m_commandLocator = new CommandLocator("cc", description, prefix, this);
addAutoReleasedObject(m_commandLocator);
//register actions //register actions
ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS); ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS);

View File

@@ -104,7 +104,8 @@ void SettingsPageWidget::setSettings(const ClearCaseSettings &s)
m_ui.indexOnlyVOBsEdit->setText(s.indexOnlyVOBs); m_ui.indexOnlyVOBsEdit->setText(s.indexOnlyVOBs);
} }
SettingsPage::SettingsPage() SettingsPage::SettingsPage(QObject *parent)
: VcsBaseOptionsPage(parent)
{ {
setId(ClearCase::Constants::VCS_ID_CLEARCASE); setId(ClearCase::Constants::VCS_ID_CLEARCASE);
setDisplayName(tr("ClearCase")); setDisplayName(tr("ClearCase"));

View File

@@ -57,7 +57,7 @@ class SettingsPage : public VcsBase::VcsBaseOptionsPage
Q_OBJECT Q_OBJECT
public: public:
SettingsPage(); explicit SettingsPage(QObject *parent);
QWidget *widget() override; QWidget *widget() override;
void apply() override; void apply() override;

View File

@@ -204,10 +204,10 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
m_client = new CvsClient; m_client = new CvsClient;
addAutoReleasedObject(new SettingsPage(versionControl())); new SettingsPage(versionControl(), this);
addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters, new VcsSubmitEditorFactory(&submitParameters,
[]() { return new CvsSubmitEditor(&submitParameters); })); []() { return new CvsSubmitEditor(&submitParameters); }, this);
const auto describeFunc = [this](const QString &source, const QString &changeNr) { const auto describeFunc = [this](const QString &source, const QString &changeNr) {
QString errorMessage; QString errorMessage;
@@ -217,11 +217,10 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]); const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]);
const auto widgetCreator = []() { return new CvsEditorWidget; }; const auto widgetCreator = []() { return new CvsEditorWidget; };
for (int i = 0; i < editorCount; i++) 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"); const QString prefix = QLatin1String("cvs");
m_commandLocator = new CommandLocator("CVS", prefix, prefix); m_commandLocator = new CommandLocator("CVS", prefix, prefix, this);
addAutoReleasedObject(m_commandLocator);
// Register actions // Register actions
ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS); ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS);

View File

@@ -72,8 +72,8 @@ void SettingsPageWidget::setSettings(const VcsBaseClientSettings &s)
m_ui.describeByCommitIdCheckBox->setChecked(s.boolValue(CvsSettings::describeByCommitIdKey)); m_ui.describeByCommitIdCheckBox->setChecked(s.boolValue(CvsSettings::describeByCommitIdKey));
} }
SettingsPage::SettingsPage(Core::IVersionControl *control) : SettingsPage::SettingsPage(Core::IVersionControl *control, QObject *parent) :
VcsClientOptionsPage(control, CvsPlugin::instance()->client()) VcsClientOptionsPage(control, CvsPlugin::instance()->client(), parent)
{ {
setId(VcsBase::Constants::VCS_ID_CVS); setId(VcsBase::Constants::VCS_ID_CVS);
setDisplayName(tr("CVS")); setDisplayName(tr("CVS"));

View File

@@ -54,7 +54,7 @@ class SettingsPage : public VcsBase::VcsClientOptionsPage
Q_OBJECT Q_OBJECT
public: public:
SettingsPage(Core::IVersionControl *control); SettingsPage(Core::IVersionControl *control, QObject *parent);
}; };
} // namespace Cvs } // namespace Cvs

View File

@@ -293,7 +293,7 @@ bool GerritPlugin::initialize(ActionContainer *ac)
connect(pushAction, &QAction::triggered, this, [this]() { push(); }); connect(pushAction, &QAction::triggered, this, [this]() { push(); });
ac->addAction(m_pushToGerritCommand); ac->addAction(m_pushToGerritCommand);
GitPlugin::instance()->addAutoReleasedObject(new GerritOptionsPage(m_parameters)); new GerritOptionsPage(m_parameters, this);
return true; return true;
} }

View File

@@ -218,7 +218,8 @@ static bool isGitDirectory(const QString &path)
return gitVc == VcsManager::findVersionControlForDirectory(path, 0); return gitVc == VcsManager::findVersionControlForDirectory(path, 0);
} }
GitGrep::GitGrep() GitGrep::GitGrep(QObject *parent)
: SearchEngine(parent)
{ {
m_widget = new QWidget; m_widget = new QWidget;
auto layout = new QHBoxLayout(m_widget); auto layout = new QHBoxLayout(m_widget);

View File

@@ -39,7 +39,7 @@ class GitGrep : public TextEditor::SearchEngine
Q_DECLARE_TR_FUNCTIONS(GitGrep) Q_DECLARE_TR_FUNCTIONS(GitGrep)
public: public:
GitGrep(); explicit GitGrep(QObject *parent);
~GitGrep() override; ~GitGrep() override;
QString title() const override; QString title() const override;
QString toolTip() const override; QString toolTip() const override;

View File

@@ -299,12 +299,11 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
auto vc = initializeVcs<GitVersionControl>(context, m_gitClient); auto vc = initializeVcs<GitVersionControl>(context, m_gitClient);
// Create the settings Page // Create the settings Page
auto settingsPage = new SettingsPage(vc); auto settingsPage = new SettingsPage(vc, this);
addAutoReleasedObject(settingsPage);
connect(settingsPage, &SettingsPage::settingsChanged, connect(settingsPage, &SettingsPage::settingsChanged,
this, &GitPlugin::updateRepositoryBrowserAction); this, &GitPlugin::updateRepositoryBrowserAction);
addAutoReleasedObject(new GitGrep); new GitGrep(this);
const auto describeFunc = [this](const QString &source, const QString &id) { const auto describeFunc = [this](const QString &source, const QString &id) {
m_gitClient->show(source, 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 int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]);
const auto widgetCreator = []() { return new GitEditorWidget; }; const auto widgetCreator = []() { return new GitEditorWidget; };
for (int i = 0; i < editorCount; i++) 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, new VcsSubmitEditorFactory(&submitParameters,
[]() { return new GitSubmitEditor(&submitParameters); })); []() { return new GitSubmitEditor(&submitParameters); }, this);
const QString prefix = "git"; const QString prefix = "git";
m_commandLocator = new CommandLocator("Git", prefix, prefix); m_commandLocator = new CommandLocator("Git", prefix, prefix, this);
addAutoReleasedObject(m_commandLocator);
//register actions //register actions
ActionContainer *toolsContainer = ActionManager::actionContainer(Core::Constants::M_TOOLS); ActionContainer *toolsContainer = ActionManager::actionContainer(Core::Constants::M_TOOLS);

View File

@@ -106,8 +106,8 @@ void SettingsPageWidget::updateNoteField()
} }
// -------- SettingsPage // -------- SettingsPage
SettingsPage::SettingsPage(Core::IVersionControl *control) : SettingsPage::SettingsPage(Core::IVersionControl *control, QObject *parent) :
VcsClientOptionsPage(control, GitPlugin::client()) VcsClientOptionsPage(control, GitPlugin::client(), parent)
{ {
setId(VcsBase::Constants::VCS_ID_GIT); setId(VcsBase::Constants::VCS_ID_GIT);
setDisplayName(tr("Git")); setDisplayName(tr("Git"));

View File

@@ -59,7 +59,7 @@ class SettingsPage : public VcsBase::VcsClientOptionsPage
Q_OBJECT Q_OBJECT
public: public:
SettingsPage(Core::IVersionControl *control); SettingsPage(Core::IVersionControl *control, QObject *parent);
void apply() override; void apply() override;
}; };

View File

@@ -124,7 +124,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
m_client = new MercurialClient; m_client = new MercurialClient;
auto vc = initializeVcs<MercurialControl>(context, m_client); 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, &VcsBaseClient::changed, vc, &MercurialControl::changed);
connect(m_client, &MercurialClient::needUpdate, this, &MercurialPlugin::update); 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 int editorCount = sizeof(editorParameters)/sizeof(editorParameters[0]);
const auto widgetCreator = []() { return new MercurialEditorWidget; }; const auto widgetCreator = []() { return new MercurialEditorWidget; };
for (int i = 0; i < editorCount; i++) 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, new VcsSubmitEditorFactory(&submitEditorParameters,
[]() { return new CommitEditor(&submitEditorParameters); })); []() { return new CommitEditor(&submitEditorParameters); }, this);
const QString prefix = QLatin1String("hg"); const QString prefix = QLatin1String("hg");
m_commandLocator = new Core::CommandLocator("Mercurial", prefix, prefix); m_commandLocator = new Core::CommandLocator("Mercurial", prefix, prefix, this);
addAutoReleasedObject(m_commandLocator);
createMenu(context); createMenu(context);

View File

@@ -68,8 +68,8 @@ void OptionsPageWidget::setSettings(const VcsBaseClientSettings &s)
m_ui.timeout->setValue(s.intValue(MercurialSettings::timeoutKey)); m_ui.timeout->setValue(s.intValue(MercurialSettings::timeoutKey));
} }
OptionsPage::OptionsPage(Core::IVersionControl *control) : OptionsPage::OptionsPage(Core::IVersionControl *control, QObject *parent) :
VcsClientOptionsPage(control, MercurialPlugin::client()) VcsClientOptionsPage(control, MercurialPlugin::client(), parent)
{ {
setId(VcsBase::Constants::VCS_ID_MERCURIAL); setId(VcsBase::Constants::VCS_ID_MERCURIAL);
setDisplayName(tr("Mercurial")); setDisplayName(tr("Mercurial"));

View File

@@ -53,7 +53,7 @@ class OptionsPage : public VcsBase::VcsClientOptionsPage
Q_OBJECT Q_OBJECT
public: public:
OptionsPage(Core::IVersionControl *control); OptionsPage(Core::IVersionControl *control, QObject *parent);
}; };
} // namespace Internal } // namespace Internal

View File

@@ -189,11 +189,11 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
m_settings.fromSettings(ICore::settings()); m_settings.fromSettings(ICore::settings());
addAutoReleasedObject(new SettingsPage); new SettingsPage(this);
// Editor factories // Editor factories
addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters, new VcsSubmitEditorFactory(&submitParameters,
[]() { return new PerforceSubmitEditor(&submitParameters); })); []() { return new PerforceSubmitEditor(&submitParameters); }, this);
const auto describeFunc = [this](const QString &source, const QString &n) { const auto describeFunc = [this](const QString &source, const QString &n) {
describe(source, 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 int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]);
const auto widgetCreator = []() { return new PerforceEditorWidget; }; const auto widgetCreator = []() { return new PerforceEditorWidget; };
for (int i = 0; i < editorCount; i++) 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"); const QString prefix = QLatin1String("p4");
m_commandLocator = new CommandLocator("Perforce", prefix, prefix); m_commandLocator = new CommandLocator("Perforce", prefix, prefix, this);
addAutoReleasedObject(m_commandLocator);
ActionContainer *mtools = ActionManager::actionContainer(Core::Constants::M_TOOLS); ActionContainer *mtools = ActionManager::actionContainer(Core::Constants::M_TOOLS);

View File

@@ -117,7 +117,8 @@ void SettingsPageWidget::setStatusError(const QString &t)
m_ui.errorLabel->setText(t); m_ui.errorLabel->setText(t);
} }
SettingsPage::SettingsPage() SettingsPage::SettingsPage(QObject *parent)
: VcsBaseOptionsPage(parent)
{ {
setId(VcsBase::Constants::VCS_ID_PERFORCE); setId(VcsBase::Constants::VCS_ID_PERFORCE);
setDisplayName(tr("Perforce")); setDisplayName(tr("Perforce"));

View File

@@ -64,7 +64,7 @@ class SettingsPage : public VcsBase::VcsBaseOptionsPage
Q_OBJECT Q_OBJECT
public: public:
SettingsPage(); explicit SettingsPage(QObject *parent);
~SettingsPage() override; ~SettingsPage() override;
QWidget *widget() override; QWidget *widget() override;

View File

@@ -132,8 +132,9 @@ void runSilverSeacher(FutureInterfaceType &fi, FileFindParameters parameters)
namespace SilverSearcher { namespace SilverSearcher {
FindInFilesSilverSearcher::FindInFilesSilverSearcher() FindInFilesSilverSearcher::FindInFilesSilverSearcher(QObject *parent)
: m_widget(0), : SearchEngine(parent),
m_widget(0),
m_path("ag"), m_path("ag"),
m_toolName("SilverSearcher") m_toolName("SilverSearcher")
{ {

View File

@@ -39,7 +39,7 @@ class FindInFilesSilverSearcher : public TextEditor::SearchEngine
Q_OBJECT Q_OBJECT
public: public:
FindInFilesSilverSearcher(); explicit FindInFilesSilverSearcher(QObject *parent);
~FindInFilesSilverSearcher() override; ~FindInFilesSilverSearcher() override;
// TextEditor::FileFindExtension // TextEditor::FileFindExtension

View File

@@ -35,7 +35,7 @@ bool SilverSearcherPlugin::initialize(const QStringList &arguments, QString *err
Q_UNUSED(arguments) Q_UNUSED(arguments)
Q_UNUSED(errorString) Q_UNUSED(errorString)
addAutoReleasedObject(new FindInFilesSilverSearcher); new FindInFilesSilverSearcher(this);
return true; return true;
} }

View File

@@ -80,8 +80,8 @@ void SettingsPageWidget::setSettings(const VcsBaseClientSettings &s)
m_ui.logCountSpinBox->setValue(s.intValue(SubversionSettings::logCountKey)); m_ui.logCountSpinBox->setValue(s.intValue(SubversionSettings::logCountKey));
} }
SettingsPage::SettingsPage(Core::IVersionControl *control) : SettingsPage::SettingsPage(Core::IVersionControl *control, QObject *parent) :
VcsClientOptionsPage(control, SubversionPlugin::instance()->client()) VcsClientOptionsPage(control, SubversionPlugin::instance()->client(), parent)
{ {
setId(VcsBase::Constants::VCS_ID_SUBVERSION); setId(VcsBase::Constants::VCS_ID_SUBVERSION);
setDisplayName(tr("Subversion")); setDisplayName(tr("Subversion"));

View File

@@ -56,7 +56,7 @@ class SettingsPage : public VcsBase::VcsClientOptionsPage
Q_OBJECT Q_OBJECT
public: public:
SettingsPage(Core::IVersionControl *control); SettingsPage(Core::IVersionControl *control, QObject *parent);
}; };
} // namespace Subversion } // namespace Subversion

View File

@@ -216,10 +216,10 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
m_client = new SubversionClient; m_client = new SubversionClient;
addAutoReleasedObject(new SettingsPage(versionControl())); new SettingsPage(versionControl(), this);
addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters, new VcsSubmitEditorFactory(&submitParameters,
[]() { return new SubversionSubmitEditor(&submitParameters); })); []() { return new SubversionSubmitEditor(&submitParameters); }, this);
const auto describeFunc = [this](const QString &source, const QString &id) { const auto describeFunc = [this](const QString &source, const QString &id) {
describe(source, 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 int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]);
const auto widgetCreator = []() { return new SubversionEditorWidget; }; const auto widgetCreator = []() { return new SubversionEditorWidget; };
for (int i = 0; i < editorCount; i++) 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"); const QString prefix = QLatin1String("svn");
m_commandLocator = new CommandLocator("Subversion", prefix, prefix); m_commandLocator = new CommandLocator("Subversion", prefix, prefix, this);
addAutoReleasedObject(m_commandLocator);
// Register actions // Register actions
ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS); ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS);

View File

@@ -157,8 +157,8 @@ static void updateComboEntries(QComboBox *combo, bool onTop)
using namespace Internal; using namespace Internal;
SearchEngine::SearchEngine() SearchEngine::SearchEngine(QObject *parent)
: d(new SearchEnginePrivate) : QObject(parent), d(new SearchEnginePrivate)
{ {
} }

View File

@@ -65,7 +65,7 @@ class TEXTEDITOR_EXPORT SearchEngine : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
SearchEngine(); SearchEngine(QObject *parent = nullptr);
~SearchEngine(); ~SearchEngine();
virtual QString title() const = 0; virtual QString title() const = 0;
virtual QString toolTip() const = 0; // add %1 placeholder where the find flags should be put virtual QString toolTip() const = 0; // add %1 placeholder where the find flags should be put

View File

@@ -52,7 +52,8 @@ namespace VcsBase {
VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters *parameters, VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters *parameters,
// Force copy, see QTCREATORBUG-13218 // Force copy, see QTCREATORBUG-13218
const EditorWidgetCreator editorWidgetCreator, 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)); setProperty("VcsEditorFactoryName", QByteArray(parameters->id));
setId(parameters->id); setId(parameters->id);

View File

@@ -42,7 +42,8 @@ class VCSBASE_EXPORT VcsEditorFactory : public TextEditor::TextEditorFactory
public: public:
VcsEditorFactory(const VcsBaseEditorParameters *parameters, VcsEditorFactory(const VcsBaseEditorParameters *parameters,
const EditorWidgetCreator editorWidgetCreator, 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); static VcsBaseEditor *createEditorById(const char *id);
}; };

View File

@@ -29,8 +29,10 @@
namespace VcsBase { namespace VcsBase {
VcsSubmitEditorFactory::VcsSubmitEditorFactory VcsSubmitEditorFactory::VcsSubmitEditorFactory
(const VcsBaseSubmitEditorParameters *parameters, const EditorCreator &editorCreator) (const VcsBaseSubmitEditorParameters *parameters,
: m_editorCreator(editorCreator) const EditorCreator &editorCreator,
QObject *parent)
: IEditorFactory(parent), m_editorCreator(editorCreator)
{ {
setId(parameters->id); setId(parameters->id);
setDisplayName(QLatin1String(parameters->displayName)); setDisplayName(QLatin1String(parameters->displayName));

View File

@@ -44,7 +44,9 @@ class VCSBASE_EXPORT VcsSubmitEditorFactory : public Core::IEditorFactory
public: public:
typedef std::function<VcsBaseSubmitEditor *()> EditorCreator; 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; Core::IEditor *createEditor() override;

View File

@@ -85,7 +85,6 @@ bool VcsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
}); });
m_settingsPage = new CommonOptionsPage; m_settingsPage = new CommonOptionsPage;
addAutoReleasedObject(m_settingsPage);
addAutoReleasedObject(VcsOutputWindow::instance()); addAutoReleasedObject(VcsOutputWindow::instance());
connect(m_settingsPage, &CommonOptionsPage::settingsChanged, connect(m_settingsPage, &CommonOptionsPage::settingsChanged,
this, &VcsPlugin::settingsChanged); this, &VcsPlugin::settingsChanged);