Swift
summaryrefslogtreecommitdiffstats
path: root/Swift/QtUI/QtVCardWidget
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-10-04 14:57:36 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-10-21 08:19:16 (GMT)
commit300c78798c7b3efd558bc643671acdaa0704b18c (patch)
treeee3847a3bebeafea5722c1c8202a632524388d5f /Swift/QtUI/QtVCardWidget
parent223bdbe232d42e459d4e1b840fe91486e5b4b733 (diff)
downloadswift-300c78798c7b3efd558bc643671acdaa0704b18c.zip
swift-300c78798c7b3efd558bc643671acdaa0704b18c.tar.bz2
Fix potential nullptr dereference in QtVCardWidget
Test-Information: Unit tests pass in ASAN-enabled build on macOS 10.12. Change-Id: I2dd2ab79e70b0613550fd0eacb739f50627a192f
Diffstat (limited to 'Swift/QtUI/QtVCardWidget')
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp36
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardWidget.h1
2 files changed, 19 insertions, 18 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp
index c5f99f0..290feca 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp
@@ -101,7 +101,7 @@ void QtVCardWidget::setEditable(bool editable) {
ui->photoAndName->setProperty("editable", QVariant(editable));
- foreach(QtVCardGeneralField* field, fields) {
+ for (auto field : fields) {
field->setEditable(editable);
}
toolButton->setVisible(editable);
@@ -121,7 +121,7 @@ void QtVCardWidget::setVCard(VCard::ref vcard) {
ui->photoAndName->setSuffix(P2QSTRING(vcard->getSuffix()));
ui->photoAndName->setAvatar(vcard->getPhoto(), vcard->getPhotoType());
- foreach (const VCard::EMailAddress& address, vcard->getEMailAddresses()) {
+ for (const auto& address : vcard->getEMailAddresses()) {
if (address.isInternet) {
QtVCardInternetEMailField* internetEmailField = new QtVCardInternetEMailField(this, ui->cardFields);
internetEmailField->initialize();
@@ -130,21 +130,21 @@ void QtVCardWidget::setVCard(VCard::ref vcard) {
}
}
- foreach (const VCard::Telephone& telephone, vcard->getTelephones()) {
+ for (const auto& telephone : vcard->getTelephones()) {
QtVCardTelephoneField* telField = new QtVCardTelephoneField(this, ui->cardFields);
telField->initialize();
telField->setTelephone(telephone);
appendField(telField);
}
- foreach (const VCard::Address& address, vcard->getAddresses()) {
+ for (const auto& address : vcard->getAddresses()) {
QtVCardAddressField* addressField = new QtVCardAddressField(this, ui->cardFields);
addressField->initialize();
addressField->setAddress(address);
appendField(addressField);
}
- foreach (const VCard::AddressLabel& label, vcard->getAddressLabels()) {
+ for (const auto& label : vcard->getAddressLabels()) {
QtVCardAddressLabelField* addressLabelField = new QtVCardAddressLabelField(this, ui->cardFields);
addressLabelField->initialize();
addressLabelField->setAddressLabel(label);
@@ -158,7 +158,7 @@ void QtVCardWidget::setVCard(VCard::ref vcard) {
appendField(bdayField);
}
- foreach (const JID& jid, vcard->getJIDs()) {
+ for (const auto& jid : vcard->getJIDs()) {
QtVCardJIDField* jidField = new QtVCardJIDField(this, ui->cardFields);
jidField->initialize();
jidField->setJID(jid);
@@ -172,28 +172,28 @@ void QtVCardWidget::setVCard(VCard::ref vcard) {
appendField(descField);
}
- foreach (const VCard::Organization& org, vcard->getOrganizations()) {
+ for (const auto& org : vcard->getOrganizations()) {
QtVCardOrganizationField* orgField = new QtVCardOrganizationField(this, ui->cardFields);
orgField->initialize();
orgField->setOrganization(org);
appendField(orgField);
}
- foreach (const std::string& role, vcard->getRoles()) {
+ for (const auto& role : vcard->getRoles()) {
QtVCardRoleField* roleField = new QtVCardRoleField(this, ui->cardFields);
roleField->initialize();
roleField->setRole(role);
appendField(roleField);
}
- foreach (const std::string& title, vcard->getTitles()) {
+ for (const auto& title : vcard->getTitles()) {
QtVCardTitleField* titleField = new QtVCardTitleField(this, ui->cardFields);
titleField->initialize();
titleField->setTitle(title);
appendField(titleField);
}
- foreach (const std::string& url, vcard->getURLs()) {
+ for (const auto& url : vcard->getURLs()) {
QtVCardURLField* urlField = new QtVCardURLField(this, ui->cardFields);
urlField->initialize();
urlField->setURL(url);
@@ -230,7 +230,7 @@ VCard::ref QtVCardWidget::getVCard() {
QtVCardBirthdayField* bdayField = nullptr;
QtVCardDescriptionField* descriptionField = nullptr;
- foreach(QtVCardGeneralField* field, fields) {
+ for (auto field : fields) {
QtVCardInternetEMailField* emailField;
if ((emailField = dynamic_cast<QtVCardInternetEMailField*>(field))) {
vcard->addEMailAddress(emailField->getInternetEMailAddress());
@@ -317,16 +317,16 @@ void QtVCardWidget::addField() {
QtVCardGeneralField* newGeneralField = dynamic_cast<QtVCardGeneralField*>(newField);
if (newGeneralField) {
newGeneralField->initialize();
+ appendField(newGeneralField);
+ relayoutToolButton();
}
- appendField(newGeneralField);
- relayoutToolButton();
}
}
void QtVCardWidget::removeField(QtVCardGeneralField *field) {
int sameFields = 0;
QtVCardGeneralField* fieldToChange = nullptr;
- foreach (QtVCardGeneralField* vcardField, fields) {
+ for (auto vcardField : fields) {
if ((vcardField != field) && (typeid(*vcardField) == typeid(*field))) {
sameFields++;
fieldToChange = vcardField;
@@ -376,7 +376,7 @@ void layoutDeleteChildren(QLayout *layout) {
}
void QtVCardWidget::clearFields() {
- foreach(QtVCardGeneralField* field, fields) {
+ for (auto field : fields) {
delete field;
}
fields.clear();
@@ -387,7 +387,7 @@ void QtVCardWidget::clearFields() {
void QtVCardWidget::clearEmptyFields() {
std::vector<QtVCardGeneralField*> items_to_remove;
- foreach (QtVCardGeneralField* field, fields) {
+ for (auto field : fields) {
if (field->property("empty").isValid() && field->property("empty").toBool()) {
ui->cardFields->removeWidget(field);
items_to_remove.push_back(field);
@@ -395,7 +395,7 @@ void QtVCardWidget::clearEmptyFields() {
}
}
- foreach(QtVCardGeneralField* field, items_to_remove) {
+ for (auto field : items_to_remove) {
fields.remove(field);
}
}
@@ -404,7 +404,7 @@ void QtVCardWidget::appendField(QtVCardGeneralField *field) {
connect(field, SIGNAL(deleteField(QtVCardGeneralField*)), SLOT(removeField(QtVCardGeneralField*)));
QtVCardGeneralField* fieldToChange = nullptr;
- foreach (QtVCardGeneralField* vcardField, fields) {
+ for (auto vcardField : fields) {
if (typeid(*vcardField) == typeid(*field)) {
fieldToChange = vcardField;
break;
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardWidget.h b/Swift/QtUI/QtVCardWidget/QtVCardWidget.h
index 5334016..9aae158 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardWidget.h
+++ b/Swift/QtUI/QtVCardWidget/QtVCardWidget.h
@@ -12,6 +12,7 @@
#pragma once
+#include <list>
#include <memory>
#include <QToolButton>