feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make it possible to save diff editor contents

Browse Source 
Task-number: QTCREATORBUG-12548
Task-number: QTCREATORBUG-12549
Change-Id: Ia27080cc689da48fc5401010e2277edaf0a01f4d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
jkobus
2014-06-30 15:04:36 +02:00
committed by Jarek Kobus
parent 337c1b3b69
commit 656c3343ee
6 changed files with 108 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -51,6 +51,7 @@
#include <QToolBar>
#include <QComboBox>
#include <QFileInfo>
#include <QDir>
#include <QTextCodec>
#include <QTextBlock>
@@ -316,13 +317,9 @@ bool DiffEditor::open(QString *errorString,
if (!m_controller)
return false;
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
*errorString = tr("Could not open patch file \"%1\".").arg(fileName);
QString patch;
if (m_document->read(fileName, &patch, errorString) != Utils::TextFileFormat::ReadSuccess)
return false;
}
const QString patch = Core::EditorManager::defaultTextCodec()->toUnicode(file.readAll());
bool ok = false;
QList<FileData> fileDataList
@@ -336,7 +333,9 @@ bool DiffEditor::open(QString *errorString,
return false;
}
m_controller->setDiffFiles(fileDataList, QFileInfo(fileName).absolutePath());
const QFileInfo fi(fileName);
m_document->setFilePath(QDir::cleanPath(fi.absoluteFilePath()));
m_controller->setDiffFiles(fileDataList, fi.absolutePath());
return true;
}