summaryrefslogtreecommitdiffstats
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/QtVCardWidget.h
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/QtVCardWidget.h')
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardWidget.h1
1 files changed, 1 insertions, 0 deletions
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
@@ -1,44 +1,45 @@
/*
* Copyright (c) 2012 Tobias Markmann
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
/*
* Copyright (c) 2015-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <list>
#include <memory>
#include <QToolButton>
#include <QWidget>
#include <Swiften/Elements/VCard.h>
#include <Swift/QtUI/QtVCardWidget/QtVCardFieldInfo.h>
#include <Swift/QtUI/QtVCardWidget/QtVCardGeneralField.h>
#include <Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.h>
namespace Ui {
class QtVCardWidget;
}
namespace Swift {
class QtVCardWidget : public QWidget {
Q_OBJECT
Q_PROPERTY(bool editable READ isEditable WRITE setEditable)
public :
explicit QtVCardWidget(QWidget* parent = nullptr);
~QtVCardWidget();
bool isEditable() const;
void setEditable(bool);
void setVCard(VCard::ref vcard);
VCard::ref getVCard();