Commit 264df002 authored by Eike Ziller's avatar Eike Ziller

VCS: Make submit editor closing independent from current editor

The VCS plugins keep a reference to the submit editor, so it can
explicitly be closed, instead of relying on the correct currentEditor in
the editor manager.

Change-Id: I14aab63447f790f2065a8d8dc6b50aeacbd1e941
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 23536e9b
......@@ -681,7 +681,7 @@ void BazaarPlugin::commitFromEditor()
{
// Close the submit editor
m_submitActionTriggered = true;
EditorManager::closeEditor();
EditorManager::closeEditor(submitEditor());
}
void BazaarPlugin::uncommit()
......
......@@ -1475,7 +1475,7 @@ void ClearCasePlugin::describe(const QString &source, const QString &changeNr)
void ClearCasePlugin::checkInSelected()
{
m_submitActionTriggered = true;
EditorManager::closeEditor();
EditorManager::closeEditor(submitEditor());
}
QString ClearCasePlugin::runCleartoolSync(const QString &workingDir,
......
......@@ -1122,7 +1122,7 @@ bool CvsPlugin::describe(const QString &repositoryPath,
void CvsPlugin::submitCurrentLog()
{
m_submitActionTriggered = true;
EditorManager::closeEditor(EditorManager::currentEditor());
EditorManager::closeEditor(submitEditor());
}
// Run CVS. At this point, file arguments must be relative to
......
......@@ -1014,7 +1014,7 @@ void GitPlugin::submitCurrentLog()
{
// Close the submit editor
m_submitActionTriggered = true;
EditorManager::closeEditor();
EditorManager::closeEditor(submitEditor());
}
bool GitPlugin::submitEditorAboutToClose()
......
......@@ -596,7 +596,7 @@ void MercurialPlugin::commitFromEditor()
{
// Close the submit editor
m_submitActionTriggered = true;
Core::EditorManager::closeEditor();
Core::EditorManager::closeEditor(submitEditor());
}
bool MercurialPlugin::submitEditorAboutToClose()
......
......@@ -1329,7 +1329,7 @@ void PerforcePlugin::describe(const QString & source, const QString &n)
void PerforcePlugin::submitCurrentLog()
{
m_submitActionTriggered = true;
EditorManager::closeEditor(EditorManager::currentEditor());
EditorManager::closeEditor(submitEditor());
}
void PerforcePlugin::cleanCommitMessageFile()
......
......@@ -981,7 +981,7 @@ void SubversionPlugin::slotDescribe()
void SubversionPlugin::submitCurrentLog()
{
m_submitActionTriggered = true;
EditorManager::closeEditor(EditorManager::currentEditor());
EditorManager::closeEditor(submitEditor());
}
SubversionResponse
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment