bug fixes

3 files changed, 17 insertions, 2 deletions

diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index 1403b393..9ae4899f 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -190,6 +190,8 @@ bool QXmppClient::setReconnectionManager(QXmppReconnectionManager*
     check = connect(this, SIGNAL(error(QXmppClient::Error)),

                     m_reconnectionManager, SLOT(error(QXmppClient::Error)));

     Q_ASSERT(check);

+

+    return true;

 }

 

 QAbstractSocket::SocketError QXmppClient::getSocketError()

diff --git a/source/QXmppVCard.cpp b/source/QXmppVCard.cpp
index 1d4b9509..caf47ef8 100644
--- a/source/QXmppVCard.cpp
+++ b/source/QXmppVCard.cpp
@@ -28,6 +28,7 @@
 

 #include <QTextStream>

 #include <QImage>

+#include <QBuffer>

 

 QXmppVCard::QXmppVCard(const QString& jid) : QXmppIq(QXmppIq::Get)

 {

@@ -55,6 +56,15 @@ void QXmppVCard::setPhoto(const QByteArray& photo)
     m_photo = photo;

 }

 

+void QXmppVCard::setPhoto(const QImage& image)

+{

+    QByteArray ba;

+    QBuffer buffer(&ba);

+    buffer.open(QIODevice::WriteOnly);

+    image.save(&buffer, "PNG");

+    m_photo = ba;

+}

+

 void QXmppVCard::parse(const QDomElement& nodeRecv)

 {

     QString id = nodeRecv.attribute("id");

@@ -87,9 +97,9 @@ QByteArray QXmppVCard::toXmlElementFromChild() const
 

     if(!getPhoto().isEmpty())

     {

-        stream << "<PHOTO";

+        stream << "<PHOTO>";

         helperToXmlAddElement(stream, "TYPE", getImageType(getPhoto()));

-        helperToXmlAddElement(stream, "BINVAL", getPhoto());

+        helperToXmlAddElement(stream, "BINVAL", getPhoto().toBase64());

         stream << "</PHOTO>";

     }

 

diff --git a/source/QXmppVCard.h b/source/QXmppVCard.h
index b4c7af2c..9495ccc3 100644
--- a/source/QXmppVCard.h
+++ b/source/QXmppVCard.h
@@ -42,6 +42,7 @@ public:
     QImage getPhotoAsImage() const;

     const QByteArray& getPhoto() const;

     void setPhoto(const QByteArray&);

+    void setPhoto(const QImage&);

 

     void parse(const QDomElement&);

 

@@ -49,6 +50,8 @@ private:
     QByteArray toXmlElementFromChild() const;

 

     QString m_fullName;

+

+    // not as 64 base

     QByteArray m_photo;

 };