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

DiffEditorController: Simplify API

Browse Source 
Get rid of VcsBaseDiffEditorController::setWorkingDirectory()
and rename DiffEditorController::setBaseDirectory() into
setWorkingDirectory(). Don't pass workingDirectory
inside setDiffFiles().

Change-Id: I6a3a02d5e3ddc23977ed2908cd8d7b8ed51a9ee0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-12-14 22:16:49 +01:00
parent ce161d0b16
commit 5aedb4ba56
8 changed files with 33 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,11 +139,9 @@ QString DiffEditorDocument::makePatch(int fileIndex, int chunkIndex,
lastChunk && fileData.lastChunkAtTheEndOfFile);
}
void DiffEditorDocument::setDiffFiles(const QList<FileData> &data, const FilePath &directory)
void DiffEditorDocument::setDiffFiles(const QList<FileData> &data)
{
m_diffFiles = data;
if (!directory.isEmpty())
m_baseDirectory = directory;
emit documentChanged();
}
@@ -152,14 +150,14 @@ QList<FileData> DiffEditorDocument::diffFiles() const
return m_diffFiles;
}
FilePath DiffEditorDocument::baseDirectory() const
FilePath DiffEditorDocument::workingDirectory() const
{
return m_baseDirectory;
return m_workingDirectory;
}
void DiffEditorDocument::setBaseDirectory(const FilePath &directory)
void DiffEditorDocument::setWorkingDirectory(const FilePath &directory)
{
m_baseDirectory = directory;
m_workingDirectory = directory;
}
void DiffEditorDocument::setStartupFile(const QString &startupFile)
@@ -226,8 +224,8 @@ bool DiffEditorDocument::setContents(const QByteArray &contents)
FilePath DiffEditorDocument::fallbackSaveAsPath() const
{
if (!m_baseDirectory.isEmpty())
return m_baseDirectory;
if (!m_workingDirectory.isEmpty())
return m_workingDirectory;
return FileUtils::homePath();
}
@@ -301,7 +299,8 @@ Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const
setTemporary(false);
emit temporaryStateChanged();
setFilePath(filePath.absoluteFilePath());
setDiffFiles(fileDataList, filePath.absoluteFilePath());
setWorkingDirectory(filePath.absoluteFilePath());
setDiffFiles(fileDataList);
}
endReload(ok);
if (!ok && readResult == TextFileFormat::ReadEncodingError)
@@ -386,7 +385,7 @@ void DiffEditorDocument::beginReload()
m_state = Reloading;
emit changed();
QSignalBlocker blocker(this);
setDiffFiles({}, {});
setDiffFiles({});
setDescription({});
}