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

VCS: Fix warning about hiding a virtual method

Browse Source 
Change-Id: I8f314486a50f9b7015572615d2306d5c7e2f1670
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
This commit is contained in:
Tobias Hunger
2012-01-19 15:33:20 +01:00
parent 8e3b9d38e8
commit 4894c559ac
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitclient.cpp
View File

@@ -1798,7 +1798,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
int commitCount = 0; int commitCount = 0;
for (int i = 0; i < model->rowCount(); ++i) { 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); QString file = model->file(i);
const bool checked = model->checked(i); const bool checked = model->checked(i);

2
src/plugins/git/gitsubmiteditor.cpp
View File

@@ -92,7 +92,7 @@ void GitSubmitEditor::slotDiffSelected(const QStringList &files)
for (int r = 0; r < rowCount; r++) { for (int r = 0; r < rowCount; r++) {
const QString fileName = m_model->item(r, fileColumn)->text(); const QString fileName = m_model->item(r, fileColumn)->text();
if (files.contains(fileName)) { 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) if (state & CommitData::StagedFile)
stagedFiles.push_back(fileName); stagedFiles.push_back(fileName);
else if (state != CommitData::UntrackedFile) else if (state != CommitData::UntrackedFile)

2
src/plugins/vcsbase/submitfilemodel.cpp
View File

@@ -119,7 +119,7 @@ bool SubmitFileModel::checked(int row) const
return (item(row)->checkState() == Qt::Checked); return (item(row)->checkState() == Qt::Checked);
} }
QVariant SubmitFileModel::data(int row) const QVariant SubmitFileModel::extraData(int row) const
{ {
if (row < 0 || row >= rowCount()) if (row < 0 || row >= rowCount())
return false; return false;

2
src/plugins/vcsbase/submitfilemodel.h
View File

@@ -58,7 +58,7 @@ public:
QString state(int row) const; QString state(int row) const;
QString file(int row) const; QString file(int row) const;
bool checked(int row) const; bool checked(int row) const;
QVariant data(int row) const; QVariant extraData(int row) const;
bool hasCheckedFiles() const; bool hasCheckedFiles() const;