summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/diffeditorcontroller.cpp
diff options
context:
space:
mode:
authorjkobus <jaroslaw.kobus@digia.com>2014-02-11 13:00:35 +0100
committerJarek Kobus <jaroslaw.kobus@digia.com>2014-02-18 13:46:49 +0100
commit73cf43f32370d8986b4c06511b95771582cc421d (patch)
tree1506c433ca50511420c0332b2b9f432a180ccbb3 /src/plugins/diffeditor/diffeditorcontroller.cpp
parent84e8a79c814dc6e788cad9643d0e225c7a92e76d (diff)
downloadqt-creator-73cf43f32370d8986b4c06511b95771582cc421d.tar.gz
Add DiffEditorManager, refactoring.
GitDiffSwitcher operates now on IDocument. GitDiffHandler operates now on DiffEditorController. "source" property now attached to editor's document (VcsBasePlugin). Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorcontroller.cpp')
-rw-r--r--src/plugins/diffeditor/diffeditorcontroller.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/diffeditor/diffeditorcontroller.cpp b/src/plugins/diffeditor/diffeditorcontroller.cpp
index a5994251fe..b382efbdd2 100644
--- a/src/plugins/diffeditor/diffeditorcontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorcontroller.cpp
@@ -110,7 +110,8 @@ void DiffEditorController::clear(const QString &message)
emit cleared(message);
}
-void DiffEditorController::setDiffContents(const QList<DiffFilesContents> &diffFileList, const QString &workingDirectory)
+void DiffEditorController::setDiffContents(const QList<DiffFilesContents> &diffFileList,
+ const QString &workingDirectory)
{
m_diffFileList = diffFileList;
m_workingDirectory = workingDirectory;
@@ -188,8 +189,3 @@ void DiffEditorController::setCurrentDiffFileIndex(int diffFileIndex)
}
} // namespace DiffEditor
-
-//QTextCodec *DiffEditorWidget::codec() const
-//{
-//}
-