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

VCS: Use SubmitFileModel in SubmitEditorWidget

Browse Source 
Much cleaner

Change-Id: I090e5d04e5afae1023fa58eca1ef416ddc069165
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-02 22:19:04 +02:00
committed by Tobias Hunger
parent 34db64c752
commit 01084aaa38
8 changed files with 50 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -34,6 +34,7 @@
#include "submiteditorfile.h"
#include "submiteditorwidget.h"
#include "submitfieldwidget.h"
#include "submitfilemodel.h"
#include "vcsbaseoutputwindow.h"
#include "vcsplugin.h"
@@ -318,16 +319,6 @@ void VcsBaseSubmitEditor::unregisterActions(QAction *editorUndoAction, QAction
d->m_diffAction = d->m_submitAction = 0;
}
int VcsBaseSubmitEditor::fileNameColumn() const
{
return d->m_widget->fileNameColumn();
}
void VcsBaseSubmitEditor::setFileNameColumn(int c)
{
d->m_widget->setFileNameColumn(c);
}
QAbstractItemView::SelectionMode VcsBaseSubmitEditor::fileListSelectionMode() const
{
return d->m_widget->fileListSelectionMode();
@@ -486,7 +477,7 @@ QStringList VcsBaseSubmitEditor::checkedFiles() const
return d->m_widget->checkedFiles();
}
void VcsBaseSubmitEditor::setFileModel(QAbstractItemModel *m, const QString &repositoryDirectory)
void VcsBaseSubmitEditor::setFileModel(SubmitFileModel *m, const QString &repositoryDirectory)
{
d->m_widget->setFileModel(m);
@@ -495,8 +486,7 @@ void VcsBaseSubmitEditor::setFileModel(QAbstractItemModel *m, const QString &rep
// Iterate over the files and get interesting symbols
for (int row = 0; row < m->rowCount(); ++row) {
const QString fileName = m->data(m->index(row, d->m_widget->fileNameColumn())).toString();
const QFileInfo fileInfo(repositoryDirectory, fileName);
const QFileInfo fileInfo(repositoryDirectory, m->file(row));
// Add file name
uniqueSymbols.insert(fileInfo.fileName());
@@ -539,7 +529,7 @@ void VcsBaseSubmitEditor::setFileModel(QAbstractItemModel *m, const QString &rep
}
}
QAbstractItemModel *VcsBaseSubmitEditor::fileModel() const
SubmitFileModel *VcsBaseSubmitEditor::fileModel() const
{
return d->m_widget->fileModel();
}