diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2014-10-23 16:47:20 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-10-24 11:41:16 +0200 |
commit | 2e364c1506142c5cc18806976ecc8c1e5df1ea20 (patch) | |
tree | 7f4fb6626c279ccfa20ac3428c68f445c4c45ca0 /src/plugins/diffeditor/diffeditor.cpp | |
parent | 4889239479de18a4dbea6760ca943602ea5375af (diff) | |
download | qt-creator-2e364c1506142c5cc18806976ecc8c1e5df1ea20.tar.gz |
Fix reloading of patch files
(cherry picked from commit 37ddb4e9eb3aff7259ea60fe92c702f4bb5d3938)
Change-Id: I06c41eb802b0a3318da3ddfa72bd3575c02867fa
Task-number: QTCREATORBUG-13241
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.cpp')
-rw-r--r-- | src/plugins/diffeditor/diffeditor.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index 48080bb811..5dac850ce8 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -278,29 +278,10 @@ bool DiffEditor::open(QString *errorString, { Q_UNUSED(realFileName) - if (!m_controller) + if (!m_document) return false; - QString patch; - if (m_document->read(fileName, &patch, errorString) != Utils::TextFileFormat::ReadSuccess) - return false; - - bool ok = false; - QList<FileData> fileDataList - = DiffUtils::readPatch(patch, - m_controller->isIgnoreWhitespace(), - &ok); - if (!ok) { - *errorString = tr("Could not parse patch file \"%1\". " - "The content is not of unified diff format.") - .arg(fileName); - return false; - } - - const QFileInfo fi(fileName); - m_document->setFilePath(QDir::cleanPath(fi.absoluteFilePath())); - m_controller->setDiffFiles(fileDataList, fi.absolutePath()); - return true; + return m_document->open(errorString, fileName); } Core::IDocument *DiffEditor::document() |