From 1c2a092a64c609e10f0fcbf2936b5dae70ee5e8c Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Tue, 7 Sep 2021 14:07:08 +0200 Subject: QXmppDataForm: Merge constructors Can be done because binary compatibility has been broken. --- src/base/QXmppDataForm.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/base/QXmppDataForm.h') diff --git a/src/base/QXmppDataForm.h b/src/base/QXmppDataForm.h index 35d1019e..5da81e65 100644 --- a/src/base/QXmppDataForm.h +++ b/src/base/QXmppDataForm.h @@ -119,10 +119,8 @@ public: TextSingleField }; - // ### QXmpp2: merge ctors - Field(QXmppDataForm::Field::Type type = QXmppDataForm::Field::TextSingleField); - Field(QXmppDataForm::Field::Type type, - const QString &key, + Field(Type type = TextSingleField, + const QString &key = {}, const QVariant &value = {}, bool isRequired = false, const QString &label = {}, @@ -190,10 +188,8 @@ public: ///< or the data is a generic data set. }; - // ### QXmpp2: merge ctors - QXmppDataForm(QXmppDataForm::Type type = QXmppDataForm::None); - QXmppDataForm(QXmppDataForm::Type type, - const QList &fields, + QXmppDataForm(Type type = None, + const QList &fields = {}, const QString &title = {}, const QString &instructions = {}); QXmppDataForm(const QXmppDataFormBase &based); -- cgit v1.2.3