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/QXmppStanza.h | 248 ++++++++++++++++++++++++++------------------------- 1 file changed, 126 insertions(+), 122 deletions(-) (limited to 'source/QXmppStanza.h') diff --git a/source/QXmppStanza.h b/source/QXmppStanza.h index 58aedb57..c5b6cd85 100644 --- a/source/QXmppStanza.h +++ b/source/QXmppStanza.h @@ -1,122 +1,126 @@ -/* - * 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. - * - */ - - -#ifndef QXMPPSTANZA_H -#define QXMPPSTANZA_H - -#include "QXmppPacket.h" -#include - -class QXmlStreamWriter; - -class QXmppStanza : public QXmppPacket -{ -public: - class Error - { - public: - enum Type - { - Cancel, - Continue, - Modify, - Auth, - Wait - }; - - enum Condition - { - BadRequest, - Conflict, - FeatureNotImplemented, - Forbidden, - Gone, - InternalServerError, - ItemNotFound, - JidMalformed, - NotAcceptable, - NotAllowed, - NotAuthorized, - PaymentRequired, - RecipientUnavailable, - Redirect, - RegistrationRequired, - RemoteServerNotFound, - RemoteServerTimeout, - ResourceConstraint, - ServiceUnavailable, - SubscriptionRequired, - UndefinedCondition, - UnexpectedRequest - }; - - Error(); - Error(Type type, Condition cond, const QString& text=""); - Error(const QString& type, const QString& cond, const QString& text=""); - - void setText(const QString& text); - void setCondition(Condition cond); - void setConditionFromStr(const QString& cond); - void setType(Type type); - void setTypeFromStr(const QString& type); - QString getText() const; - Condition getCondition() const; - Type getType() const; - void toXml( QXmlStreamWriter *writer ) const; - QString getConditionStr() const; - QString getTypeStr() const; - - private: - Type m_type; - Condition m_condition; - QString m_text; - }; - - QXmppStanza(const QString& from = "", const QString& to = ""); - ~QXmppStanza(); - - QString getTo() const; - QString getFrom() const; - QString getId() const; - QString getLang() const; - QXmppStanza::Error getError() const; - - void setTo(const QString&); - void setFrom(const QString&); - void setId(const QString&); - void generateAndSetNextId(); - void setLang(const QString&); - void setError(QXmppStanza::Error& error); - bool isErrorStanza(); - -private: - static int s_uniqeIdNo; - QString m_to; - QString m_from; - QString m_id; - QString m_lang; - QXmppStanza::Error m_error; -}; - -#endif // QXMPPSTANZA_H +/* + * 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. + * + */ + + +#ifndef QXMPPSTANZA_H +#define QXMPPSTANZA_H + +#include "QXmppPacket.h" +#include + +// forward declarations of QXmlStream* classes will not work on Mac, we need to +// include the whole header. +// See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html +// for an explanation. +#include + +class QXmppStanza : public QXmppPacket +{ +public: + class Error + { + public: + enum Type + { + Cancel, + Continue, + Modify, + Auth, + Wait + }; + + enum Condition + { + BadRequest, + Conflict, + FeatureNotImplemented, + Forbidden, + Gone, + InternalServerError, + ItemNotFound, + JidMalformed, + NotAcceptable, + NotAllowed, + NotAuthorized, + PaymentRequired, + RecipientUnavailable, + Redirect, + RegistrationRequired, + RemoteServerNotFound, + RemoteServerTimeout, + ResourceConstraint, + ServiceUnavailable, + SubscriptionRequired, + UndefinedCondition, + UnexpectedRequest + }; + + Error(); + Error(Type type, Condition cond, const QString& text=""); + Error(const QString& type, const QString& cond, const QString& text=""); + + void setText(const QString& text); + void setCondition(Condition cond); + void setConditionFromStr(const QString& cond); + void setType(Type type); + void setTypeFromStr(const QString& type); + QString getText() const; + Condition getCondition() const; + Type getType() const; + void toXml( QXmlStreamWriter *writer ) const; + QString getConditionStr() const; + QString getTypeStr() const; + + private: + Type m_type; + Condition m_condition; + QString m_text; + }; + + QXmppStanza(const QString& from = "", const QString& to = ""); + ~QXmppStanza(); + + QString getTo() const; + QString getFrom() const; + QString getId() const; + QString getLang() const; + QXmppStanza::Error getError() const; + + void setTo(const QString&); + void setFrom(const QString&); + void setId(const QString&); + void generateAndSetNextId(); + void setLang(const QString&); + void setError(QXmppStanza::Error& error); + bool isErrorStanza(); + +private: + static int s_uniqeIdNo; + QString m_to; + QString m_from; + QString m_id; + QString m_lang; + QXmppStanza::Error m_error; +}; + +#endif // QXMPPSTANZA_H -- cgit v1.2.3