Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2013-10-15 14:31:02 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2013-10-17 08:03:37 (GMT) |
| commit | 5f0eeca41f0559c5b416c78fd51445fd93cf61ff (patch) | |
| tree | ad4b7bb586385be7916213999dfb4248dae2c437 /Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp | |
| parent | 040ceccfc67ce41fdd836ae874da68e04e6ca944 (diff) | |
| download | swift-5f0eeca41f0559c5b416c78fd51445fd93cf61ff.zip swift-5f0eeca41f0559c5b416c78fd51445fd93cf61ff.tar.bz2 | |
VCard: Assert existence of field widgets instead of if-testing.
Change-Id: Ie92f4f1714b8fb6dc5c1e2729151c8e00c33215b
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp index 9ecc8e0..7f6c23d 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp @@ -96,23 +96,24 @@ VCard::Organization QtVCardOrganizationField::getOrganization() const { } void QtVCardOrganizationField::handleEditibleChanged(bool isEditable) { - if (organizationLineEdit) { - 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) + ", "; - } + 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); } + label += organizationLineEdit->text(); + organizationLabel->setText(label); } - if (unitsTreeWidget) unitsTreeWidget->setVisible(isEditable); + unitsTreeWidget->setVisible(isEditable); } void QtVCardOrganizationField::handleItemChanged(QTreeWidgetItem *, int) { |