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

Compile fix

Browse Source 
Change-Id: I0b586bd1b024c3d1f0eaebfc057e85fbedfe72cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
jkobus
2014-06-06 14:35:31 +02:00
committed by Jarek Kobus
parent 544e07d114
commit dcedc45474
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1266,7 +1266,7 @@ void SideBySideDiffEditorWidget::slotLeftContextMenuRequested(QMenu *menu,
if (m_contextMenuChunkIndex >= fileData.chunks.count())
return;
emit m_controller->chunkActionsRequested(menu, diffFileIndex, chunkIndex);
m_controller->requestChunkActions(menu, diffFileIndex, chunkIndex);
if (fileData.leftFileInfo.fileName == fileData.rightFileInfo.fileName)
return;
@@ -1301,7 +1301,7 @@ void SideBySideDiffEditorWidget::slotRightContextMenuRequested(QMenu *menu,
if (m_contextMenuChunkIndex >= fileData.chunks.count())
return;
emit m_controller->chunkActionsRequested(menu, diffFileIndex, chunkIndex);
m_controller->requestChunkActions(menu, diffFileIndex, chunkIndex);
revertAction->setEnabled(true);
}