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

DiffEditor: Use explicit DirectConnection for context menu

Browse Source 
The menu is expected to be populated after the signal is emitted.

Change-Id: Ibcb9eaf3742942801ad79b98000d48cb93d5ae31
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Orgad Shaneh
2014-07-28 22:25:27 +03:00
committed by Orgad Shaneh
parent db5a4ac447
commit 117436a65a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -779,7 +779,8 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
connect(m_leftEditor, SIGNAL(jumpToOriginalFileRequested(int,int,int)), connect(m_leftEditor, SIGNAL(jumpToOriginalFileRequested(int,int,int)),
this, SLOT(slotLeftJumpToOriginalFileRequested(int,int,int))); this, SLOT(slotLeftJumpToOriginalFileRequested(int,int,int)));
connect(m_leftEditor, SIGNAL(contextMenuRequested(QMenu*,int,int)), connect(m_leftEditor, SIGNAL(contextMenuRequested(QMenu*,int,int)),
this, SLOT(slotLeftContextMenuRequested(QMenu*,int,int))); this, SLOT(slotLeftContextMenuRequested(QMenu*,int,int)),
Qt::DirectConnection);
m_rightEditor = new SideDiffEditorWidget(this); m_rightEditor = new SideDiffEditorWidget(this);
m_rightEditor->setReadOnly(true); m_rightEditor->setReadOnly(true);
@@ -791,7 +792,8 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
connect(m_rightEditor, SIGNAL(jumpToOriginalFileRequested(int,int,int)), connect(m_rightEditor, SIGNAL(jumpToOriginalFileRequested(int,int,int)),
this, SLOT(slotRightJumpToOriginalFileRequested(int,int,int))); this, SLOT(slotRightJumpToOriginalFileRequested(int,int,int)));
connect(m_rightEditor, SIGNAL(contextMenuRequested(QMenu*,int,int)), connect(m_rightEditor, SIGNAL(contextMenuRequested(QMenu*,int,int)),
this, SLOT(slotRightContextMenuRequested(QMenu*,int,int))); this, SLOT(slotRightContextMenuRequested(QMenu*,int,int)),
Qt::DirectConnection);
connect(TextEditorSettings::instance(), connect(TextEditorSettings::instance(),
SIGNAL(fontSettingsChanged(TextEditor::FontSettings)), SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),

2
src/plugins/git/gitclient.cpp
View File

@@ -783,7 +783,7 @@ DiffEditor::DiffEditorDocument *GitClient::createDiffEditor(const QString &docum
VcsBasePlugin::setSource(diffEditorDocument, source); VcsBasePlugin::setSource(diffEditorDocument, source);
connect(diffEditorDocument->controller(), SIGNAL(chunkActionsRequested(QMenu*,int,int)), connect(diffEditorDocument->controller(), SIGNAL(chunkActionsRequested(QMenu*,int,int)),
this, SLOT(slotChunkActionsRequested(QMenu*,int,int))); this, SLOT(slotChunkActionsRequested(QMenu*,int,int)), Qt::DirectConnection);
return diffEditorDocument; return diffEditorDocument;
} }