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

Mercurial: Get rid of a fake overload

Browse Source 
The only callers are coming from the Mercurial plugin.
The overload doesn't call the base implementation.
So, there is no relation to the base impl.

Change-Id: I718e3ab196e9df77f6682b3230a8739db58c0238
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2024-01-15 22:11:46 +01:00
parent d5d08c2e53
commit b855b1f907
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mercurial/mercurialclient.cpp
View File

@@ -307,7 +307,7 @@ void MercurialClient::commit(const FilePath &repositoryRoot, const QStringList &
VcsBaseClient::commit(repositoryRoot, files, commitMessageFile, args); VcsBaseClient::commit(repositoryRoot, files, commitMessageFile, args);
} }
void MercurialClient::diff(const FilePath &workingDir, const QStringList &files, void MercurialClient::showDiffEditor(const FilePath &workingDir, const QStringList &files,
const QStringList &extraOptions) const QStringList &extraOptions)
{ {
Q_UNUSED(extraOptions) Q_UNUSED(extraOptions)

4
src/plugins/mercurial/mercurialclient.h
View File

@@ -45,8 +45,8 @@ public:
void commit(const Utils::FilePath &repositoryRoot, const QStringList &files, void commit(const Utils::FilePath &repositoryRoot, const QStringList &files,
const QString &commitMessageFile, const QString &commitMessageFile,
const QStringList &extraOptions = QStringList()) override; const QStringList &extraOptions = QStringList()) override;
void diff(const Utils::FilePath &workingDir, const QStringList &files = {}, void showDiffEditor(const Utils::FilePath &workingDir, const QStringList &files = {},
const QStringList &extraOptions = {}) override; const QStringList &extraOptions = {});
void import(const Utils::FilePath &repositoryRoot, const QStringList &files, void import(const Utils::FilePath &repositoryRoot, const QStringList &files,
const QStringList &extraOptions = {}) override; const QStringList &extraOptions = {}) override;
void revertAll(const Utils::FilePath &workingDir, const QString &revision = {}, void revertAll(const Utils::FilePath &workingDir, const QString &revision = {},

8
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -339,14 +339,14 @@ void MercurialPluginPrivate::diffCurrentFile()
{ {
const VcsBasePluginState state = currentState(); const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return); QTC_ASSERT(state.hasFile(), return);
m_client.diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); m_client.showDiffEditor(state.currentFileTopLevel(), {state.relativeCurrentFile()});
} }
void MercurialPluginPrivate::logCurrentFile() void MercurialPluginPrivate::logCurrentFile()
{ {
const VcsBasePluginState state = currentState(); const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasFile(), return); QTC_ASSERT(state.hasFile(), return);
m_client.log(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), {}, true); m_client.log(state.currentFileTopLevel(), {state.relativeCurrentFile()}, {}, true);
} }
void MercurialPluginPrivate::revertCurrentFile() void MercurialPluginPrivate::revertCurrentFile()
@@ -402,7 +402,7 @@ void MercurialPluginPrivate::diffRepository()
{ {
const VcsBasePluginState state = currentState(); const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return); QTC_ASSERT(state.hasTopLevel(), return);
m_client.diff(state.topLevel()); m_client.showDiffEditor(state.topLevel());
} }
void MercurialPluginPrivate::logRepository() void MercurialPluginPrivate::logRepository()
@@ -621,7 +621,7 @@ void MercurialPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusI
void MercurialPluginPrivate::diffFromEditorSelected(const QStringList &files) void MercurialPluginPrivate::diffFromEditorSelected(const QStringList &files)
{ {
m_client.diff(m_submitRepository, files); m_client.showDiffEditor(m_submitRepository, files);
} }
bool MercurialPluginPrivate::activateCommit() bool MercurialPluginPrivate::activateCommit()