diff options
Diffstat (limited to 'src/plugins/git/gitsubmiteditor.cpp')
| -rw-r--r-- | src/plugins/git/gitsubmiteditor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index 7b56aa7fdd..895efe61a1 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -70,9 +70,9 @@ void GitSubmitEditor::setCommitData(const CommitData &d) if (!d.files.isEmpty()) { for (QList<CommitData::StateFilePair>::const_iterator it = d.files.constBegin(); it != d.files.constEnd(); ++it) { - const CommitData::FileState state = it->first; + const FileStates state = it->first; const QString file = it->second; - m_model->addFile(file, CommitData::stateDisplayName(state), state & CommitData::StagedFile, + m_model->addFile(file, CommitData::stateDisplayName(state), state & StagedFile, QVariant(static_cast<int>(state))); } } @@ -89,10 +89,10 @@ 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->extraData(r).toInt()); - if (state & CommitData::StagedFile) + const FileStates state = static_cast<FileStates>(m_model->extraData(r).toInt()); + if (state & StagedFile) stagedFiles.push_back(fileName); - else if (state != CommitData::UntrackedFile) + else if (state != UntrackedFile) unstagedFiles.push_back(fileName); } } |