feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VcsBasePlugin: Remove last instance of addAutoReleasedObject

Browse Source 
Change-Id: I6a622faed0bce39f21c5489afc0df623cb32f801
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-02-19 14:15:05 +01:00
parent 432ae65944
commit 492a17b65b
4 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/vcsbase/vcsplugin.cpp
View File

@@ -48,7 +48,6 @@
#include <utils/macroexpander.h>
#include <QtPlugin>
#include <QDebug>
using namespace Core;
@@ -57,11 +56,16 @@ using namespace ProjectExplorer;
namespace VcsBase {
namespace Internal {
VcsPlugin *VcsPlugin::m_instance = 0;
class VcsPluginPrivate
{
public:
CommonOptionsPage m_settingsPage;
QStandardItemModel *m_nickNameModel = nullptr;
};
VcsPlugin::VcsPlugin() :
m_settingsPage(0),
m_nickNameModel(0)
static VcsPlugin *m_instance = nullptr;
VcsPlugin::VcsPlugin()
{
m_instance = this;
}
@@ -69,7 +73,8 @@ VcsPlugin::VcsPlugin() :
VcsPlugin::~VcsPlugin()
{
VcsProjectCache::destroy();
m_instance = 0;
VcsOutputWindow::destroy();
m_instance = nullptr;
}
bool VcsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
@@ -77,6 +82,8 @@ bool VcsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
Q_UNUSED(arguments)
Q_UNUSED(errorMessage)
d = new VcsPluginPrivate;
EditorManager::addCloseEditorListener([this](IEditor *editor) -> bool {
bool result = true;
if (auto se = qobject_cast<VcsBaseSubmitEditor *>(editor))
@@ -84,11 +91,9 @@ bool VcsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
return result;
});
m_settingsPage = new CommonOptionsPage;
addAutoReleasedObject(VcsOutputWindow::instance());
connect(m_settingsPage, &CommonOptionsPage::settingsChanged,
connect(&d->m_settingsPage, &CommonOptionsPage::settingsChanged,
this, &VcsPlugin::settingsChanged);
connect(m_settingsPage, &CommonOptionsPage::settingsChanged,
connect(&d->m_settingsPage, &CommonOptionsPage::settingsChanged,
this, &VcsPlugin::slotSettingsChanged);
slotSettingsChanged();
@@ -140,24 +145,24 @@ VcsPlugin *VcsPlugin::instance()
CommonVcsSettings VcsPlugin::settings() const
{
return m_settingsPage->settings();
return d->m_settingsPage.settings();
}
/* Delayed creation/update of the nick name model. */
QStandardItemModel *VcsPlugin::nickNameModel()
{
if (!m_nickNameModel) {
m_nickNameModel = NickNameDialog::createModel(this);
if (!d->m_nickNameModel) {
d->m_nickNameModel = NickNameDialog::createModel(this);
populateNickNameModel();
}
return m_nickNameModel;
return d->m_nickNameModel;
}
void VcsPlugin::populateNickNameModel()
{
QString errorMessage;
if (!NickNameDialog::populateModelFromMailCapFile(settings().nickNameMailMap,
m_nickNameModel,
d->m_nickNameModel,
&errorMessage)) {
qWarning("%s", qPrintable(errorMessage));
}
@@ -165,7 +170,7 @@ void VcsPlugin::populateNickNameModel()
void VcsPlugin::slotSettingsChanged()
{
if (m_nickNameModel)
if (d->m_nickNameModel)
populateNickNameModel();
}