From 2e364c1506142c5cc18806976ecc8c1e5df1ea20 Mon Sep 17 00:00:00 2001 From: jkobus Date: Thu, 23 Oct 2014 16:47:20 +0200 Subject: Fix reloading of patch files (cherry picked from commit 37ddb4e9eb3aff7259ea60fe92c702f4bb5d3938) Change-Id: I06c41eb802b0a3318da3ddfa72bd3575c02867fa Task-number: QTCREATORBUG-13241 Reviewed-by: Jarek Kobus --- src/plugins/diffeditor/diffeditor.cpp | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'src/plugins/diffeditor/diffeditor.cpp') 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 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() -- cgit v1.2.1