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

VcsBaseSubmitEditor: Remove queued connection

Browse Source 
Those should no longer be necessary and some people report warnings
about queueing Qt::ApplicationState when doing commits in creator.

Change-Id: I7bf1be57b8a92212ef677d1a608c0f22d20cab8b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-02-24 12:51:17 +01:00
committed by Orgad Shaneh
parent 3a7a1c2164
commit 86b5b5c2f3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -236,17 +236,16 @@ VcsBaseSubmitEditor::VcsBaseSubmitEditor(const VcsBaseSubmitEditorParameters *pa
slotUpdateEditorSettings(settings); slotUpdateEditorSettings(settings);
connect(VcsPlugin::instance(), &VcsPlugin::settingsChanged, connect(VcsPlugin::instance(), &VcsPlugin::settingsChanged,
this, &VcsBaseSubmitEditor::slotUpdateEditorSettings); this, &VcsBaseSubmitEditor::slotUpdateEditorSettings);
// Commit data refresh might lead to closing the editor, so use a queued connection
connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged, connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged,
this, [this]() { this, [this]() {
if (Core::EditorManager::currentEditor() == this) if (Core::EditorManager::currentEditor() == this)
updateFileModel(); updateFileModel();
}, Qt::QueuedConnection); });
connect(qApp, &QApplication::applicationStateChanged, connect(qApp, &QApplication::applicationStateChanged,
this, [this](Qt::ApplicationState state) { this, [this](Qt::ApplicationState state) {
if (state == Qt::ApplicationActive) if (state == Qt::ApplicationActive)
updateFileModel(); updateFileModel();
}, Qt::QueuedConnection); });
auto aggregate = new Aggregation::Aggregate; auto aggregate = new Aggregation::Aggregate;
aggregate->add(new Core::BaseTextFind(descriptionEdit)); aggregate->add(new Core::BaseTextFind(descriptionEdit));