forked from qt-creator/qt-creator
Subversion: Get rid of a fake overload
The only callers are coming from the Subversion plugin. The overload doesn't call the base implementation. So, there is no relation to the base impl. Change-Id: I71c9587f1eb2493a9a58df7d814c4cadfc23adf0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -245,8 +245,8 @@ SubversionDiffEditorController *SubversionClient::findOrCreateDiffEditor(const Q
|
||||
return controller;
|
||||
}
|
||||
|
||||
void SubversionClient::diff(const FilePath &workingDirectory, const QStringList &files,
|
||||
const QStringList &extraOptions)
|
||||
void SubversionClient::showDiffEditor(const FilePath &workingDirectory, const QStringList &files,
|
||||
const QStringList &extraOptions)
|
||||
{
|
||||
Q_UNUSED(extraOptions)
|
||||
|
||||
|
||||
@@ -29,9 +29,9 @@ public:
|
||||
const QString &commitMessageFile,
|
||||
const QStringList &extraOptions = {}) override;
|
||||
|
||||
void diff(const Utils::FilePath &workingDirectory,
|
||||
const QStringList &files,
|
||||
const QStringList &extraOptions) override;
|
||||
void showDiffEditor(const Utils::FilePath &workingDirectory,
|
||||
const QStringList &files = {},
|
||||
const QStringList &extraOptions = {});
|
||||
|
||||
void log(const Utils::FilePath &workingDir,
|
||||
const QStringList &files = {},
|
||||
|
||||
@@ -568,7 +568,7 @@ bool SubversionPluginPrivate::activateCommit()
|
||||
|
||||
void SubversionPluginPrivate::diffCommitFiles(const QStringList &files)
|
||||
{
|
||||
m_client->diff(m_commitRepository, files, QStringList());
|
||||
m_client->showDiffEditor(m_commitRepository, files);
|
||||
}
|
||||
|
||||
SubversionSubmitEditor *SubversionPluginPrivate::openSubversionSubmitEditor(const QString &fileName)
|
||||
@@ -686,22 +686,23 @@ void SubversionPluginPrivate::diffProject()
|
||||
const VcsBasePluginState state = currentState();
|
||||
QTC_ASSERT(state.hasProject(), return);
|
||||
const QString relativeProject = state.relativeCurrentProject();
|
||||
m_client->diff(state.currentProjectTopLevel(),
|
||||
relativeProject.isEmpty() ? QStringList() : QStringList(relativeProject), {});
|
||||
m_client->showDiffEditor(state.currentProjectTopLevel(),
|
||||
relativeProject.isEmpty() ? QStringList()
|
||||
: QStringList(relativeProject));
|
||||
}
|
||||
|
||||
void SubversionPluginPrivate::diffCurrentFile()
|
||||
{
|
||||
const VcsBasePluginState state = currentState();
|
||||
QTC_ASSERT(state.hasFile(), return);
|
||||
m_client->diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), {});
|
||||
m_client->showDiffEditor(state.currentFileTopLevel(), {state.relativeCurrentFile()});
|
||||
}
|
||||
|
||||
void SubversionPluginPrivate::startCommitCurrentFile()
|
||||
{
|
||||
const VcsBasePluginState state = currentState();
|
||||
QTC_ASSERT(state.hasFile(), return);
|
||||
startCommit(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()));
|
||||
startCommit(state.currentFileTopLevel(), {state.relativeCurrentFile()});
|
||||
}
|
||||
|
||||
void SubversionPluginPrivate::startCommitAll()
|
||||
@@ -791,7 +792,7 @@ void SubversionPluginPrivate::diffRepository()
|
||||
{
|
||||
const VcsBasePluginState state = currentState();
|
||||
QTC_ASSERT(state.hasTopLevel(), return);
|
||||
m_client->diff(state.topLevel(), QStringList(), QStringList());
|
||||
m_client->showDiffEditor(state.topLevel());
|
||||
}
|
||||
|
||||
void SubversionPluginPrivate::statusRepository()
|
||||
|
||||
Reference in New Issue
Block a user