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/QXmppMessage.cpp | 312 ++++++++++++++++++++++++------------------------ 1 file changed, 156 insertions(+), 156 deletions(-) (limited to 'source/QXmppMessage.cpp') diff --git a/source/QXmppMessage.cpp b/source/QXmppMessage.cpp index 54836729..ad079d70 100644 --- a/source/QXmppMessage.cpp +++ b/source/QXmppMessage.cpp @@ -1,156 +1,156 @@ -/* - * 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 "QXmppMessage.h" -#include "QXmppUtils.h" -#include - -QXmppMessage::QXmppMessage(const QString& from, const QString& to, const - QString& body, const QString& thread) - : QXmppStanza(from, to), m_type(Chat), m_body(body), m_thread(thread) -{ -} - -QXmppMessage::~QXmppMessage() -{ - -} - -QXmppMessage::Type QXmppMessage::getType() const -{ - return m_type; -} - -QString QXmppMessage::getTypeStr() const -{ - switch(getType()) - { - case QXmppMessage::Error: - return "error"; - case QXmppMessage::Normal: - return "normal"; - case QXmppMessage::Chat: - return "chat"; - case QXmppMessage::GroupChat: - return "groupchat"; - case QXmppMessage::Headline: - return "headline"; - default: - qWarning("QXmppMessage::getTypeStr() invalid type %d", (int)getType()); - return ""; - } -} - -void QXmppMessage::setType(QXmppMessage::Type type) -{ - m_type = type; -} - -void QXmppMessage::setTypeFromStr(const QString& str) -{ - if(str == "error") - { - setType(QXmppMessage::Error); - return; - } - else if(str == "") // if no type is specified - { - setType(QXmppMessage::Normal); - return; - } - else if(str == "normal") - { - setType(QXmppMessage::Normal); - return; - } - else if(str == "chat") - { - setType(QXmppMessage::Chat); - return; - } - else if(str == "groupchat") - { - setType(QXmppMessage::GroupChat); - return; - } - else if(str == "headline") - { - setType(QXmppMessage::Headline); - return; - } - else - { - setType(static_cast(-1)); - qWarning("QXmppMessage::setTypeFromStr() invalid input string type: %s", - qPrintable(str)); - return; - } -} - -void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const -{ - - xmlWriter->writeStartElement("message"); - helperToXmlAddAttribute(xmlWriter, "xml:lang", getLang()); - helperToXmlAddAttribute(xmlWriter, "id", getId()); - helperToXmlAddAttribute(xmlWriter, "to", getTo()); - helperToXmlAddAttribute(xmlWriter, "from", getFrom()); - helperToXmlAddAttribute(xmlWriter, "type", getTypeStr()); - helperToXmlAddTextElement(xmlWriter, "subject", getSubject()); - helperToXmlAddTextElement(xmlWriter,"body", getBody()); - helperToXmlAddTextElement(xmlWriter,"thread", getThread()); - getError().toXml(xmlWriter); - xmlWriter->writeEndElement(); -} - -QString QXmppMessage::getBody() const -{ - return m_body; -} - -void QXmppMessage::setBody(const QString& body) -{ - m_body = body; -} - -QString QXmppMessage::getSubject() const -{ - return m_subject; -} - -void QXmppMessage::setSubject(const QString& sub) -{ - m_subject = sub; -} - -QString QXmppMessage::getThread() const -{ - return m_thread; -} - -void QXmppMessage::setThread(const QString& thread) -{ - m_thread = thread; -} - +/* + * 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 "QXmppMessage.h" +#include "QXmppUtils.h" +#include + +QXmppMessage::QXmppMessage(const QString& from, const QString& to, const + QString& body, const QString& thread) + : QXmppStanza(from, to), m_type(Chat), m_body(body), m_thread(thread) +{ +} + +QXmppMessage::~QXmppMessage() +{ + +} + +QXmppMessage::Type QXmppMessage::getType() const +{ + return m_type; +} + +QString QXmppMessage::getTypeStr() const +{ + switch(getType()) + { + case QXmppMessage::Error: + return "error"; + case QXmppMessage::Normal: + return "normal"; + case QXmppMessage::Chat: + return "chat"; + case QXmppMessage::GroupChat: + return "groupchat"; + case QXmppMessage::Headline: + return "headline"; + default: + qWarning("QXmppMessage::getTypeStr() invalid type %d", (int)getType()); + return ""; + } +} + +void QXmppMessage::setType(QXmppMessage::Type type) +{ + m_type = type; +} + +void QXmppMessage::setTypeFromStr(const QString& str) +{ + if(str == "error") + { + setType(QXmppMessage::Error); + return; + } + else if(str == "") // if no type is specified + { + setType(QXmppMessage::Normal); + return; + } + else if(str == "normal") + { + setType(QXmppMessage::Normal); + return; + } + else if(str == "chat") + { + setType(QXmppMessage::Chat); + return; + } + else if(str == "groupchat") + { + setType(QXmppMessage::GroupChat); + return; + } + else if(str == "headline") + { + setType(QXmppMessage::Headline); + return; + } + else + { + setType(static_cast(-1)); + qWarning("QXmppMessage::setTypeFromStr() invalid input string type: %s", + qPrintable(str)); + return; + } +} + +void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const +{ + + xmlWriter->writeStartElement("message"); + helperToXmlAddAttribute(xmlWriter, "xml:lang", getLang()); + helperToXmlAddAttribute(xmlWriter, "id", getId()); + helperToXmlAddAttribute(xmlWriter, "to", getTo()); + helperToXmlAddAttribute(xmlWriter, "from", getFrom()); + helperToXmlAddAttribute(xmlWriter, "type", getTypeStr()); + helperToXmlAddTextElement(xmlWriter, "subject", getSubject()); + helperToXmlAddTextElement(xmlWriter,"body", getBody()); + helperToXmlAddTextElement(xmlWriter,"thread", getThread()); + getError().toXml(xmlWriter); + xmlWriter->writeEndElement(); +} + +QString QXmppMessage::getBody() const +{ + return m_body; +} + +void QXmppMessage::setBody(const QString& body) +{ + m_body = body; +} + +QString QXmppMessage::getSubject() const +{ + return m_subject; +} + +void QXmppMessage::setSubject(const QString& sub) +{ + m_subject = sub; +} + +QString QXmppMessage::getThread() const +{ + return m_thread; +} + +void QXmppMessage::setThread(const QString& thread) +{ + m_thread = thread; +} + -- cgit v1.2.3