Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2013-10-15 14:31:02 (GMT)
committerSwift Review <review@swift.im>2013-10-17 08:03:37 (GMT)
commit5f0eeca41f0559c5b416c78fd51445fd93cf61ff (patch)
treead4b7bb586385be7916213999dfb4248dae2c437
parent040ceccfc67ce41fdd836ae874da68e04e6ca944 (diff)
downloadswift-contrib-5f0eeca41f0559c5b416c78fd51445fd93cf61ff.zip
swift-contrib-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
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp34
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp14
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardDescriptionField.cpp4
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp25
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardInternetEMailField.cpp11
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardJIDField.cpp11
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp7
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardRoleField.cpp4
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardTelephoneField.cpp4
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardTitleField.cpp4
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardURLField.cpp11
11 files changed, 72 insertions, 57 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp
index d9bb4fe..f394af0 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardAddressField.cpp
@@ -139,18 +139,28 @@ VCard::Address QtVCardAddressField::getAddress() const {
void QtVCardAddressField::handleEditibleChanged(bool isEditable) {
- if (streetLineEdit) streetLineEdit->setEditable(isEditable);
- if (poboxLineEdit) poboxLineEdit->setEditable(isEditable);
- if (addressextLineEdit) addressextLineEdit->setEditable(isEditable);
- if (cityLineEdit) cityLineEdit->setEditable(isEditable);
- if (pocodeLineEdit) pocodeLineEdit->setEditable(isEditable);
- if (regionLineEdit) regionLineEdit->setEditable(isEditable);
- if (countryLineEdit) countryLineEdit->setEditable(isEditable);
-
- if (deliveryTypeLabel) {
+ assert(streetLineEdit);
+ assert(poboxLineEdit);
+ assert(addressextLineEdit);
+ assert(cityLineEdit);
+ assert(pocodeLineEdit);
+ assert(regionLineEdit);
+ assert(countryLineEdit);
+ assert(deliveryTypeLabel);
+ assert(domesticRadioButton);
+ assert(internationalRadioButton);
+
+ streetLineEdit->setEditable(isEditable);
+ poboxLineEdit->setEditable(isEditable);
+ addressextLineEdit->setEditable(isEditable);
+ cityLineEdit->setEditable(isEditable);
+ pocodeLineEdit->setEditable(isEditable);
+ regionLineEdit->setEditable(isEditable);
+ countryLineEdit->setEditable(isEditable);
+
deliveryTypeLabel->setText(buttonGroup->checkedButton() == 0 ? "" : buttonGroup->checkedButton()->text());
deliveryTypeLabel->setVisible(!isEditable);
- }
- if (domesticRadioButton) domesticRadioButton->setVisible(isEditable);
- if (internationalRadioButton) internationalRadioButton->setVisible(isEditable);
+
+ domesticRadioButton->setVisible(isEditable);
+ internationalRadioButton->setVisible(isEditable);
foreach (QWidget* widget, textFields) {
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp
index 20f48b9..98e313f 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardAddressLabelField.cpp
@@ -82,15 +82,17 @@ VCard::AddressLabel QtVCardAddressLabelField::getAddressLabel() const {
void QtVCardAddressLabelField::handleEditibleChanged(bool isEditable) {
- if (addressLabelPlainTextEdit) {
+ assert(addressLabelPlainTextEdit);
+ assert(deliveryTypeLabel);
+ assert(domesticRadioButton);
+ assert(internationalRadioButton);
+
addressLabelPlainTextEdit->setReadOnly(!isEditable);
addressLabelPlainTextEdit->setStyleSheet(isEditable ? "" : "QPlainTextEdit { background: transparent; }");
- }
- if (deliveryTypeLabel) {
deliveryTypeLabel->setText(buttonGroup->checkedButton() == 0 ? "" : buttonGroup->checkedButton()->text());
deliveryTypeLabel->setVisible(!isEditable);
- }
- if (domesticRadioButton) domesticRadioButton->setVisible(isEditable);
- if (internationalRadioButton) internationalRadioButton->setVisible(isEditable);
+
+ domesticRadioButton->setVisible(isEditable);
+ internationalRadioButton->setVisible(isEditable);
}
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardDescriptionField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardDescriptionField.cpp
index f907d78..f16c351 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardDescriptionField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardDescriptionField.cpp
@@ -45,5 +45,6 @@ std::string QtVCardDescriptionField::getDescription() const {
void QtVCardDescriptionField::handleEditibleChanged(bool isEditable) {
- if (descriptionPlainTextEdit) {
+ assert(descriptionPlainTextEdit);
+
if (isEditable) {
descriptionPlainTextEdit->setMinimumHeight(70);
@@ -60,5 +61,4 @@ void QtVCardDescriptionField::handleEditibleChanged(bool isEditable) {
descriptionPlainTextEdit->setStyleSheet(isEditable ? "" : "QPlainTextEdit { background: transparent; }");
}
-}
}
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp
index 5b3ef87..f8b9247 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardGeneralField.cpp
@@ -5,15 +5,15 @@
*/
-#include "QtVCardGeneralField.h"
+#include <Swift/QtUI/QtVCardWidget/QtVCardGeneralField.h>
+
+#include <cassert>
#include <QHBoxLayout>
-#include <Swiften/Base/Log.h>
namespace Swift {
QtVCardGeneralField::QtVCardGeneralField(QWidget* parent, QGridLayout* layout, bool editable, int row, QString label, bool preferrable, bool taggable) :
- QWidget(parent), preferrable(preferrable), taggable(taggable), layout(layout), row(row), preferredCheckBox(0), label(0), labelText(label),
+ QWidget(parent), editable(editable), preferrable(preferrable), taggable(taggable), layout(layout), row(row), preferredCheckBox(0), label(0), labelText(label),
tagComboBox(0), closeButton(0) {
- setEditable(editable);
}
@@ -55,4 +55,5 @@ void QtVCardGeneralField::initialize() {
childWidgets << label << tagComboBox << tagLabel << closeButton;
+ setEditable(editable);
}
@@ -62,6 +63,8 @@ bool QtVCardGeneralField::isEditable() const {
void QtVCardGeneralField::setEditable(bool editable) {
+ assert(tagComboBox);
+ assert(closeButton);
+
this->editable = editable;
- if (tagComboBox) {
if (taggable) {
tagLabel->setText(tagComboBox->itemText(0));
@@ -72,12 +75,8 @@ void QtVCardGeneralField::setEditable(bool editable) {
tagComboBox->hide();
}
- }
- if (closeButton) closeButton->setVisible(editable);
- if (preferredCheckBox) {
- if (editable) {
- preferredCheckBox->show();
- } else if (!preferredCheckBox->isChecked()) {
- preferredCheckBox->hide();
- }
+ closeButton->setVisible(editable);
+ if (preferrable) {
+ assert(preferredCheckBox);
+ preferredCheckBox->setVisible(editable ? true : preferredCheckBox->isChecked());
preferredCheckBox->setEnabled(editable);
}
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardInternetEMailField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardInternetEMailField.cpp
index b946fc4..e6f8298 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardInternetEMailField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardInternetEMailField.cpp
@@ -67,15 +67,16 @@ VCard::EMailAddress QtVCardInternetEMailField::getInternetEMailAddress() const {
void QtVCardInternetEMailField::handleEditibleChanged(bool isEditable) {
+ assert(emailLineEdit);
+ assert(emailLabel);
+
if (isEditable) {
- if (emailLineEdit) emailLineEdit->show();
- if (emailLabel) emailLabel->hide();
+ emailLineEdit->show();
+ emailLabel->hide();
} else {
- if (emailLineEdit) emailLineEdit->hide();
- if (emailLabel) {
+ emailLineEdit->hide();
emailLabel->setText(QString("<a href=\"mailto:%1\">%1</a>").arg(QtUtilities::htmlEscape(emailLineEdit->text())));
emailLabel->show();
}
}
-}
}
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardJIDField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardJIDField.cpp
index ecb5533..23a2b5d 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardJIDField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardJIDField.cpp
@@ -58,15 +58,16 @@ JID QtVCardJIDField::getJID() const {
void QtVCardJIDField::handleEditibleChanged(bool isEditable) {
+ assert(jidLineEdit);
+ assert(jidLabel);
+
if (isEditable) {
- if (jidLineEdit) jidLineEdit->show();
- if (jidLabel) jidLabel->hide();
+ jidLineEdit->show();
+ jidLabel->hide();
} else {
- if (jidLineEdit) jidLineEdit->hide();
- if (jidLabel) {
+ jidLineEdit->hide();
jidLabel->setText(QString("<a href=\"xmpp:%1\">%1</a>").arg(QtUtilities::htmlEscape(jidLineEdit->text())));
jidLabel->show();
}
}
-}
}
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
@@ -97,5 +97,7 @@ VCard::Organization QtVCardOrganizationField::getOrganization() const {
void QtVCardOrganizationField::handleEditibleChanged(bool isEditable) {
- if (organizationLineEdit) {
+ assert(organizationLineEdit);
+ assert(unitsTreeWidget);
+
organizationLineEdit->setVisible(isEditable);
organizationLabel->setVisible(!isEditable);
@@ -112,6 +114,5 @@ void QtVCardOrganizationField::handleEditibleChanged(bool isEditable) {
organizationLabel->setText(label);
}
- }
- if (unitsTreeWidget) unitsTreeWidget->setVisible(isEditable);
+ unitsTreeWidget->setVisible(isEditable);
}
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardRoleField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardRoleField.cpp
index 8af4e64..b9da767 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardRoleField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardRoleField.cpp
@@ -42,9 +42,9 @@ std::string QtVCardRoleField::getRole() const {
void QtVCardRoleField::handleEditibleChanged(bool isEditable) {
- if (roleLineEdit) {
+ assert(roleLineEdit);
+
roleLineEdit->setEditable(isEditable);
roleLineEdit->setStyleSheet(isEditable ? "" : "QLineEdit { border: none; background: transparent; }");
}
-}
}
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardTelephoneField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardTelephoneField.cpp
index ee93c01..063319e 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardTelephoneField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardTelephoneField.cpp
@@ -92,9 +92,9 @@ VCard::Telephone QtVCardTelephoneField::getTelephone() const {
void QtVCardTelephoneField::handleEditibleChanged(bool isEditable) {
- if (telephoneLineEdit) {
+ assert(telephoneLineEdit);
+
telephoneLineEdit->setEditable(isEditable);
telephoneLineEdit->setStyleSheet(isEditable ? "" : "QLineEdit { border: none; background: transparent; }");
}
-}
}
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardTitleField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardTitleField.cpp
index aac4e31..43972d0 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardTitleField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardTitleField.cpp
@@ -43,9 +43,9 @@ std::string QtVCardTitleField::getTitle() const {
void QtVCardTitleField::handleEditibleChanged(bool isEditable) {
- if (titleLineEdit) {
+ assert(titleLineEdit);
+
titleLineEdit->setEditable(isEditable);
titleLineEdit->setStyleSheet(isEditable ? "" : "QLineEdit { border: none; background: transparent; }");
}
-}
}
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardURLField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardURLField.cpp
index 35cc4ce..b39eeaa 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardURLField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardURLField.cpp
@@ -56,15 +56,16 @@ std::string QtVCardURLField::getURL() const {
void QtVCardURLField::handleEditibleChanged(bool isEditable) {
+ assert(urlLineEdit);
+ assert(urlLabel);
+
if (isEditable) {
- if (urlLineEdit) urlLineEdit->show();
- if (urlLabel) urlLabel->hide();
+ urlLineEdit->show();
+ urlLabel->hide();
} else {
- if (urlLineEdit) urlLineEdit->hide();
- if (urlLabel) {
+ urlLineEdit->hide();
urlLabel->setText(QString("<a href=\"%1\">%1</a>").arg(QtUtilities::htmlEscape(urlLineEdit->text())));
urlLabel->show();
}
}
-}
}