summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp')
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp
index 9e303b7..5162c73 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp
@@ -51,101 +51,101 @@ void QtVCardOrganizationField::setupContentWidgets() {
#if QT_VERSION >= 0x050000
unitsTreeWidget->header()->setSectionResizeMode(0, QHeaderView::Stretch);
#else
unitsTreeWidget->header()->setResizeMode(0, QHeaderView::Stretch);
#endif
unitsTreeWidget->setHeaderHidden(true);
unitsTreeWidget->setRootIsDecorated(false);
unitsTreeWidget->setEditTriggers(QAbstractItemView::DoubleClicked);
unitsTreeWidget->setItemDelegateForColumn(1, itemDelegate);
connect(unitsTreeWidget, SIGNAL(itemChanged(QTreeWidgetItem*,int)), SLOT(handleItemChanged(QTreeWidgetItem*,int)));
getGridLayout()->addWidget(unitsTreeWidget, getGridLayout()->rowCount()-1, 4, 2, 1);
QTreeWidgetItem* item = new QTreeWidgetItem(QStringList("") << "");
item->setFlags(item->flags() | Qt::ItemIsEditable);
unitsTreeWidget->addTopLevelItem(item);
getTagComboBox()->hide();
organizationLabel->hide();
childWidgets << organizationLabel << organizationLineEdit << unitsTreeWidget;
}
bool QtVCardOrganizationField::isEmpty() const {
return organizationLineEdit->text().isEmpty() && unitsTreeWidget->model()->rowCount() != 0;
}
void QtVCardOrganizationField::setOrganization(const VCard::Organization& organization) {
organizationLineEdit->setText(P2QSTRING(organization.name));
unitsTreeWidget->clear();
- foreach(std::string unit, organization.units) {
+ for (const auto& unit : organization.units) {
QTreeWidgetItem* item = new QTreeWidgetItem(QStringList(P2QSTRING(unit)) << "");
item->setFlags(item->flags() | Qt::ItemIsEditable);
unitsTreeWidget->addTopLevelItem(item);
}
QTreeWidgetItem* item = new QTreeWidgetItem(QStringList("") << "");
item->setFlags(item->flags() | Qt::ItemIsEditable);
unitsTreeWidget->addTopLevelItem(item);
}
VCard::Organization QtVCardOrganizationField::getOrganization() const {
VCard::Organization organization;
organization.name = Q2PSTRING(organizationLineEdit->text());
for(int i=0; i < unitsTreeWidget->topLevelItemCount(); ++i) {
QTreeWidgetItem* row = unitsTreeWidget->topLevelItem(i);
if (!row->text(0).isEmpty()) {
organization.units.push_back(Q2PSTRING(row->text(0)));
}
}
return organization;
}
void QtVCardOrganizationField::handleEditibleChanged(bool isEditable) {
assert(organizationLineEdit);
assert(unitsTreeWidget);
organizationLineEdit->setVisible(isEditable);
organizationLabel->setVisible(!isEditable);
if (!isEditable) {
QString label;
for(int i=0; i < unitsTreeWidget->topLevelItemCount(); ++i) {
QTreeWidgetItem* row = unitsTreeWidget->topLevelItem(i);
if (!row->text(0).isEmpty()) {
label += row->text(0) + ", ";
}
}
label += organizationLineEdit->text();
organizationLabel->setText(label);
}
unitsTreeWidget->setVisible(isEditable);
}
void QtVCardOrganizationField::handleItemChanged(QTreeWidgetItem *, int) {
guaranteeEmptyRow();
}
void QtVCardOrganizationField::handleRowsRemoved(const QModelIndex&, int, int) {
guaranteeEmptyRow();
}
void QtVCardOrganizationField::guaranteeEmptyRow() {
bool hasEmptyRow = false;
QList<QTreeWidgetItem*> rows = unitsTreeWidget->findItems("", Qt::MatchFixedString);
- foreach(QTreeWidgetItem* row, rows) {
+ for (auto row : rows) {
if (row->text(0).isEmpty()) {
hasEmptyRow = true;
}
}
if (!hasEmptyRow) {
QTreeWidgetItem* item = new QTreeWidgetItem(QStringList("") << "");
item->setFlags(item->flags() | Qt::ItemIsEditable);
unitsTreeWidget->addTopLevelItem(item);
unitsTreeWidget->setCurrentItem(item);
}
}
}