Apply requested changes

This commit is contained in:
seatedscribe 2017-04-27 22:11:26 +02:00
parent 2e2e37098f
commit eb7f4d2eaa
No known key found for this signature in database
GPG Key ID: C94317E4597B85DC

View File

@ -139,11 +139,11 @@ void CsvImportWidget::updatePreview() {
m_ui->spinBoxSkip->setRange(minSkip, qMax(minSkip, m_parserModel->rowCount() - 1)); m_ui->spinBoxSkip->setRange(minSkip, qMax(minSkip, m_parserModel->rowCount() - 1));
m_ui->spinBoxSkip->setValue(minSkip); m_ui->spinBoxSkip->setValue(minSkip);
int i, emptyId = 0; int emptyId = 0;
QString columnName; QString columnName;
QStringList list(tr("Not present in CSV file")); QStringList list(tr("Not present in CSV file"));
for (i = 1; i < m_parserModel->getCsvCols(); ++i) { for (int i = 1; i < m_parserModel->getCsvCols(); ++i) {
if (m_ui->checkBoxFieldNames->isChecked()) { if (m_ui->checkBoxFieldNames->isChecked()) {
columnName = m_parserModel->getCsvTable().at(0).at(i); columnName = m_parserModel->getCsvTable().at(0).at(i);
if (columnName.isEmpty()) if (columnName.isEmpty())
@ -155,13 +155,13 @@ void CsvImportWidget::updatePreview() {
} }
m_comboModel->setStringList(list); m_comboModel->setStringList(list);
i=1; int j=1;
for (QComboBox* b : m_combos) { for (QComboBox* b : m_combos) {
if (i < m_parserModel->getCsvCols()) if (j < m_parserModel->getCsvCols())
b->setCurrentIndex(i); b->setCurrentIndex(j);
else else
b->setCurrentIndex(0); b->setCurrentIndex(0);
++i; ++j;
} }
} }