diff options
author | hjk <hjk@qt.io> | 2020-02-03 14:56:09 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-02-03 17:29:50 +0000 |
commit | b23dc3a0bf963629b6244b0a752cf284ca6fbe61 (patch) | |
tree | 849120faa53fb3ed6ed15af1a86611a3afe21414 /src/plugins/vcsbase | |
parent | 625fd913e593ffcee6db2555ee110e22437293aa (diff) |
VcsBase: Partially move vcsTimeoutS() to VcsBaseClientSettings
It's the source of information for this, and the plan is to
ramp down and merge *Client and *BasePlugin.
Change-Id: I13f813d1f94a2bd4a704d120493a28b92443605b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/vcsbase')
-rw-r--r-- | src/plugins/vcsbase/vcsbaseclient.cpp | 2 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbaseclientsettings.cpp | 5 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbaseclientsettings.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 505733145b..40e5cd8564 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -214,7 +214,7 @@ SynchronousProcessResponse VcsBaseClientImpl::vcsSynchronousExec(const QString & int VcsBaseClientImpl::vcsTimeoutS() const { - return settings().intValue(VcsBaseClientSettings::timeoutKey); + return m_clientSettings->vcsTimeoutS(); } VcsBaseEditorWidget *VcsBaseClientImpl::createVcsEditor(Core::Id kind, QString title, diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.cpp b/src/plugins/vcsbase/vcsbaseclientsettings.cpp index de6a7a82f0..51acbfa491 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.cpp +++ b/src/plugins/vcsbase/vcsbaseclientsettings.cpp @@ -361,6 +361,11 @@ FilePath VcsBaseClientSettings::binaryPath() const return d->m_binaryFullPath; } +int VcsBaseClientSettings::vcsTimeoutS() const +{ + return intValue(VcsBaseClientSettings::timeoutKey); +} + QStringList VcsBaseClientSettings::searchPathList() const { return stringValue(pathKey).split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); diff --git a/src/plugins/vcsbase/vcsbaseclientsettings.h b/src/plugins/vcsbase/vcsbaseclientsettings.h index e722a56564..db0ca0bf64 100644 --- a/src/plugins/vcsbase/vcsbaseclientsettings.h +++ b/src/plugins/vcsbase/vcsbaseclientsettings.h @@ -80,6 +80,7 @@ public: Utils::FilePath binaryPath() const; QStringList searchPathList() const; + int vcsTimeoutS() const; protected: QString settingsGroup() const; |