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

VcsBase: Use settings instead of client when it suffices

Browse Source 
Change-Id: I145659d3c423361e87c92e8995fa3476d798cc7b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2020-02-03 17:54:41 +01:00
parent b23dc3a0bf
commit 4e4916ce35
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,7 +218,7 @@ void SubversionDiffEditorController::requestDescription()
m_state = GettingDescription; m_state = GettingDescription;
QStringList args(QLatin1String("log")); QStringList args(QLatin1String("log"));
args << SubversionClient::addAuthenticationOptions(client()->settings()); args << SubversionClient::addAuthenticationOptions(settings());
args << QLatin1String("-r"); args << QLatin1String("-r");
args << QString::number(m_changeNumber); args << QString::number(m_changeNumber);
runCommand(QList<QStringList>() << args, VcsCommand::SshPasswordPrompt); runCommand(QList<QStringList>() << args, VcsCommand::SshPasswordPrompt);
@@ -230,7 +230,7 @@ void SubversionDiffEditorController::requestDiff()
QStringList args; QStringList args;
args << QLatin1String("diff"); args << QLatin1String("diff");
args << SubversionClient::addAuthenticationOptions(client()->settings()); args << SubversionClient::addAuthenticationOptions(settings());
args << QLatin1String("--internal-diff"); args << QLatin1String("--internal-diff");
if (ignoreWhitespace()) if (ignoreWhitespace())
args << QLatin1String("-x") << QLatin1String("-uw"); args << QLatin1String("-x") << QLatin1String("-uw");

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

@@ -26,6 +26,7 @@
#include "vcsbasediffeditorcontroller.h" #include "vcsbasediffeditorcontroller.h"
#include "vcsbaseclient.h" #include "vcsbaseclient.h"
#include "vcscommand.h" #include "vcscommand.h"
#include "vcsbaseclientsettings.h"
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
@@ -272,9 +273,9 @@ void VcsBaseDiffEditorController::processCommandOutput(const QString &output)
d->processDiff(output); d->processDiff(output);
} }
VcsBaseClientImpl *VcsBaseDiffEditorController::client() const const VcsBaseClientSettings &VcsBaseDiffEditorController::settings() const
{ {
return d->m_client; return d->m_client->settings();
} }
QString VcsBaseDiffEditorController::workingDirectory() const QString VcsBaseDiffEditorController::workingDirectory() const

3
src/plugins/vcsbase/vcsbasediffeditorcontroller.h
View File

@@ -33,6 +33,7 @@ namespace Core { class IDocument; }
namespace VcsBase { namespace VcsBase {
class VcsBaseClientImpl; class VcsBaseClientImpl;
class VcsBaseClientSettings;
class VcsBaseDiffEditorControllerPrivate; class VcsBaseDiffEditorControllerPrivate;
class VCSBASE_EXPORT VcsBaseDiffEditorController : public DiffEditor::DiffEditorController class VCSBASE_EXPORT VcsBaseDiffEditorController : public DiffEditor::DiffEditorController
@@ -49,7 +50,7 @@ protected:
void runCommand(const QList<QStringList> &args, unsigned flags, QTextCodec *codec = nullptr); void runCommand(const QList<QStringList> &args, unsigned flags, QTextCodec *codec = nullptr);
virtual void processCommandOutput(const QString &output); virtual void processCommandOutput(const QString &output);
VcsBaseClientImpl *client() const; const VcsBaseClientSettings &settings() const;
QString workingDirectory() const; QString workingDirectory() const;
void setStartupFile(const QString &startupFile); void setStartupFile(const QString &startupFile);
QString startupFile() const; QString startupFile() const;