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

Svn: Fix warning about overriding virtual methods

Browse Source 
... with a method that has different arguments.

Change-Id: Iae3238d8feeb2602cb4ab39502a74f039c850933
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-01-06 15:46:58 +01:00
parent 1a89f7c7e5
commit ece373387c
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,8 +325,10 @@ SubversionDiffEditorReloader *SubversionClient::findOrCreateDiffEditor(const QSt
return reloader; 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 vcsCmdString = vcsCommandString(DiffCommand);
const QString documentId = VcsBaseEditor::getTitleId(workingDirectory, files); const QString documentId = VcsBaseEditor::getTitleId(workingDirectory, files);
const QString title = vcsEditorTitle(vcsCmdString, documentId); const QString title = vcsEditorTitle(vcsCmdString, documentId);

3
src/plugins/subversion/subversionclient.h
View File

@@ -61,7 +61,8 @@ public:
const QString &commitMessageFile, const QString &commitMessageFile,
const QStringList &extraOptions = QStringList()); 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); void describe(const QString &workingDirectory, int changeNumber, const QString &title);
QString findTopLevelForFile(const QFileInfo &file) const; QString findTopLevelForFile(const QFileInfo &file) const;
QStringList revisionSpec(const QString &revision) const; QStringList revisionSpec(const QString &revision) const;

10
src/plugins/subversion/subversionplugin.cpp
View File

@@ -512,7 +512,7 @@ bool SubversionPlugin::submitEditorAboutToClose()
void SubversionPlugin::diffCommitFiles(const QStringList &files) 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) SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QString &fileName)
@@ -638,14 +638,16 @@ void SubversionPlugin::diffProject()
QTC_ASSERT(state.hasProject(), return); QTC_ASSERT(state.hasProject(), return);
const QString relativeProject = state.relativeCurrentProject(); const QString relativeProject = state.relativeCurrentProject();
m_client->diff(state.currentProjectTopLevel(), m_client->diff(state.currentProjectTopLevel(),
relativeProject.isEmpty() ? QStringList() : QStringList(relativeProject)); relativeProject.isEmpty() ? QStringList() : QStringList(relativeProject),
QStringList());
} }
void SubversionPlugin::diffCurrentFile() void SubversionPlugin::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->diff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()),
QStringList());
} }
void SubversionPlugin::startCommitCurrentFile() void SubversionPlugin::startCommitCurrentFile()
@@ -740,7 +742,7 @@ void SubversionPlugin::diffRepository()
{ {
const VcsBasePluginState state = currentState(); const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return); QTC_ASSERT(state.hasTopLevel(), return);
m_client->diff(state.topLevel(), QStringList()); m_client->diff(state.topLevel(), QStringList(), QStringList());
} }
void SubversionPlugin::statusRepository() void SubversionPlugin::statusRepository()