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

VcsBase: Remove almost unused access to VcssBaseClientImpl::settings()

Browse Source 
Change-Id: I090714e9724dcc00b37651bb1310d7848066e03e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2023-07-18 14:05:42 +02:00
parent bedab22e63
commit c7cf450bd8
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/subversion/subversionclient.cpp
View File

@@ -234,13 +234,12 @@ void SubversionDiffEditorController::setChangeNumber(int changeNumber)
SubversionDiffEditorController *SubversionClient::findOrCreateDiffEditor(const QString &documentId, SubversionDiffEditorController *SubversionClient::findOrCreateDiffEditor(const QString &documentId,
const FilePath &source, const QString &title, const FilePath &workingDirectory) const FilePath &source, const QString &title, const FilePath &workingDirectory)
{ {
SubversionSettings &settings = Internal::settings();
IDocument *document = DiffEditorController::findOrCreateDocument(documentId, title); IDocument *document = DiffEditorController::findOrCreateDocument(documentId, title);
auto controller = qobject_cast<SubversionDiffEditorController *>( auto controller = qobject_cast<SubversionDiffEditorController *>(
DiffEditorController::controller(document)); DiffEditorController::controller(document));
if (!controller) { if (!controller) {
controller = new SubversionDiffEditorController(document); controller = new SubversionDiffEditorController(document);
controller->setVcsBinary(settings.binaryPath()); controller->setVcsBinary(settings().binaryPath());
controller->setProcessEnvironment(processEnvironment()); controller->setProcessEnvironment(processEnvironment());
controller->setWorkingDirectory(workingDirectory); controller->setWorkingDirectory(workingDirectory);
} }
@@ -271,8 +270,7 @@ void SubversionClient::log(const FilePath &workingDir,
bool enableAnnotationContextMenu, bool enableAnnotationContextMenu,
const std::function<void(Utils::CommandLine &)> &addAuthOptions) const std::function<void(Utils::CommandLine &)> &addAuthOptions)
{ {
auto &settings = static_cast<SubversionSettings &>(this->settings()); const int logCount = settings().logCount();
const int logCount = settings.logCount();
QStringList svnExtraOptions = extraOptions; QStringList svnExtraOptions = extraOptions;
if (logCount > 0) if (logCount > 0)
svnExtraOptions << QLatin1String("-l") << QString::number(logCount); svnExtraOptions << QLatin1String("-l") << QString::number(logCount);

5
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -61,11 +61,6 @@ VcsBaseClientImpl::VcsBaseClientImpl(VcsBaseSettings *baseSettings)
this, &VcsBaseClientImpl::saveSettings); this, &VcsBaseClientImpl::saveSettings);
} }
VcsBaseSettings &VcsBaseClientImpl::settings() const
{
return *m_baseSettings;
}
FilePath VcsBaseClientImpl::vcsBinary() const FilePath VcsBaseClientImpl::vcsBinary() const
{ {
return m_baseSettings->binaryPath(); return m_baseSettings->binaryPath();

2
src/plugins/vcsbase/vcsbaseclient.h
View File

@@ -44,8 +44,6 @@ public:
explicit VcsBaseClientImpl(VcsBaseSettings *baseSettings); explicit VcsBaseClientImpl(VcsBaseSettings *baseSettings);
~VcsBaseClientImpl() override = default; ~VcsBaseClientImpl() override = default;
VcsBaseSettings &settings() const;
virtual Utils::FilePath vcsBinary() const; virtual Utils::FilePath vcsBinary() const;
int vcsTimeoutS() const; int vcsTimeoutS() const;