diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2014-06-06 14:35:31 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-06-06 14:43:58 +0200 |
commit | dcedc454747d95453f6b0ac245e02d9994d13beb (patch) | |
tree | 60be363871b6a2fac347d5f120018af3376817e2 | |
parent | 544e07d114ac0f799f08048b540c264712629a03 (diff) | |
download | qt-creator-dcedc454747d95453f6b0ac245e02d9994d13beb.tar.gz |
Compile fix
Change-Id: I0b586bd1b024c3d1f0eaebfc057e85fbedfe72cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 files changed, 17 insertions, 8 deletions
diff --git a/src/plugins/diffeditor/diffeditorcontroller.cpp b/src/plugins/diffeditor/diffeditorcontroller.cpp index b815961cf1..e826cf1e7d 100644 --- a/src/plugins/diffeditor/diffeditorcontroller.cpp +++ b/src/plugins/diffeditor/diffeditorcontroller.cpp @@ -196,4 +196,11 @@ void DiffEditorController::requestReload() emit reloadRequested(); } +void DiffEditorController::requestChunkActions(QMenu *menu, + int diffFileIndex, + int chunkIndex) +{ + emit chunkActionsRequested(menu, diffFileIndex, chunkIndex); +} + } // namespace DiffEditor diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h index cd632cafef..5bdfbd1cc4 100644 --- a/src/plugins/diffeditor/diffeditorcontroller.h +++ b/src/plugins/diffeditor/diffeditorcontroller.h @@ -55,11 +55,6 @@ public: QString makePatch(int diffFileIndex, int chunkIndex, bool revert) const; -signals: - void chunkActionsRequested(QMenu *menu, - int diffFileIndex, - int chunkIndex); - public slots: void clear(); void clear(const QString &message); @@ -70,6 +65,9 @@ public slots: void setContextLinesNumber(int lines); void setIgnoreWhitespace(bool ignore); void requestReload(); + void requestChunkActions(QMenu *menu, + int diffFileIndex, + int chunkIndex); signals: void cleared(const QString &message); @@ -80,6 +78,10 @@ signals: void contextLinesNumberChanged(int lines); void ignoreWhitespaceChanged(bool ignore); void reloadRequested(); + void chunkActionsRequested(QMenu *menu, + int diffFileIndex, + int chunkIndex); + private: QString m_clearMessage; diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index 32d8ce73eb..04ab6e7ad7 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -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); } diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index 9c58d47257..71b1dba039 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -259,7 +259,7 @@ void UnifiedDiffEditorWidget::addContextMenuActions(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); |