From ece373387c7d434d2340ddaa1793be9772ac7bf2 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 6 Jan 2015 15:46:58 +0100 Subject: [PATCH] Svn: Fix warning about overriding virtual methods ... with a method that has different arguments. Change-Id: Iae3238d8feeb2602cb4ab39502a74f039c850933 Reviewed-by: Orgad Shaneh --- src/plugins/subversion/subversionclient.cpp | 4 +++- src/plugins/subversion/subversionclient.h | 3 ++- src/plugins/subversion/subversionplugin.cpp | 10 ++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp index b394e689046..4f6688b6dbb 100644 --- a/src/plugins/subversion/subversionclient.cpp +++ b/src/plugins/subversion/subversionclient.cpp @@ -325,8 +325,10 @@ SubversionDiffEditorReloader *SubversionClient::findOrCreateDiffEditor(const QSt return reloader; } -void SubversionClient::diff(const QString &workingDirectory, const QStringList &files) +void SubversionClient::diff(const QString &workingDirectory, const QStringList &files, const QStringList &extraOptions) { + Q_UNUSED(extraOptions); + const QString vcsCmdString = vcsCommandString(DiffCommand); const QString documentId = VcsBaseEditor::getTitleId(workingDirectory, files); const QString title = vcsEditorTitle(vcsCmdString, documentId); diff --git a/src/plugins/subversion/subversionclient.h b/src/plugins/subversion/subversionclient.h index 89de01333ec..5bdc35b96a8 100644 --- a/src/plugins/subversion/subversionclient.h +++ b/src/plugins/subversion/subversionclient.h @@ -61,7 +61,8 @@ public: const QString &commitMessageFile, const QStringList &extraOptions = QStringList()); - void diff(const QString &workingDirectory, const QStringList &files); + void diff(const QString &workingDirectory, const QStringList &files, + const QStringList &extraOptions); void describe(const QString &workingDirectory, int changeNumber, const QString &title); QString findTopLevelForFile(const QFileInfo &file) const; QStringList revisionSpec(const QString &revision) const; diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index e90083b57d7..7e69673bb08 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -512,7 +512,7 @@ bool SubversionPlugin::submitEditorAboutToClose() void SubversionPlugin::diffCommitFiles(const QStringList &files) { - m_client->diff(m_commitRepository, files); + m_client->diff(m_commitRepository, files, QStringList()); } SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QString &fileName) @@ -638,14 +638,16 @@ void SubversionPlugin::diffProject() QTC_ASSERT(state.hasProject(), return); const QString relativeProject = state.relativeCurrentProject(); m_client->diff(state.currentProjectTopLevel(), - relativeProject.isEmpty() ? QStringList() : QStringList(relativeProject)); + relativeProject.isEmpty() ? QStringList() : QStringList(relativeProject), + QStringList()); } void SubversionPlugin::diffCurrentFile() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return); - m_client->diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); + m_client->diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), + QStringList()); } void SubversionPlugin::startCommitCurrentFile() @@ -740,7 +742,7 @@ void SubversionPlugin::diffRepository() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); - m_client->diff(state.topLevel(), QStringList()); + m_client->diff(state.topLevel(), QStringList(), QStringList()); } void SubversionPlugin::statusRepository()