From 239b2b15c3cfd9e4d7cc085ed31645d6ae6942ee Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Mon, 26 Oct 2009 17:01:09 +0000 Subject: Fix for Issue 23: QXmppBind compilation error on macosx starting from r23 Issue 26: examples fail to link on macosx and linux Issue 24: all text files should have the svn property eol-style set Contributed by: Marco Molteni --- source/QXmppVCard.cpp | 216 +++++++++++++++++++++++++------------------------- 1 file changed, 108 insertions(+), 108 deletions(-) (limited to 'source/QXmppVCard.cpp') diff --git a/source/QXmppVCard.cpp b/source/QXmppVCard.cpp index 8a5f4b0f..d3c71df1 100644 --- a/source/QXmppVCard.cpp +++ b/source/QXmppVCard.cpp @@ -1,108 +1,108 @@ -/* - * Copyright (C) 2008-2009 Manjeet Dahiya - * - * Author: - * Manjeet Dahiya - * - * Source: - * http://code.google.com/p/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#include "QXmppVCard.h" -#include "QXmppUtils.h" -#include "QXmppConstants.h" - -#include -#include -#include - -QXmppVCard::QXmppVCard(const QString& jid) : QXmppIq(QXmppIq::Get) -{ - // for self jid should be empty - setTo(jid); -} - -QString QXmppVCard::getFullName() const -{ - return m_fullName; -} - -void QXmppVCard::setFullName(const QString& str) -{ - m_fullName = str; -} - -const QByteArray& QXmppVCard::getPhoto() const -{ - return m_photo; -} - -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"); - QString to = nodeRecv.attribute("to"); - QString from = nodeRecv.attribute("from"); - QString type = nodeRecv.attribute("type"); - setTypeFromStr(type); - setId(id); - setTo(to); - setFrom(from); - - // vCard - setFullName(nodeRecv.firstChildElement("vCard"). - firstChildElement("FN").text()); - QByteArray base64data = nodeRecv.firstChildElement("vCard"). - firstChildElement("PHOTO"). - firstChildElement("BINVAL").text().toAscii(); - setPhoto(QByteArray::fromBase64(base64data)); -} - -void QXmppVCard::toXmlElementFromChild(QXmlStreamWriter *writer) const -{ - writer->writeStartElement("vCard"); - helperToXmlAddAttribute(writer,"xmlns", ns_vcard); - helperToXmlAddTextElement(writer, "FN", getFullName()); - - if(!getPhoto().isEmpty()) - { - writer->writeStartElement("PHOTO"); - helperToXmlAddTextElement(writer, "TYPE", getImageType(getPhoto())); - helperToXmlAddTextElement(writer, "BINVAL", getPhoto().toBase64()); - writer->writeEndElement(); - } - - writer->writeEndElement(); -} - -QImage QXmppVCard::getPhotoAsImage() const -{ - return getImageFromByteArray(getPhoto()); -} +/* + * Copyright (C) 2008-2009 Manjeet Dahiya + * + * Author: + * Manjeet Dahiya + * + * Source: + * http://code.google.com/p/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#include "QXmppVCard.h" +#include "QXmppUtils.h" +#include "QXmppConstants.h" + +#include +#include +#include + +QXmppVCard::QXmppVCard(const QString& jid) : QXmppIq(QXmppIq::Get) +{ + // for self jid should be empty + setTo(jid); +} + +QString QXmppVCard::getFullName() const +{ + return m_fullName; +} + +void QXmppVCard::setFullName(const QString& str) +{ + m_fullName = str; +} + +const QByteArray& QXmppVCard::getPhoto() const +{ + return m_photo; +} + +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"); + QString to = nodeRecv.attribute("to"); + QString from = nodeRecv.attribute("from"); + QString type = nodeRecv.attribute("type"); + setTypeFromStr(type); + setId(id); + setTo(to); + setFrom(from); + + // vCard + setFullName(nodeRecv.firstChildElement("vCard"). + firstChildElement("FN").text()); + QByteArray base64data = nodeRecv.firstChildElement("vCard"). + firstChildElement("PHOTO"). + firstChildElement("BINVAL").text().toAscii(); + setPhoto(QByteArray::fromBase64(base64data)); +} + +void QXmppVCard::toXmlElementFromChild(QXmlStreamWriter *writer) const +{ + writer->writeStartElement("vCard"); + helperToXmlAddAttribute(writer,"xmlns", ns_vcard); + helperToXmlAddTextElement(writer, "FN", getFullName()); + + if(!getPhoto().isEmpty()) + { + writer->writeStartElement("PHOTO"); + helperToXmlAddTextElement(writer, "TYPE", getImageType(getPhoto())); + helperToXmlAddTextElement(writer, "BINVAL", getPhoto().toBase64()); + writer->writeEndElement(); + } + + writer->writeEndElement(); +} + +QImage QXmppVCard::getPhotoAsImage() const +{ + return getImageFromByteArray(getPhoto()); +} -- cgit v1.2.3