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

DiffEditorPlugin: Various cleanups

Browse Source 
Change-Id: Ic0c9c397067b899932bc39d938e63df36fa4caeb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-27 15:13:33 +02:00
parent e67e2121a7
commit 0def7c83d4
13 changed files with 91 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/diffeditor/diffeditordocument.cpp
View File

@@ -120,15 +120,12 @@ QString DiffEditorDocument::makePatch(int fileIndex, int chunkIndex,
bool revert, bool addPrefix,
const QString &overriddenFileName) const
{
if (fileIndex < 0 || chunkIndex < 0)
return QString();
if (fileIndex >= m_diffFiles.count())
return QString();
if (fileIndex < 0 || chunkIndex < 0 || fileIndex >= m_diffFiles.count())
return {};
const FileData &fileData = m_diffFiles.at(fileIndex);
if (chunkIndex >= fileData.chunks.count())
return QString();
return {};
const ChunkData chunkData = filterChunk(fileData.chunks.at(chunkIndex), selection, revert);
const bool lastChunk = (chunkIndex == fileData.chunks.count() - 1);
@@ -257,12 +254,12 @@ bool DiffEditorDocument::save(QString *errorString, const FilePath &filePath, bo
return false;
setController(nullptr);
setDescription(QString());
setDescription({});
Core::EditorManager::clearUniqueId(this);
setTemporary(false);
setFilePath(filePath.absoluteFilePath());
setPreferredDisplayName(QString());
setPreferredDisplayName({});
emit temporaryStateChanged();
return true;
@@ -393,8 +390,8 @@ void DiffEditorDocument::beginReload()
m_state = Reloading;
emit changed();
QSignalBlocker blocker(this);
setDiffFiles(QList<FileData>(), {});
setDescription(QString());
setDiffFiles({}, {});
setDescription({});
}
void DiffEditorDocument::endReload(bool success)