Introduce XData::findField

Author: Ri0n

src/xmpp/xmpp-im/httpfileupload.cpp

@@ -118,9 +118,12 @@ void HttpFileUpload::start()
             }
             if (ver != XEP0363::vUnknown) {
                 QVector<std::pair<HttpHost, int>> hosts;
-                const XData::Field field = item.registeredExtension(xmlns).getField(QLatin1String("max-file-size"));
-                if (field.isValid() && field.type() == XData::Field::Field_TextSingle)
-                    sizeLimit = field.value().at(0).toULongLong();
+                auto optField = item.registeredExtension(xmlns).findField(QLatin1String("max-file-size"));
+                if (optField) {
+                    const XData::Field &field = *optField;
+                    if (field.isValid() && field.type() == XData::Field::Field_TextSingle)
+                        sizeLimit = field.value().value(0).toULongLong();
+                }
                 HttpHost host;
                 host.ver       = ver;
                 host.jid       = item.jid();

src/xmpp/xmpp-im/types.cpp

@@ -2902,20 +2902,22 @@ CaptchaChallenge::CaptchaChallenge(const Message &m) : d(new CaptchaChallengePri
         d->dt = QDateTime::currentDateTime();
     }
 
-    if (m.getForm().registrarType() != "urn:xmpp:captcha" || m.getForm().type() != XData::Data_Form)
+    if (m.getForm().registrarType() != QLatin1String("urn:xmpp:captcha") || m.getForm().type() != XData::Data_Form
+        || m.id().isEmpty())
         return;
 
-    if (m.id().isEmpty() || m.getForm().getField("challenge").value().value(0) != m.id())
+    auto fieldOpt = m.getForm().findField("challenge");
+    if (!fieldOpt || fieldOpt->value().value(0) != m.id())
         return;
 
-    if (m.getForm().getField("from").value().value(0).isEmpty())
+    if (fieldOpt = m.getForm().findField("from"); !fieldOpt || fieldOpt->value().value(0).isEmpty())
         return;
 
     d->form        = m.getForm();
     d->explanation = m.body();
     d->urls        = m.urlList();
     d->arbiter     = m.from();
-    d->offendedJid = Jid(m.getForm().getField("from").value().value(0));
+    d->offendedJid = Jid(fieldOpt->value().value(0));
 }
 
 CaptchaChallenge::~CaptchaChallenge() { }

src/xmpp/xmpp-im/xmpp_vcard4.cpp

@@ -1493,7 +1493,8 @@ void VCard::setPhoto(const PAdvUris &photo)
 Item<UriValue> &VCard::setPhoto(const UriValue &photo)
 {
     INIT_D();
-    d->photo.append({ Parameters(), photo });
+    PAdvUris l = { { PAdvUri { Parameters(), photo } } };
+    d->photo   = std::move(l);
     return d->photo.last();
 }
 

src/xmpp/xmpp-im/xmpp_xdata.cpp

@@ -338,7 +338,7 @@ void XData::setRegistrarType(const QString &registrarType) { d->registrarType =
 
 const XData::FieldList &XData::fields() const { return d->fields; }
 
-XData::Field XData::getField(const QString &var) const
+std::optional<XMPP::XData::Field> XMPP::XData::findField(const QString &var) const
 {
     if (!d->fields.isEmpty()) {
         FieldList::ConstIterator it = d->fields.begin();
@@ -348,7 +348,13 @@ XData::Field XData::getField(const QString &var) const
                 return f;
         }
     }
-    return Field();
+    return {};
+}
+
+XData::Field XData::getField(const QString &var) const
+{
+    auto of = findField(var);
+    return of ? *of : XData::Field {};
 }
 
 XData::Field &XData::fieldRef(const QString &var)

src/xmpp/xmpp-im/xmpp_xdata.h

@@ -28,6 +28,8 @@
 #include <QString>
 #include <QStringList>
 
+#include <optional>
+
 class QDomDocument;
 class QDomElement;
 
@@ -152,9 +154,12 @@ class XData {
     typedef QList<Field> FieldList;
 
     const FieldList &fields() const;
-    Field            getField(const QString &var) const;
-    Field           &fieldRef(const QString &var);
-    void             setFields(const FieldList &fl);
+
+    std::optional<Field> findField(const QString &var) const;
+    Field                getField(const QString &var) const;
+    Field               &fieldRef(const QString &var); // dangerous
+
+    void setFields(const FieldList &fl);
 
 private:
     class Private : public QSharedData {