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

DiffEditor: Simplify internals

Browse Source 
Don't pass startupFile arg on every setDiffFiles.
Provide a setStartupFile() separate setter inside
DiffEditorDocument and call it directly from
DiffEditorController::setStartupFile().

Correct updateDescription() implementation.

Change-Id: Ie489431632bdabc61e2c692d09caf7b2e3990764
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-12-14 09:10:46 +01:00
parent ac7a582ca9
commit 042087ab1d
8 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
View File

@@ -50,7 +50,6 @@ public:
Environment m_processEnvironment;
FilePath m_vcsBinary;
int m_vscTimeoutS;
QString m_startupFile;
QPointer<VcsCommand> m_command;
QFutureWatcher<QList<FileData>> *m_processWatcher = nullptr;
};
@@ -76,7 +75,7 @@ void VcsBaseDiffEditorControllerPrivate::processingFinished()
m_processWatcher->deleteLater();
m_processWatcher = nullptr;
q->setDiffFiles(fileDataList, q->workingDirectory(), q->startupFile());
q->setDiffFiles(fileDataList, q->workingDirectory());
q->reloadFinished(success);
}
@@ -186,16 +185,6 @@ FilePath VcsBaseDiffEditorController::workingDirectory() const
return d->m_directory;
}
void VcsBaseDiffEditorController::setStartupFile(const QString &startupFile)
{
d->m_startupFile = startupFile;
}
QString VcsBaseDiffEditorController::startupFile() const
{
return d->m_startupFile;
}
void VcsBase::VcsBaseDiffEditorController::setWorkingDirectory(const FilePath &workingDir)
{
d->m_directory = workingDir;