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

Bzr: fix regression, commit was broken !

Browse Source 
The error-prone QObject::connect(SIGNAL(), SLOT()) caused the commit to not happen.
Status parsing was not triggered anymore.

Change-Id: Id413fb1a22de062b6d0a433f41603a84d89243c5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Hugues Delorme
2015-01-16 12:57:08 +01:00
parent d2bed5bf45
commit 718dd00fad
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -562,8 +562,8 @@ void BazaarPlugin::commit()
m_submitRepository = state.topLevel();
connect(m_client, SIGNAL(parsedStatus(QList<VcsBaseClient::StatusItem>)),
this, SLOT(showCommitWidget(QList<VcsBaseClient::StatusItem>)));
QObject::connect(m_client, &VcsBaseClient::parsedStatus,
this, &BazaarPlugin::showCommitWidget);
// The "--short" option allows to easily parse status output
m_client->emitParsedStatus(m_submitRepository, QStringList(QLatin1String("--short")));
}
@@ -571,8 +571,8 @@ void BazaarPlugin::commit()
void BazaarPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &status)
{
//Once we receive our data release the connection so it can be reused elsewhere
disconnect(m_client, SIGNAL(parsedStatus(QList<VcsBaseClient::StatusItem>)),
this, SLOT(showCommitWidget(QList<VcsBaseClient::StatusItem>)));
QObject::disconnect(m_client, &VcsBaseClient::parsedStatus,
this, &BazaarPlugin::showCommitWidget);
if (status.isEmpty()) {
VcsOutputWindow::appendError(tr("There are no changes to commit."));