Commit dcedc454 authored by jkobus's avatar jkobus Committed by Jarek Kobus

Compile fix

Change-Id: I0b586bd1b024c3d1f0eaebfc057e85fbedfe72cd
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
parent 544e07d1
......@@ -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
......@@ -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;
......
......@@ -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);
}
......
......@@ -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);
......
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