summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/diffeditordocument.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2015-08-20 16:45:30 +0300
committerOrgad Shaneh <orgads@gmail.com>2015-11-03 08:45:41 +0000
commitd8d7acbe7589626e77411c534efe6452ee1f4ac1 (patch)
tree9fb385acf6510ca2a7163c8e830235f91c056d67 /src/plugins/diffeditor/diffeditordocument.cpp
parentf735c8da45d9589018b608aee458a3693145fa22 (diff)
downloadqt-creator-d8d7acbe7589626e77411c534efe6452ee1f4ac1.tar.gz
Git: Scroll to active file on Show invoked from file log
Change-Id: I0935bf8b8b30ee78716a14ee0a88c21b9caf62dc Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditordocument.cpp')
-rw-r--r--src/plugins/diffeditor/diffeditordocument.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp
index d9a120c77b..74e048517a 100644
--- a/src/plugins/diffeditor/diffeditordocument.cpp
+++ b/src/plugins/diffeditor/diffeditordocument.cpp
@@ -122,10 +122,12 @@ QString DiffEditorDocument::makePatch(int fileIndex, int chunkIndex, bool revert
lastChunk && fileData.lastChunkAtTheEndOfFile);
}
-void DiffEditorDocument::setDiffFiles(const QList<FileData> &data, const QString &directory)
+void DiffEditorDocument::setDiffFiles(const QList<FileData> &data, const QString &directory,
+ const QString &startupFile)
{
m_diffFiles = data;
m_baseDirectory = directory;
+ m_startupFile = startupFile;
emit documentChanged();
}
@@ -139,6 +141,11 @@ QString DiffEditorDocument::baseDirectory() const
return m_baseDirectory;
}
+QString DiffEditorDocument::startupFile() const
+{
+ return m_startupFile;
+}
+
void DiffEditorDocument::setDescription(const QString &description)
{
if (m_description == description)