From 4894c559ac866dade091bd76a8e5749bb11daa53 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 19 Jan 2012 15:33:20 +0100 Subject: [PATCH] VCS: Fix warning about hiding a virtual method Change-Id: I8f314486a50f9b7015572615d2306d5c7e2f1670 Reviewed-by: Erik Verbruggen --- src/plugins/git/gitclient.cpp | 2 +- src/plugins/git/gitsubmiteditor.cpp | 2 +- src/plugins/vcsbase/submitfilemodel.cpp | 2 +- src/plugins/vcsbase/submitfilemodel.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 9b5637bf831..3465a4e8e34 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1798,7 +1798,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory, int commitCount = 0; for (int i = 0; i < model->rowCount(); ++i) { - const CommitData::FileState state = static_cast(model->data(i).toInt()); + const CommitData::FileState state = static_cast(model->extraData(i).toInt()); QString file = model->file(i); const bool checked = model->checked(i); diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index 53525649a94..2c9764d087b 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -92,7 +92,7 @@ void GitSubmitEditor::slotDiffSelected(const QStringList &files) for (int r = 0; r < rowCount; r++) { const QString fileName = m_model->item(r, fileColumn)->text(); if (files.contains(fileName)) { - const CommitData::FileState state = static_cast(m_model->data(r).toInt()); + const CommitData::FileState state = static_cast(m_model->extraData(r).toInt()); if (state & CommitData::StagedFile) stagedFiles.push_back(fileName); else if (state != CommitData::UntrackedFile) diff --git a/src/plugins/vcsbase/submitfilemodel.cpp b/src/plugins/vcsbase/submitfilemodel.cpp index 71beb55699b..5c148748788 100644 --- a/src/plugins/vcsbase/submitfilemodel.cpp +++ b/src/plugins/vcsbase/submitfilemodel.cpp @@ -119,7 +119,7 @@ bool SubmitFileModel::checked(int row) const return (item(row)->checkState() == Qt::Checked); } -QVariant SubmitFileModel::data(int row) const +QVariant SubmitFileModel::extraData(int row) const { if (row < 0 || row >= rowCount()) return false; diff --git a/src/plugins/vcsbase/submitfilemodel.h b/src/plugins/vcsbase/submitfilemodel.h index e51881e2d68..8e36ca7d0db 100644 --- a/src/plugins/vcsbase/submitfilemodel.h +++ b/src/plugins/vcsbase/submitfilemodel.h @@ -58,7 +58,7 @@ public: QString state(int row) const; QString file(int row) const; bool checked(int row) const; - QVariant data(int row) const; + QVariant extraData(int row) const; bool hasCheckedFiles() const;