Commit 4c6e02ed authored by Eike Ziller's avatar Eike Ziller
Browse files
parents d9d0aba1 f56dd2e4
...@@ -681,7 +681,7 @@ void BazaarPlugin::commitFromEditor() ...@@ -681,7 +681,7 @@ void BazaarPlugin::commitFromEditor()
{ {
// Close the submit editor // Close the submit editor
m_submitActionTriggered = true; m_submitActionTriggered = true;
EditorManager::closeEditor(); EditorManager::closeEditor(submitEditor());
} }
void BazaarPlugin::uncommit() void BazaarPlugin::uncommit()
......
...@@ -1475,7 +1475,7 @@ void ClearCasePlugin::describe(const QString &source, const QString &changeNr) ...@@ -1475,7 +1475,7 @@ void ClearCasePlugin::describe(const QString &source, const QString &changeNr)
void ClearCasePlugin::checkInSelected() void ClearCasePlugin::checkInSelected()
{ {
m_submitActionTriggered = true; m_submitActionTriggered = true;
EditorManager::closeEditor(); EditorManager::closeEditor(submitEditor());
} }
QString ClearCasePlugin::runCleartoolSync(const QString &workingDir, QString ClearCasePlugin::runCleartoolSync(const QString &workingDir,
......
...@@ -62,6 +62,12 @@ EditorWindow::EditorWindow(QWidget *parent) : ...@@ -62,6 +62,12 @@ EditorWindow::EditorWindow(QWidget *parent) :
updateWindowTitle(); updateWindowTitle();
} }
EditorWindow::~EditorWindow()
{
disconnect(m_area, &EditorArea::windowTitleNeedsUpdate,
this, &EditorWindow::updateWindowTitle);
}
EditorArea *EditorWindow::editorArea() const EditorArea *EditorWindow::editorArea() const
{ {
return m_area; return m_area;
......
...@@ -42,6 +42,7 @@ class EditorWindow : public QWidget ...@@ -42,6 +42,7 @@ class EditorWindow : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit EditorWindow(QWidget *parent = 0); explicit EditorWindow(QWidget *parent = 0);
~EditorWindow();
EditorArea *editorArea() const; EditorArea *editorArea() const;
......
...@@ -1122,7 +1122,7 @@ bool CvsPlugin::describe(const QString &repositoryPath, ...@@ -1122,7 +1122,7 @@ bool CvsPlugin::describe(const QString &repositoryPath,
void CvsPlugin::submitCurrentLog() void CvsPlugin::submitCurrentLog()
{ {
m_submitActionTriggered = true; m_submitActionTriggered = true;
EditorManager::closeEditor(EditorManager::currentEditor()); EditorManager::closeEditor(submitEditor());
} }
// Run CVS. At this point, file arguments must be relative to // Run CVS. At this point, file arguments must be relative to
......
...@@ -1014,7 +1014,7 @@ void GitPlugin::submitCurrentLog() ...@@ -1014,7 +1014,7 @@ void GitPlugin::submitCurrentLog()
{ {
// Close the submit editor // Close the submit editor
m_submitActionTriggered = true; m_submitActionTriggered = true;
EditorManager::closeEditor(); EditorManager::closeEditor(submitEditor());
} }
bool GitPlugin::submitEditorAboutToClose() bool GitPlugin::submitEditorAboutToClose()
......
...@@ -596,7 +596,7 @@ void MercurialPlugin::commitFromEditor() ...@@ -596,7 +596,7 @@ void MercurialPlugin::commitFromEditor()
{ {
// Close the submit editor // Close the submit editor
m_submitActionTriggered = true; m_submitActionTriggered = true;
Core::EditorManager::closeEditor(); Core::EditorManager::closeEditor(submitEditor());
} }
bool MercurialPlugin::submitEditorAboutToClose() bool MercurialPlugin::submitEditorAboutToClose()
......
...@@ -1329,7 +1329,7 @@ void PerforcePlugin::describe(const QString & source, const QString &n) ...@@ -1329,7 +1329,7 @@ void PerforcePlugin::describe(const QString & source, const QString &n)
void PerforcePlugin::submitCurrentLog() void PerforcePlugin::submitCurrentLog()
{ {
m_submitActionTriggered = true; m_submitActionTriggered = true;
EditorManager::closeEditor(EditorManager::currentEditor()); EditorManager::closeEditor(submitEditor());
} }
void PerforcePlugin::cleanCommitMessageFile() void PerforcePlugin::cleanCommitMessageFile()
......
...@@ -981,7 +981,7 @@ void SubversionPlugin::slotDescribe() ...@@ -981,7 +981,7 @@ void SubversionPlugin::slotDescribe()
void SubversionPlugin::submitCurrentLog() void SubversionPlugin::submitCurrentLog()
{ {
m_submitActionTriggered = true; m_submitActionTriggered = true;
EditorManager::closeEditor(EditorManager::currentEditor()); EditorManager::closeEditor(submitEditor());
} }
SubversionResponse 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