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

Perforce: Sprinkle with auto

Browse Source 
Change-Id: Ic9a721a4e7d1f517f1c2dd9a48d2421aecda5190
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-01-22 13:53:26 +01:00
parent 2ce93c2b7d
commit 78303bddf5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/perforce/perforceplugin.cpp
View File

@@ -1316,7 +1316,7 @@ void PerforcePlugin::p4Diff(const PerforceDiffParameters &p)
VcsBaseEditorWidget *diffEditorWidget = qobject_cast<VcsBaseEditorWidget *>(editor->widget()); VcsBaseEditorWidget *diffEditorWidget = qobject_cast<VcsBaseEditorWidget *>(editor->widget());
// Wire up the parameter widget to trigger a re-run on // Wire up the parameter widget to trigger a re-run on
// parameter change and 'revert' from inside the diff editor. // parameter change and 'revert' from inside the diff editor.
PerforceDiffParameterWidget *pw = new PerforceDiffParameterWidget(p); auto pw = new PerforceDiffParameterWidget(p);
connect(pw, SIGNAL(reRunDiff(Perforce::Internal::PerforceDiffParameters)), connect(pw, SIGNAL(reRunDiff(Perforce::Internal::PerforceDiffParameters)),
this, SLOT(p4Diff(Perforce::Internal::PerforceDiffParameters))); this, SLOT(p4Diff(Perforce::Internal::PerforceDiffParameters)));
connect(diffEditorWidget, SIGNAL(diffChunkReverted(VcsBase::DiffChunk)), connect(diffEditorWidget, SIGNAL(diffChunkReverted(VcsBase::DiffChunk)),
@@ -1547,11 +1547,11 @@ void PerforcePlugin::getTopLevel()
// Run a new checker // Run a new checker
if (m_instance->m_settings.p4BinaryPath().isEmpty()) if (m_instance->m_settings.p4BinaryPath().isEmpty())
return; return;
PerforceChecker *checker = new PerforceChecker(m_instance); auto checker = new PerforceChecker(m_instance);
connect(checker, SIGNAL(failed(QString)), m_instance, SLOT(slotTopLevelFailed(QString))); connect(checker, &PerforceChecker::failed, m_instance, &PerforcePlugin::slotTopLevelFailed);
connect(checker, SIGNAL(failed(QString)), checker, SLOT(deleteLater())); connect(checker, &PerforceChecker::failed, checker, &QObject::deleteLater);
connect(checker, SIGNAL(succeeded(QString)), m_instance, SLOT(slotTopLevelFound(QString))); connect(checker, &PerforceChecker::succeeded, m_instance, &PerforcePlugin::slotTopLevelFound);
connect(checker, SIGNAL(succeeded(QString)),checker, SLOT(deleteLater())); connect(checker, &PerforceChecker::succeeded,checker, &QObject::deleteLater);
checker->start(settings().p4BinaryPath(), settings().commonP4Arguments(QString()), 30000); checker->start(settings().p4BinaryPath(), settings().commonP4Arguments(QString()), 30000);
} }