Commit 4894c559 authored by Tobias Hunger's avatar Tobias Hunger

VCS: Fix warning about hiding a virtual method

Change-Id: I8f314486a50f9b7015572615d2306d5c7e2f1670
Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@nokia.com>
parent 8e3b9d38
......@@ -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<CommitData::FileState>(model->data(i).toInt());
const CommitData::FileState state = static_cast<CommitData::FileState>(model->extraData(i).toInt());
QString file = model->file(i);
const bool checked = model->checked(i);
......
......@@ -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<CommitData::FileState>(m_model->data(r).toInt());
const CommitData::FileState state = static_cast<CommitData::FileState>(m_model->extraData(r).toInt());
if (state & CommitData::StagedFile)
stagedFiles.push_back(fileName);
else if (state != CommitData::UntrackedFile)
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment