abstractroster.h		abstractroster.h
	skipping to change at line 28		skipping to change at line 28
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	// TODO: Create simple RosterManager for bots and simple applications		// TODO: Create simple RosterManager for bots and simple applications
	#ifndef ABSTRACTROSTER_H		#ifndef JREEN_ABSTRACTROSTER_H
	#define ABSTRACTROSTER_H		#define JREEN_ABSTRACTROSTER_H
	#include <QSharedPointer>		#include <QSharedPointer>
	#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)		#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
	// Looks like this function was overloaded at this release, if not - tell m e // EuroElessar		// Looks like this function was overloaded at this release, if not - tell m e // EuroElessar
	template <class T> inline uint qHash(const T *key);		template <class T> inline uint qHash(const T *key);
	template<typename T>		template<typename T>
	inline uint qHash(const QSharedPointer<T> &key) { return qHash(key.data()); }		inline uint qHash(const QSharedPointer<T> &key) { return qHash(key.data()); }
	#endif		#endif
	skipping to change at line 174		skipping to change at line 174
	protected slots:		protected slots:
	void onPresenceReceived(const Jreen::Presence &presence);		void onPresenceReceived(const Jreen::Presence &presence);
	protected:		protected:
	virtual void onItemAdded(QSharedPointer<RosterItem> item);		virtual void onItemAdded(QSharedPointer<RosterItem> item);
	virtual void onItemUpdated(QSharedPointer<RosterItem> item);		virtual void onItemUpdated(QSharedPointer<RosterItem> item);
	virtual void onItemRemoved(const QString &jid);		virtual void onItemRemoved(const QString &jid);
	};		};
	}		}
	#endif // ABSTRACTROSTER_H		#endif // JREEN_ABSTRACTROSTER_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	activity.h		activity.h
	skipping to change at line 27		skipping to change at line 27
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef ACTIVITY_H		#ifndef JREEN_ACTIVITY_H
	#define ACTIVITY_H		#define JREEN_ACTIVITY_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen {		namespace Jreen {
	//XEP-108		//XEP-108
	//http://xmpp.org/extensions/xep-0108.html		//http://xmpp.org/extensions/xep-0108.html
	class ActivityPrivate;		class ActivityPrivate;
	class JREEN_EXPORT Activity : public Payload		class JREEN_EXPORT Activity : public Payload
	{		{
	skipping to change at line 151		skipping to change at line 151
	static QString specificName(Specific specific);		static QString specificName(Specific specific);
	const QString &text() const;		const QString &text() const;
	void setText(const QString &text);		void setText(const QString &text);
	private:		private:
	QScopedPointer<ActivityPrivate> d_ptr;		QScopedPointer<ActivityPrivate> d_ptr;
	};		};
	} // namespace Jreen		} // namespace Jreen
	#endif // ACTIVITY_H		#endif // JREEN_ACTIVITY_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	attention.h		attention.h
	skipping to change at line 25		skipping to change at line 25
	** This program is distributed in the hope that it will be useful,		** This program is distributed in the hope that it will be useful,
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef ATTENTION_H		#ifndef JREEN_ATTENTION_H
	#define ATTENTION_H		#define JREEN_ATTENTION_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen {		namespace Jreen {
	class AttentionPrivate;		class AttentionPrivate;
	//XEP-0224 Attention		//XEP-0224 Attention
	//http://xmpp.org/extensions/xep-0224.html		//http://xmpp.org/extensions/xep-0224.html
	class JREEN_EXPORT Attention : public Payload		class JREEN_EXPORT Attention : public Payload
	{		{
	skipping to change at line 48		skipping to change at line 48
	J_PAYLOAD(Jreen::Attention)		J_PAYLOAD(Jreen::Attention)
	public:		public:
	Attention();		Attention();
	~Attention();		~Attention();
	private:		private:
	QScopedPointer<AttentionPrivate> d_ptr;		QScopedPointer<AttentionPrivate> d_ptr;
	};		};
	} // namespace Jreen		} // namespace Jreen
	#endif // ATTENTION_H		#endif // JREEN_ATTENTION_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	bookmark.h		bookmark.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef BOOKMARK_H		#ifndef JREEN_BOOKMARK_H
	#define BOOKMARK_H		#define JREEN_BOOKMARK_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	#include "jid.h"		#include "jid.h"
	namespace Jreen {		namespace Jreen {
	//XEP-0048		//XEP-0048
	//http://xmpp.org/extensions/xep-0048.html		//http://xmpp.org/extensions/xep-0048.html
	class BookmarkPrivate;		class BookmarkPrivate;
	/*! For ease-of-use in a Jabber client, it is desirable to have a way to st ore shortcuts		/*! For ease-of-use in a Jabber client, it is desirable to have a way to st ore shortcuts
	* to various services and resources (such as conference rooms and web pages ) as "bookmarks"		* to various services and resources (such as conference rooms and web pages ) as "bookmarks"
	skipping to change at line 111		skipping to change at line 111
	QList<Conference> conferences() const;		QList<Conference> conferences() const;
	void addConference(const Conference &conf);		void addConference(const Conference &conf);
	void setConferences(const QList<Conference> &conferences);		void setConferences(const QList<Conference> &conferences);
	private:		private:
	QScopedPointer<BookmarkPrivate> d_ptr;		QScopedPointer<BookmarkPrivate> d_ptr;
	};		};
	} // namespace Jreen		} // namespace Jreen
	#endif // BOOKMARK_H		#endif // JREEN_BOOKMARK_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	bookmarkstorage.h		bookmarkstorage.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef BOOKMARKSTORAGE_H		#ifndef JREEN_BOOKMARKSTORAGE_H
	#define BOOKMARKSTORAGE_H		#define JREEN_BOOKMARKSTORAGE_H
	#include "bookmark.h"		#include "bookmark.h"
	#include "privatexml.h"		#include "privatexml.h"
	#include "error.h"		#include "error.h"
	namespace Jreen		namespace Jreen
	{		{
	class PrivateXml;		class PrivateXml;
	namespace PubSub { class Manager; }		namespace PubSub { class Manager; }
	skipping to change at line 61		skipping to change at line 61
	void storeBookmarks(const Bookmark::Ptr &bookmarks);		void storeBookmarks(const Bookmark::Ptr &bookmarks);
	signals:		signals:
	void bookmarksReceived(const Jreen::Bookmark::Ptr &bookrmark);		void bookmarksReceived(const Jreen::Bookmark::Ptr &bookrmark);
	private slots:		private slots:
	void onResultReady(const Jreen::Payload::Ptr &,Jreen::PrivateXml::Re sult,const Jreen::Error::Ptr &);		void onResultReady(const Jreen::Payload::Ptr &,Jreen::PrivateXml::Re sult,const Jreen::Error::Ptr &);
	private:		private:
	QScopedPointer<BookmarkStoragePrivate> d_ptr;		QScopedPointer<BookmarkStoragePrivate> d_ptr;
	};		};
	}		}
	#endif // BOOKMARKSTORAGE_H		#endif // JREEN_BOOKMARKSTORAGE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	buffereddatastream.h		buffereddatastream.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef BUFFEREDDATASTREAM_H		#ifndef JREEN_BUFFEREDDATASTREAM_H
	#define BUFFEREDDATASTREAM_H		#define JREEN_BUFFEREDDATASTREAM_H
	#include "datastream.h"		#include "datastream.h"
	namespace Jreen		namespace Jreen
	{		{
	class XmlStreamHandler;		class XmlStreamHandler;
	class BufferedDataStreamPrivate;		class BufferedDataStreamPrivate;
	class BufferedDataStream : public DataStream		class BufferedDataStream : public DataStream
	{		{
	Q_OBJECT		Q_OBJECT
	skipping to change at line 57		skipping to change at line 57
	void timerEvent(QTimerEvent *);		void timerEvent(QTimerEvent *);
	void incomingDataReady();		void incomingDataReady();
	qint64 writeData(const char *data, qint64 len);		qint64 writeData(const char *data, qint64 len);
	qint64 readData(char *data, qint64 maxlen);		qint64 readData(char *data, qint64 maxlen);
	private:		private:
	void flush();		void flush();
	QScopedPointer<BufferedDataStreamPrivate> d_ptr;		QScopedPointer<BufferedDataStreamPrivate> d_ptr;
	};		};
	}		}
	#endif // BUFFEREDDATASTREAM_H		#endif // JREEN_BUFFEREDDATASTREAM_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	capabilities.h		capabilities.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef CAPABILITIES_H		#ifndef JREEN_CAPABILITIES_H
	#define CAPABILITIES_H		#define JREEN_CAPABILITIES_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen		namespace Jreen
	{		{
	class CapabilitiesPrivate;		class CapabilitiesPrivate;
	class JREEN_EXPORT Capabilities : public Payload		class JREEN_EXPORT Capabilities : public Payload
	{		{
	Q_DECLARE_PRIVATE(Capabilities)		Q_DECLARE_PRIVATE(Capabilities)
	skipping to change at line 53		skipping to change at line 53
	void setNode(const QString &node);		void setNode(const QString &node);
	QString node() const;		QString node() const;
	QString ver() const;		QString ver() const;
	QString calculatedNode() const;		QString calculatedNode() const;
	private:		private:
	QScopedPointer<CapabilitiesPrivate> d_ptr;		QScopedPointer<CapabilitiesPrivate> d_ptr;
	};		};
	}		}
	#endif // CAPABILITIES_H		#endif // JREEN_CAPABILITIES_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	chatstate.h		chatstate.h
	skipping to change at line 25		skipping to change at line 25
	** This program is distributed in the hope that it will be useful,		** This program is distributed in the hope that it will be useful,
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef CHATSTATE_H		#ifndef JREEN_CHATSTATE_H
	#define CHATSTATE_H		#define JREEN_CHATSTATE_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen {		namespace Jreen {
	class ChatStatePrivate;		class ChatStatePrivate;
	//XEP-0085 Chat State Notification		//XEP-0085 Chat State Notification
	//http://xmpp.org/extensions/xep-0085.html		//http://xmpp.org/extensions/xep-0085.html
	class JREEN_EXPORT ChatState : public Payload		class JREEN_EXPORT ChatState : public Payload
	{		{
	skipping to change at line 58		skipping to change at line 58
	ChatState(State state);		ChatState(State state);
	~ChatState();		~ChatState();
	State state() const;		State state() const;
	private:		private:
	QScopedPointer<ChatStatePrivate> d_ptr;		QScopedPointer<ChatStatePrivate> d_ptr;
	};		};
	} // namespace Jreen		} // namespace Jreen
	Q_ENUMS(Jreen::ChatState::State)		Q_ENUMS(Jreen::ChatState::State)
	#endif // CHATSTATE_H		#endif // JREEN_CHATSTATE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	client.h		client.h
	skipping to change at line 27		skipping to change at line 27
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef CLIENT_H		#ifndef JREEN_CLIENT_H
	#define CLIENT_H		#define JREEN_CLIENT_H
	#include <QObject>		#include <QObject>
	#include <QSet>		#include <QSet>
	#include "jreen.h"		#include "jreen.h"
	#include "presence.h"		#include "presence.h"
	#include "disco.h"		#include "disco.h"
	class JREEN_AUTOTEST_EXPORT QNetworkProxyFactory;		class JREEN_AUTOTEST_EXPORT QNetworkProxyFactory;
	class QNetworkProxy;		class QNetworkProxy;
	skipping to change at line 179		skipping to change at line 179
	Q_PRIVATE_SLOT(d_func(), void _q_iq_received(const Jreen::IQ &iq, in t context))		Q_PRIVATE_SLOT(d_func(), void _q_iq_received(const Jreen::IQ &iq, in t context))
	Q_PRIVATE_SLOT(d_func(), void _q_new_data())		Q_PRIVATE_SLOT(d_func(), void _q_new_data())
	Q_PRIVATE_SLOT(d_func(), void _q_read_more())		Q_PRIVATE_SLOT(d_func(), void _q_read_more())
	Q_PRIVATE_SLOT(d_func(), void _q_send_header())		Q_PRIVATE_SLOT(d_func(), void _q_send_header())
	Q_PRIVATE_SLOT(d_func(), void _q_connected())		Q_PRIVATE_SLOT(d_func(), void _q_connected())
	Q_PRIVATE_SLOT(d_func(), void _q_stateChanged(Jreen::Connection::Soc ketState))		Q_PRIVATE_SLOT(d_func(), void _q_stateChanged(Jreen::Connection::Soc ketState))
	};		};
	}		}
	#endif // CLIENT_H		#endif // JREEN_CLIENT_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	connection.h		connection.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef CONNECTION_H		#ifndef JREEN_CONNECTION_H
	#define CONNECTION_H		#define JREEN_CONNECTION_H
	#include <QIODevice>		#include <QIODevice>
	#include "jreen.h"		#include "jreen.h"
	class QNetworkProxy;		class QNetworkProxy;
	class QAuthenticator;		class QAuthenticator;
	namespace Jreen		namespace Jreen
	{		{
	skipping to change at line 109		skipping to change at line 109
	public:		public:
	virtual ~ConnectionListener() {}		virtual ~ConnectionListener() {}
	virtual bool hasPendingConnections () const = 0;		virtual bool hasPendingConnections () const = 0;
	virtual Connection *nextPendingConnection() = 0;		virtual Connection *nextPendingConnection() = 0;
	signals:		signals:
	void newConnection();		void newConnection();
	};		};
	}		}
	#endif // CONNECTION_H		#endif // JREEN_CONNECTION_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	connectionbosh.h		connectionbosh.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef CONNECTIONBOSH_H		#ifndef JREEN_CONNECTIONBOSH_H
	#define CONNECTIONBOSH_H		#define JREEN_CONNECTIONBOSH_H
	#include "connection.h"		#include "connection.h"
	#include "streamprocessor.h"		#include "streamprocessor.h"
	class QNetworkReply;		class QNetworkReply;
	namespace Jreen		namespace Jreen
	{		{
	class ConnectionBOSHPrivate;		class ConnectionBOSHPrivate;
	class JREEN_EXPORT ConnectionBOSH : public Connection, public StreamProcess or		class JREEN_EXPORT ConnectionBOSH : public Connection, public StreamProcess or
	skipping to change at line 66		skipping to change at line 66
	void restartStream();		void restartStream();
	qint64 readData(char *data, qint64 maxlen);		qint64 readData(char *data, qint64 maxlen);
	qint64 writeData(const char *data, qint64 len);		qint64 writeData(const char *data, qint64 len);
	protected slots:		protected slots:
	void onRequestFinished(QNetworkReply *);		void onRequestFinished(QNetworkReply *);
	private:		private:
	QScopedPointer<ConnectionBOSHPrivate> d_ptr;		QScopedPointer<ConnectionBOSHPrivate> d_ptr;
	};		};
	}		}
	#endif // CONNECTIONBOSH_H		#endif // JREEN_CONNECTIONBOSH_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	dataform.h		dataform.h
	skipping to change at line 27		skipping to change at line 27
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef DATAFORM_H		#ifndef JREEN_DATAFORM_H
	#define DATAFORM_H		#define JREEN_DATAFORM_H
	#include "jid.h"		#include "jid.h"
	#include "stanzaextension.h"		#include "stanzaextension.h"
	#include <QStringList>		#include <QStringList>
	#include <QHash>		#include <QHash>
	#include <QVariant>		#include <QVariant>
	namespace Jreen		namespace Jreen
	{		{
	skipping to change at line 406		skipping to change at line 406
	template <>		template <>
	Q_INLINE_TEMPLATE DataFormOptionContainer DataFormField::cast() const		Q_INLINE_TEMPLATE DataFormOptionContainer DataFormField::cast() const
	{		{
	bool ok = type() == ListMulti || type() == ListSingle;		bool ok = type() == ListMulti || type() == ListSingle;
	return DataFormOptionContainer(ok ? *this : DataFormField());		return DataFormOptionContainer(ok ? *this : DataFormField());
	}		}
	}		}
	#endif // DATAFORM_H		#endif // JREEN_DATAFORM_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	datastream.h		datastream.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef DATASTREAM_H		#ifndef JREEN_DATASTREAM_H
	#define DATASTREAM_H		#define JREEN_DATASTREAM_H
	#include <QIODevice>		#include <QIODevice>
	#include "jreen.h"		#include "jreen.h"
	namespace Jreen		namespace Jreen
	{		{
	class JREEN_EXPORT DataStream : public QIODevice		class JREEN_EXPORT DataStream : public QIODevice
	{		{
	Q_OBJECT		Q_OBJECT
	skipping to change at line 52		skipping to change at line 52
	void setDevice(QIODevice *device);		void setDevice(QIODevice *device);
	QIODevice *device();		QIODevice *device();
	protected slots:		protected slots:
	virtual void incomingDataReady() = 0;		virtual void incomingDataReady() = 0;
	private:		private:
	QIODevice *m_device;		QIODevice *m_device;
	};		};
	}		}
	#endif // DATASTREAM_H		#endif // JREEN_DATASTREAM_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	delayeddelivery.h		delayeddelivery.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef DELAYEDDELIVERY_H		#ifndef JREEN_DELAYEDDELIVERY_H
	#define DELAYEDDELIVERY_H		#define JREEN_DELAYEDDELIVERY_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	#include "jid.h"		#include "jid.h"
	#include <QDateTime>		#include <QDateTime>
	namespace Jreen		namespace Jreen
	{		{
	class DelayedDeliveryPrivate;		class DelayedDeliveryPrivate;
	skipping to change at line 58		skipping to change at line 58
	JID from() const;		JID from() const;
	QString reason() const;		QString reason() const;
	QDateTime dateTime() const;		QDateTime dateTime() const;
	private:		private:
	QScopedPointer<DelayedDeliveryPrivate> d_ptr;		QScopedPointer<DelayedDeliveryPrivate> d_ptr;
	};		};
	}		}
	#endif // DELAYEDDELIVERY_H		#endif // JREEN_DELAYEDDELIVERY_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	directconnection.h		directconnection.h
	skipping to change at line 27		skipping to change at line 27
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef DIRECTCONNECTION_H		#ifndef JREEN_DIRECTCONNECTION_H
	#define DIRECTCONNECTION_H		#define JREEN_DIRECTCONNECTION_H
	#include "connection.h"		#include "connection.h"
	class QAbstractSocket;		class QAbstractSocket;
	class QHostAddress;		class QHostAddress;
	namespace Jreen		namespace Jreen
	{		{
	class DirectConnectionPrivate;		class DirectConnectionPrivate;
	skipping to change at line 58		skipping to change at line 58
	bool open();		bool open();
	void close();		void close();
	void setHost(const QHostAddress &host);		void setHost(const QHostAddress &host);
	void setHost(const QString &host);		void setHost(const QString &host);
	void setPort(int port);		void setPort(int port);
	void setProxy(const QNetworkProxy &proxy);		void setProxy(const QNetworkProxy &proxy);
	qint64 bytesAvailable() const;		qint64 bytesAvailable() const;
	SocketState socketState() const;		SocketState socketState() const;
	SocketError socketError() const;		SocketError socketError() const;
			QAbstractSocket *socket() const;
	signals:		signals:
	void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthen ticator *authenticator);		void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthen ticator *authenticator);
	protected:		protected:
	DirectConnection(QAbstractSocket *socket, const QString &host_name, qint16 port = -1);		DirectConnection(QAbstractSocket *socket, const QString &host_name, qint16 port = -1);
	DirectConnection(QAbstractSocket *socket, const QHostAddress &addres s, qint16 port);		DirectConnection(QAbstractSocket *socket, const QHostAddress &addres s, qint16 port);
	qint64 readData(char *data, qint64 maxlen);		qint64 readData(char *data, qint64 maxlen);
	qint64 writeData(const char *data, qint64 len);		qint64 writeData(const char *data, qint64 len);
	QScopedPointer<DirectConnectionPrivate> d_ptr;		QScopedPointer<DirectConnectionPrivate> d_ptr;
	};		};
	//typedef DirectConnection<QTcpSocket> TcpConnection;		//typedef DirectConnection<QTcpSocket> TcpConnection;
	//typedef DirectConnection<QUdpSocket> UdpConnection;		//typedef DirectConnection<QUdpSocket> UdpConnection;
	}		}
	#endif // DIRECTCONNECTION_H		#endif // JREEN_DIRECTCONNECTION_H
End of changes. 3 change blocks.
	2 lines changed or deleted		4 lines changed or added

	disco.h		disco.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef DISCO_H		#ifndef JREEN_DISCO_H
	#define DISCO_H		#define JREEN_DISCO_H
	#include <QObject>		#include <QObject>
	#include <QString>		#include <QString>
	#include <QSet>		#include <QSet>
	#include "dataform.h"		#include "dataform.h"
	#include "jid.h"		#include "jid.h"
	#include "stanzaextension.h"		#include "stanzaextension.h"
	#include "iq.h"		#include "iq.h"
	namespace Jreen		namespace Jreen
	skipping to change at line 209		skipping to change at line 209
	};		};
	}		}
	Q_DECLARE_METATYPE(Jreen::Disco::Identity)		Q_DECLARE_METATYPE(Jreen::Disco::Identity)
	Q_DECLARE_METATYPE(Jreen::Disco::IdentityList)		Q_DECLARE_METATYPE(Jreen::Disco::IdentityList)
	Q_DECLARE_METATYPE(Jreen::Disco::Item)		Q_DECLARE_METATYPE(Jreen::Disco::Item)
	Q_DECLARE_METATYPE(Jreen::Disco::ItemList)		Q_DECLARE_METATYPE(Jreen::Disco::ItemList)
	Q_DECLARE_OPERATORS_FOR_FLAGS(Jreen::Disco::Item::Actions)		Q_DECLARE_OPERATORS_FOR_FLAGS(Jreen::Disco::Item::Actions)
	#endif // DISCO_H		#endif // JREEN_DISCO_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	entitytime.h		entitytime.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef ENTITYTIME_H		#ifndef JREEN_ENTITYTIME_H
	#define ENTITYTIME_H		#define JREEN_ENTITYTIME_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	#include <QDateTime>		#include <QDateTime>
	namespace Jreen		namespace Jreen
	{		{
	class EntityTimePrivate;		class EntityTimePrivate;
	class EntityTime : public Payload		class EntityTime : public Payload
	{		{
	J_PAYLOAD(Jreen::EntityTime)		J_PAYLOAD(Jreen::EntityTime)
	skipping to change at line 53		skipping to change at line 53
	~EntityTime();		~EntityTime();
	int timeZoneOffset() const;		int timeZoneOffset() const;
	QDateTime localTime() const;		QDateTime localTime() const;
	QDateTime universalTime() const;		QDateTime universalTime() const;
	private:		private:
	QScopedPointer<EntityTimePrivate> d_ptr;		QScopedPointer<EntityTimePrivate> d_ptr;
	};		};
	}		}
	#endif // ENTITYTIME_H		#endif // JREEN_ENTITYTIME_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	error.h		error.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef ERROR_H		#ifndef JREEN_ERROR_H
	#define ERROR_H		#define JREEN_ERROR_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	#include "langmap.h"		#include "langmap.h"
	namespace Jreen		namespace Jreen
	{		{
	class ErrorPrivate;		class ErrorPrivate;
	class JREEN_EXPORT Error : public Payload		class JREEN_EXPORT Error : public Payload
	{		{
	skipping to change at line 173		skipping to change at line 173
	Type type() const;		Type type() const;
	QString text(const QString &lang = QString()) const;		QString text(const QString &lang = QString()) const;
	Condition condition() const;		Condition condition() const;
	QString conditionText() const;		QString conditionText() const;
	private:		private:
	QScopedPointer<ErrorPrivate> d_ptr;		QScopedPointer<ErrorPrivate> d_ptr;
	};		};
	}		}
	#endif // ERROR_H		#endif // JREEN_ERROR_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	iq.h		iq.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef IQ_H		#ifndef JREEN_IQ_H
	#define IQ_H		#define JREEN_IQ_H
	#include "stanza.h"		#include "stanza.h"
	namespace Jreen		namespace Jreen
	{		{
	class IQPrivate;		class IQPrivate;
	class JREEN_EXPORT IQ : public Stanza		class JREEN_EXPORT IQ : public Stanza
	{		{
	Q_DECLARE_PRIVATE(IQ)		Q_DECLARE_PRIVATE(IQ)
	skipping to change at line 65		skipping to change at line 65
	IQ(IQPrivate &p);		IQ(IQPrivate &p);
	inline IQ &operator =(const IQ &stanza)		inline IQ &operator =(const IQ &stanza)
	{ return *static_cast<IQ *>(&Stanza::operator =(stanza)); }		{ return *static_cast<IQ *>(&Stanza::operator =(stanza)); }
	Type subtype() const;		Type subtype() const;
	void accept() const;		void accept() const;
	bool accepted() const;		bool accepted() const;
	};		};
	}		}
	#endif // IQ_H		#endif // JREEN_IQ_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	iqreply.h		iqreply.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef IQREPLY_H		#ifndef JREEN_IQREPLY_H
	#define IQREPLY_H		#define JREEN_IQREPLY_H
	#include "jreen.h"		#include "jreen.h"
	namespace Jreen		namespace Jreen
	{		{
	class Client;		class Client;
	class ClientPrivate;		class ClientPrivate;
	class IQ;		class IQ;
	class IQReplyPrivate;		class IQReplyPrivate;
	skipping to change at line 59		skipping to change at line 59
	void received(const Jreen::IQ &iq);		void received(const Jreen::IQ &iq);
	protected:		protected:
	explicit IQReply(Client *client);		explicit IQReply(Client *client);
	friend class Jreen::ClientPrivate;		friend class Jreen::ClientPrivate;
	QScopedPointer<IQReplyPrivate> d_ptr;		QScopedPointer<IQReplyPrivate> d_ptr;
	};		};
	}		}
	#endif // IQREPLY_H		#endif // JREEN_IQREPLY_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	iristransport.h		iristransport.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef JREEN_JINGLEICE_IRISTRANSPORT_H		#ifndef JREEN_IRISTRANSPORT_H
	#define JREEN_JINGLEICE_IRISTRANSPORT_H		#define JREEN_IRISTRANSPORT_H
	#include "jingletransport.h"		#include "jingletransport.h"
	#include "3rdparty/icesupport/ice176.h"		#include "3rdparty/icesupport/ice176.h"
	#include "3rdparty/icesupport/udpportreserver.h"		#include "3rdparty/icesupport/udpportreserver.h"
	namespace Jreen		namespace Jreen
	{		{
	namespace JingleIce		namespace JingleIce
	{		{
	} // namespace JingleIce		} // namespace JingleIce
	} // namespace Jreen		} // namespace Jreen
	#endif // JREEN_JINGLEICE_IRISTRANSPORT_H		#endif // JREEN_IRISTRANSPORT_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	jid.h		jid.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef JID_H		#ifndef JREEN_JID_H
	#define JID_H		#define JREEN_JID_H
	#include "jreen.h"		#include "jreen.h"
	#include <QSharedData>		#include <QSharedData>
	#include <QMetaType>		#include <QMetaType>
	namespace Jreen		namespace Jreen
	{		{
	class JIDData;		class JIDData;
	class JREEN_EXPORT JID		class JREEN_EXPORT JID
	skipping to change at line 93		skipping to change at line 93
	QSharedDataPointer<JIDData> d_ptr;		QSharedDataPointer<JIDData> d_ptr;
	friend class JIDData;		friend class JIDData;
	};		};
	}		}
	inline uint qHash(const Jreen::JID &jid) { return qHash(jid.full()); }		inline uint qHash(const Jreen::JID &jid) { return qHash(jid.full()); }
	Q_DECLARE_METATYPE(Jreen::JID)		Q_DECLARE_METATYPE(Jreen::JID)
	#endif // JID_H		#endif // JREEN_JID_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	jingleaudiocontent.h		jingleaudiocontent.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef JINGLEAUDIOCONTENT_H		#ifndef JREEN_JINGLEAUDIOCONTENT_H
	#define JINGLEAUDIOCONTENT_H		#define JREEN_JINGLEAUDIOCONTENT_H
	#include "jinglecontent.h"		#include "jinglecontent.h"
	#include "jingleaudiopayload.h"		#include "jingleaudiopayload.h"
	namespace Jreen		namespace Jreen
	{		{
	class JingleAudioContentPrivate;		class JingleAudioContentPrivate;
	class JingleAudioCodecFactory;		class JingleAudioCodecFactory;
	skipping to change at line 85		skipping to change at line 85
	virtual ~JingleAudioCodecFactory() {}		virtual ~JingleAudioCodecFactory() {}
	virtual QList<JingleAudioPayload> supportedPayloads() = 0;		virtual QList<JingleAudioPayload> supportedPayloads() = 0;
	virtual bool supportsPayload(const JingleAudioPayload &payload) = 0;		virtual bool supportsPayload(const JingleAudioPayload &payload) = 0;
	virtual JingleAudioCodec *createCodec(const JingleAudioPayload &payl oad) = 0;		virtual JingleAudioCodec *createCodec(const JingleAudioPayload &payl oad) = 0;
	};		};
	}		}
	Q_DECLARE_INTERFACE(Jreen::JingleAudioCodecFactory, "org.qutim.Jreen.Jingle .AudioCodecFactory")		Q_DECLARE_INTERFACE(Jreen::JingleAudioCodecFactory, "org.qutim.Jreen.Jingle .AudioCodecFactory")
	#endif // JINGLEAUDIOCONTENT_H		#endif // JREEN_JINGLEAUDIOCONTENT_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	jingleaudiopayload.h		jingleaudiopayload.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef JINGLEAUDIOPAYLOAD_H		#ifndef JREEN_JINGLEAUDIOPAYLOAD_H
	#define JINGLEAUDIOPAYLOAD_H		#define JREEN_JINGLEAUDIOPAYLOAD_H
	#include "../jreen.h"		#include "../jreen.h"
	#include <QSharedDataPointer>		#include <QSharedDataPointer>
	namespace Jreen		namespace Jreen
	{		{
	class JingleAudioPayloadData;		class JingleAudioPayloadData;
	class JREEN_EXPORT JingleAudioPayload		class JREEN_EXPORT JingleAudioPayload
	skipping to change at line 70		skipping to change at line 70
	QString parameter(const QString &name) const;		QString parameter(const QString &name) const;
	void setParameter(const QString &name, const QString &value);		void setParameter(const QString &name, const QString &value);
	private:		private:
	QSharedDataPointer<JingleAudioPayloadData> d;		QSharedDataPointer<JingleAudioPayloadData> d;
	friend class JingleAudioPayloadData;		friend class JingleAudioPayloadData;
	};		};
	}		}
	#endif // JINGLEAUDIOPAYLOAD_H		#endif // JREEN_JINGLEAUDIOPAYLOAD_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	jinglecontent.h		jinglecontent.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef JINGLECONTENT_H		#ifndef JREEN_JINGLECONTENT_H
	#define JINGLECONTENT_H		#define JREEN_JINGLECONTENT_H
	#include "../stanzaextension.h"		#include "../stanzaextension.h"
	#include "jingletransport.h"		#include "jingletransport.h"
	#include <QStringList>		#include <QStringList>
	namespace Jreen		namespace Jreen
	{		{
	class JingleSession;		class JingleSession;
	class JingleContentPrivate;		class JingleContentPrivate;
	skipping to change at line 147		skipping to change at line 147
	template <typename Extension>		template <typename Extension>
	Q_INLINE_TEMPLATE bool JingleContentFactory<Extension>::canParse(const QStr ingRef &name, const QStringRef &uri,		Q_INLINE_TEMPLATE bool JingleContentFactory<Extension>::canParse(const QStr ingRef &name, const QStringRef &uri,
	const QX mlStreamAttributes &attributes)		const QX mlStreamAttributes &attributes)
	{		{
	return name == QLatin1String("description") && uri == m_elementUri		return name == QLatin1String("description") && uri == m_elementUri
	&& (m_media.isEmpty() || attributes.value(QLatin1String("med ia")) == m_media);		&& (m_media.isEmpty() || attributes.value(QLatin1String("med ia")) == m_media);
	}		}
	}		}
	#endif // JINGLECONTENT_H		#endif // JREEN_JINGLECONTENT_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	jinglemanager.h		jinglemanager.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef JINGLEMANAGER_H		#ifndef JREEN_JINGLEMANAGER_H
	#define JINGLEMANAGER_H		#define JREEN_JINGLEMANAGER_H
	#include "../iq.h"		#include "../iq.h"
	namespace Jreen		namespace Jreen
	{		{
	class Client;		class Client;
	class JingleSession;		class JingleSession;
	class JingleManagerPrivate;		class JingleManagerPrivate;
	skipping to change at line 63		skipping to change at line 63
	protected:		protected:
	JingleManager(Client *client);		JingleManager(Client *client);
	friend class Client;		friend class Client;
	QScopedPointer<JingleManagerPrivate> d_ptr;		QScopedPointer<JingleManagerPrivate> d_ptr;
	Q_PRIVATE_SLOT(d_func(), void _q_iqReceived(const Jreen::IQ &))		Q_PRIVATE_SLOT(d_func(), void _q_iqReceived(const Jreen::IQ &))
	};		};
	}		}
	#endif // JINGLEMANAGER_H		#endif // JREEN_JINGLEMANAGER_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	jinglesession.h		jinglesession.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef JINGLESESSION_H		#ifndef JREEN_JINGLESESSION_H
	#define JINGLESESSION_H		#define JREEN_JINGLESESSION_H
	#include "jinglecontent.h"		#include "jinglecontent.h"
	#include "../stanzaextension.h"		#include "../stanzaextension.h"
	namespace Jreen		namespace Jreen
	{		{
	class JingleManager;		class JingleManager;
	class JingleManagerPrivate;		class JingleManagerPrivate;
	class JingleSessionPrivate;		class JingleSessionPrivate;
	skipping to change at line 75		skipping to change at line 75
	protected:		protected:
	JingleSession(const JID &responder, const QStringList &contents, Client *client);		JingleSession(const JID &responder, const QStringList &contents, Client *client);
	JingleSession(const Payload::Ptr &payload, Client *client);		JingleSession(const Payload::Ptr &payload, Client *client);
	friend class JingleManager;		friend class JingleManager;
	friend class JingleManagerPrivate;		friend class JingleManagerPrivate;
	QScopedPointer<JingleSessionPrivate> d_ptr;		QScopedPointer<JingleSessionPrivate> d_ptr;
	};		};
	}		}
	#endif // JINGLESESSION_H		#endif // JREEN_JINGLESESSION_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	jingletransport.h		jingletransport.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef JINGLETRANSPORT_H		#ifndef JREEN_JINGLETRANSPORT_H
	#define JINGLETRANSPORT_H		#define JREEN_JINGLETRANSPORT_H
	#include "jinglemanager.h"		#include "jinglemanager.h"
	#include "../stanzaextension.h"		#include "../stanzaextension.h"
	#include <QSharedPointer>		#include <QSharedPointer>
	namespace Jreen		namespace Jreen
	{		{
	class JingleTransportPrivate;		class JingleTransportPrivate;
	class JingleContent;		class JingleContent;
	skipping to change at line 130		skipping to change at line 130
	template <typename Extension>		template <typename Extension>
	Q_INLINE_TEMPLATE bool JingleTransportFactory<Extension>::canParse(const QS tringRef &name, const QStringRef &uri,		Q_INLINE_TEMPLATE bool JingleTransportFactory<Extension>::canParse(const QS tringRef &name, const QStringRef &uri,
	const QX mlStreamAttributes &)		const QX mlStreamAttributes &)
	{		{
	return name == QLatin1String("transport") && uri == m_elementUri;		return name == QLatin1String("transport") && uri == m_elementUri;
	}		}
	}		}
	#endif // JINGLETRANSPORT_H		#endif // JREEN_JINGLETRANSPORT_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	jreen.h		jreen.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef JREEN_H		#ifndef JREEN_JREEN_H
	#define JREEN_H		#define JREEN_JREEN_H
	# ifndef __cplusplus		# ifndef __cplusplus
	# error "C++ is needed"		# error "C++ is needed"
	# endif // __cplusplus		# endif // __cplusplus
	# include <QtGlobal>		# include <QtGlobal>
	# include <QtCore/QString>		# include <QtCore/QString>
	# include <QtCore/QXmlStreamWriter> //needed on OS X (10.5) for QXmlStreamW riter typedef		# include <QtCore/QXmlStreamWriter> //needed on OS X (10.5) for QXmlStreamW riter typedef
	# ifndef J_BUILD_STATIC		# ifndef J_BUILD_STATIC
	skipping to change at line 58		skipping to change at line 58
	# define JREEN_EXPORT Q_DECL_IMPORT		# define JREEN_EXPORT Q_DECL_IMPORT
	# endif		# endif
	# endif		# endif
	# ifndef JREEN_AUTOTEST_EXPORT		# ifndef JREEN_AUTOTEST_EXPORT
	# define JREEN_AUTOTEST_EXPORT		# define JREEN_AUTOTEST_EXPORT
	# endif		# endif
	# ifndef JREEN_EXPORT		# ifndef JREEN_EXPORT
	# define JREEN_EXPORT		# define JREEN_EXPORT
	# endif		# endif
			#ifdef QT_DEPRECATED_SINCE
			# define JREEN_QT_DEPRECATED_SINCE(a, b) QT_DEPRECATED_SINCE(a, b)
			#else
			# define QT_DEPRECATED_SINCE(a, b) false
			#endif
	# define J_PURE_SINGLETON(Class) \		# define J_PURE_SINGLETON(Class) \
	public: \		public: \
	static Class &instance() \		static Class &instance() \
	{ \		{ \
	static Class *pointer = 0; \		static Class *pointer = 0; \
	if(!pointer) \		if(!pointer) \
	pointer = new Class; \		pointer = new Class; \
	return *pointer; \		return *pointer; \
	} \		} \
	private:		private:
	skipping to change at line 117		skipping to change at line 123
	template <typename T>		template <typename T>
	class XmlStreamFactory : public XmlStreamParser		class XmlStreamFactory : public XmlStreamParser
	{		{
	public:		public:
	virtual void serialize(T *obj, QXmlStreamWriter *writer) = 0 ;		virtual void serialize(T *obj, QXmlStreamWriter *writer) = 0 ;
	};		};
	}		}
	#endif // JREEN_H		#endif // JREEN_JREEN_H
End of changes. 3 change blocks.
	2 lines changed or deleted		8 lines changed or added

	jstrings.h		jstrings.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef JSTRINGS_H		#ifndef JREEN_JSTRINGS_H
	#define JSTRINGS_H		#define JREEN_JSTRINGS_H
	#include "jreen.h"		#include "jreen.h"
	namespace Jreen {		namespace Jreen {
	//enums		//enums
	template<typename T, int N>		template<typename T, int N>
	Q_INLINE_TEMPLATE int strToEnum(const T &str, const char *(&strings)[N])		Q_INLINE_TEMPLATE int strToEnum(const T &str, const char *(&strings)[N])
	{		{
	for(int i=0; i < N; i++) {		for(int i=0; i < N; i++) {
	if(QLatin1String(strings[i]) == str)		if(QLatin1String(strings[i]) == str)
	skipping to change at line 87		skipping to change at line 87
	uint n = 1;		uint n = 1;
	while ((1 << n) < i && n < N)		while ((1 << n) < i && n < N)
	++n;		++n;
	if (n >= N)		if (n >= N)
	return QString();		return QString();
	return QLatin1String(strings[n]);		return QLatin1String(strings[n]);
	}		}
	}		}
	#endif // JSTRINGS_H		#endif // JREEN_JSTRINGS_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	langmap.h		langmap.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef LANGMAP_H		#ifndef JREEN_LANGMAP_H
	#define LANGMAP_H		#define JREEN_LANGMAP_H
	#include <QStringList>		#include <QStringList>
	#ifdef LANGMAP_USE_MAP		#ifdef LANGMAP_USE_MAP
	# include <QMap>		# include <QMap>
	#else		#else
	# include <QHash>		# include <QHash>
	#endif		#endif
	class QXmlStreamWriter;		class QXmlStreamWriter;
	#include "jreen.h"		#include "jreen.h"
	namespace Jreen		namespace Jreen
	{		{
	struct JREEN_EXPORT LangMapData		struct JREEN_EXPORT LangMapData
	{		{
	#ifdef LANGMAP_USE_MAP		#ifdef LANGMAP_USE_MAP
	typedef QMap<QString,QString> Base;		typedef QMap<QString,QString> Base;
	#else		#else
	typedef QHash<QString,QString> Base;		typedef QHash<QString,QString> Base;
	#endif		#endif
	QBasicAtomicInt ref;		QAtomicInt ref;
	QString base;		QString base;
	Base other;		Base other;
	void fillNode(QXmlStreamWriter *writer, const QString &name, const Q String &uri) const;		void fillNode(QXmlStreamWriter *writer, const QString &name, const Q String &uri) const;
	const QString &value(const QString &lang) const;		const QString &value(const QString &lang) const;
	const QString &value(const QString &lang, const QString &default_val ue) const;		const QString &value(const QString &lang, const QString &default_val ue) const;
	static LangMapData shared_null;		static LangMapData shared_null;
	};		};
	skipping to change at line 105		skipping to change at line 105
	inline QStringList langs(const QString &value) const;		inline QStringList langs(const QString &value) const;
	inline QStringList values() const;		inline QStringList values() const;
	inline QStringList values(const QString &lang = QString()) const;		inline QStringList values(const QString &lang = QString()) const;
	inline void fillNode(QXmlStreamWriter *writer, const QString &name, const QString &uri = QString()) const;		inline void fillNode(QXmlStreamWriter *writer, const QString &name, const QString &uri = QString()) const;
	inline int count() const;		inline int count() const;
	inline int size() const { return count(); }		inline int size() const { return count(); }
	inline bool isEmpty() const { return count() == 0; }		inline bool isEmpty() const { return count() == 0; }
	protected:		protected:
	inline void detach() { if(d->ref != 1) detach_helper(); }		#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
			inline void detach() { if (d->ref != 1) detach_helper(); }
			#else
			inline void detach() { if (d->ref.load() != 1) detach_helper(); }
			#endif
	void detach_helper()		void detach_helper()
	{		{
	d->ref.deref();		d->ref.deref();
	LangMapData *p = d;		LangMapData *p = d;
	d = new LangMapData;		d = new LangMapData;
	d->ref = 1;		d->ref = 1;
	d->base = p->base;		d->base = p->base;
	d->other = p->other;		d->other = p->other;
	}		}
	};		};
	skipping to change at line 199		skipping to change at line 203
	d->fillNode(writer, name, uri);		d->fillNode(writer, name, uri);
	}		}
	inline int LangMap::count() const		inline int LangMap::count() const
	{		{
	return d->other.count() + (d->base.isEmpty() ? 0 : 1);		return d->other.count() + (d->base.isEmpty() ? 0 : 1);
	}		}
	}		}
	#endif // LANGMAP_H		#endif // JREEN_LANGMAP_H
End of changes. 4 change blocks.
	4 lines changed or deleted		8 lines changed or added

	logger.h		logger.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef LOGGER_H		#ifndef JREEN_LOGGER_H
	#define LOGGER_H		#define JREEN_LOGGER_H
	#include <QtCore/QDebug>		#include <QtDebug>
	#include "jreen.h"		#include "jreen.h"
	namespace Jreen		namespace Jreen
	{		{
	class Logger;		class Logger;
			#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
			# define jreenDebug QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, "jreen
			").debug
			# define jreenWarning QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, "jre
			en").warning
			# define jreenCritical QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, "jr
			een").critical
			# define jreenFatal QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, "jreen
			").critical
			#else
			# define jreenDebug Logger::debug
			# define jreenWarning Logger::warning
			# define jreenCritical Logger::critical
			# define jreenFatal Logger::fatal
			#endif
			#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) || QT_DEPRECATED_SINCE(5, 0)
	class JREEN_EXPORT Debug		class JREEN_EXPORT Debug
	{		{
	struct Stream {		struct Stream {
	Stream(QtMsgType t) : ref(1), debug(&stream), type(t) {}		Stream(QtMsgType t) : ref(1), debug(&stream), type(t) {}
	int ref;		int ref;
	QString stream;		QString stream;
	QDebug debug;		QDebug debug;
	QtMsgType type;		QtMsgType type;
	} *stream;		} *stream;
	skipping to change at line 69		skipping to change at line 82
	class JREEN_EXPORT Logger		class JREEN_EXPORT Logger
	{		{
	public:		public:
	static Debug debug() { return Debug(QtDebugMsg); }		static Debug debug() { return Debug(QtDebugMsg); }
	static Debug warning() { return Debug(QtWarningMsg); }		static Debug warning() { return Debug(QtWarningMsg); }
	static Debug critical() { return Debug(QtCriticalMsg); }		static Debug critical() { return Debug(QtCriticalMsg); }
	static Debug fatal() { return Debug(QtFatalMsg); }		static Debug fatal() { return Debug(QtFatalMsg); }
	static void addHandler(QtMsgHandler handler);		static void addHandler(QtMsgHandler handler);
	static void removeHandler(QtMsgHandler handler);		static void removeHandler(QtMsgHandler handler);
	static bool isNull();		static bool isNull();
	private:		private:
	friend class Debug;		friend class Debug;
	static void flushDebug(Debug::Stream *stream);		static void flushDebug(Debug::Stream *stream);
	Logger();		Logger();
	~Logger();		~Logger();
	};		};
	skipping to change at line 103		skipping to change at line 117
	}		}
	}		}
	template <typename T>		template <typename T>
	Q_INLINE_TEMPLATE Debug &Debug::operator<<(T t)		Q_INLINE_TEMPLATE Debug &Debug::operator<<(T t)
	{		{
	if (!Logger::isNull())		if (!Logger::isNull())
	stream->debug << t;		stream->debug << t;
	return *this;		return *this;
	}		}
			#endif
	}		}
	#endif // LOGGER_H		#endif // JREEN_LOGGER_H
End of changes. 6 change blocks.
	3 lines changed or deleted		22 lines changed or added

	message.h		message.h
	skipping to change at line 27		skipping to change at line 27
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MESSAGE_H		#ifndef JREEN_MESSAGE_H
	#define MESSAGE_H		#define JREEN_MESSAGE_H
	#include "stanza.h"		#include "stanza.h"
	#include "delayeddelivery.h"		#include "delayeddelivery.h"
	namespace Jreen		namespace Jreen
	{		{
	class MessagePrivate;		class MessagePrivate;
	class JREEN_EXPORT Message : public Stanza		class JREEN_EXPORT Message : public Stanza
	skipping to change at line 73		skipping to change at line 73
	QString subject(const QString &lang = QString()) const;		QString subject(const QString &lang = QString()) const;
	void setSubject(const QString &text, const QString &lang = QString() );		void setSubject(const QString &text, const QString &lang = QString() );
	QString thread() const;		QString thread() const;
	void setThread(const QString &thread);		void setThread(const QString &thread);
	void setID(const QString &id);		void setID(const QString &id);
	DelayedDelivery::Ptr when() const;		DelayedDelivery::Ptr when() const;
	};		};
	}		}
	#endif // MESSAGE_H		#endif // JREEN_MESSAGE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	messagesession.h		messagesession.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MESSAGESESSION_H		#ifndef JREEN_MESSAGESESSION_H
	#define MESSAGESESSION_H		#define JREEN_MESSAGESESSION_H
	#include "message.h"		#include "message.h"
	#include <QPointer>		#include <QPointer>
	#include <QHash>		#include <QHash>
	#include <QVector>		#include <QVector>
	#include <QMap>		#include <QMap>
	namespace Jreen		namespace Jreen
	{		{
	class MessageSession;		class MessageSession;
	class MessageSessionManager;		class MessageSessionManager;
	class Client;		class Client;
	#define J_MESSAGE_FILTER(Class) \		#define J_MESSAGE_FILTER(Class) \
	public: \		public: \
	typedef QSharedPointer<Class> Ptr; \		typedef QSharedPointer<Class> Ptr; \
	static int staticFilterType() \		static int staticFilterType() \
	{ \		{ \
	static QBasicAtomicInt filterType = Q_BASIC_ATOMIC_I NITIALIZER(0); \		static int filterType = 0; \
	if (!filterType) { \		if (!filterType) { \
	filterType = Jreen::Payload::registerPayload Type( #Class ); \		filterType = Jreen::Payload::registerPayload Type( #Class ); \
	Class *useFullNameWithNamespaces = reinterpr et_cast< ::Class* >(0); \		Class *useFullNameWithNamespaces = reinterpr et_cast< ::Class* >(0); \
	Q_UNUSED(useFullNameWithNamespaces); \		Q_UNUSED(useFullNameWithNamespaces); \
	} \		} \
	return filterType; \		return filterType; \
	} \		} \
	virtual int filterType() const \		virtual int filterType() const \
	{ \		{ \
	Q_UNUSED(static_cast<const ::Class*>(this)); \		Q_UNUSED(static_cast<const ::Class*>(this)); \
	skipping to change at line 152		skipping to change at line 152
	signals:		signals:
	void messageReceived(const Jreen::Message &message);		void messageReceived(const Jreen::Message &message);
	void sessionCreated(Jreen::MessageSession *session);		void sessionCreated(Jreen::MessageSession *session);
	private:		private:
	QScopedPointer<MessageSessionManagerPrivate> d_ptr;		QScopedPointer<MessageSessionManagerPrivate> d_ptr;
	friend class MessageSession;		friend class MessageSession;
	};		};
	}		}
	#endif // MESSAGESESSION_H		#endif // JREEN_MESSAGESESSION_H
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	mood.h		mood.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MOOD_H		#ifndef JREEN_MOOD_H
	#define MOOD_H		#define JREEN_MOOD_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen		namespace Jreen
	{		{
	class MoodPrivate;		class MoodPrivate;
	class JREEN_EXPORT Mood : public Payload		class JREEN_EXPORT Mood : public Payload
	{		{
	Q_DECLARE_PRIVATE(Mood)		Q_DECLARE_PRIVATE(Mood)
	J_PAYLOAD(Jreen::Mood)		J_PAYLOAD(Jreen::Mood)
	public:		public:
	skipping to change at line 143		skipping to change at line 143
	void setType(const QString &type);		void setType(const QString &type);
	void setType(Type type);		void setType(Type type);
	QString text() const;		QString text() const;
	void setText(const QString &text);		void setText(const QString &text);
	private:		private:
	QScopedPointer<MoodPrivate> d_ptr;		QScopedPointer<MoodPrivate> d_ptr;
	};		};
	} // namespace Jreen		} // namespace Jreen
	#endif // MOOD_H		#endif // JREEN_MOOD_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mucroom.h		mucroom.h
	skipping to change at line 26		skipping to change at line 26
	** This program is distributed in the hope that it will be useful,		** This program is distributed in the hope that it will be useful,
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MUCROOM_H		#ifndef JREEN_MUCROOM_H
	#define MUCROOM_H		#define JREEN_MUCROOM_H
	#include <QObject>		#include <QObject>
	#include <QDateTime>		#include <QDateTime>
	#include "error.h"		#include "error.h"
	#include "disco.h"		#include "disco.h"
	#include "presence.h"		#include "presence.h"
	#include "message.h"		#include "message.h"
	namespace Jreen		namespace Jreen
	{		{
	skipping to change at line 177		skipping to change at line 177
	void listReceived(Jreen::MUCRoom::Affiliation affiliation, const Jre en::MUCRoom::ItemList &items);		void listReceived(Jreen::MUCRoom::Affiliation affiliation, const Jre en::MUCRoom::ItemList &items);
	protected slots:		protected slots:
	void handleIQ(const Jreen::IQ &iq, int context);		void handleIQ(const Jreen::IQ &iq, int context);
	void onConnected();		void onConnected();
	void onDisconnected();		void onDisconnected();
	protected:		protected:
	QScopedPointer<MUCRoomPrivate> d_ptr;		QScopedPointer<MUCRoomPrivate> d_ptr;
	};		};
	}		}
	#endif // MUCROOM_H		#endif // JREEN_MUCROOM_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	nickname.h		nickname.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef NICKNAME_H		#ifndef JREEN_NICKNAME_H
	#define NICKNAME_H		#define JREEN_NICKNAME_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen		namespace Jreen
	{		{
	class NicknamePrivate;		class NicknamePrivate;
	class JREEN_EXPORT Nickname : public Payload		class JREEN_EXPORT Nickname : public Payload
	{		{
	Q_DECLARE_PRIVATE(Nickname)		Q_DECLARE_PRIVATE(Nickname)
	skipping to change at line 50		skipping to change at line 50
	Nickname(const QString &nick);		Nickname(const QString &nick);
	~Nickname();		~Nickname();
	QString nick() const;		QString nick() const;
	private:		private:
	QScopedPointer<NicknamePrivate> d_ptr;		QScopedPointer<NicknamePrivate> d_ptr;
	};		};
	}		}
	#endif // NICKNAME_H		#endif // JREEN_NICKNAME_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	parser.h		parser.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef PARSER_H		#ifndef JREEN_PARSER_H
	#define PARSER_H		#define JREEN_PARSER_H
	#include "stanza.h"		#include "stanza.h"
	#include <QXmlStreamReader>		#include <QXmlStreamReader>
	#include <QEvent>		#include <QEvent>
	namespace Jreen		namespace Jreen
	{		{
	class Client;		class Client;
	class ParserPrivate;		class ParserPrivate;
End of changes. 1 change blocks.
	2 lines changed or deleted		2 lines changed or added

	ping.h		ping.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef PING_H		#ifndef JREEN_PING_H
	#define PING_H		#define JREEN_PING_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	#include "jid.h"		#include "jid.h"
	namespace Jreen {		namespace Jreen {
	//XEP-0199		//XEP-0199
	//http://xmpp.org/extensions/xep-0199.html		//http://xmpp.org/extensions/xep-0199.html
	class PingPrivate;		class PingPrivate;
	class JREEN_EXPORT Ping : public Payload		class JREEN_EXPORT Ping : public Payload
	{		{
	skipping to change at line 50		skipping to change at line 50
	public:		public:
	Ping();		Ping();
	~Ping();		~Ping();
	private:		private:
	QScopedPointer<PingPrivate> d_ptr;		QScopedPointer<PingPrivate> d_ptr;
	};		};
	} // namespace Jreen		} // namespace Jreen
	#endif // PING_H		#endif // JREEN_PING_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	presence.h		presence.h
	skipping to change at line 27		skipping to change at line 27
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef PRESENCE_H		#ifndef JREEN_PRESENCE_H
	#define PRESENCE_H		#define JREEN_PRESENCE_H
	#include "stanza.h"		#include "stanza.h"
	namespace Jreen		namespace Jreen
	{		{
	class PresencePrivate;		class PresencePrivate;
	class Capabilities;		class Capabilities;
	class LangMap;		class LangMap;
	skipping to change at line 86		skipping to change at line 86
	const QString &status(const QString &lang = QString()) const;		const QString &status(const QString &lang = QString()) const;
	void addStatus(const QString &status, const QString &lang = QString( ));		void addStatus(const QString &status, const QString &lang = QString( ));
	void resetStatus();		void resetStatus();
	int priority() const;		int priority() const;
	void setPriority(int priority);		void setPriority(int priority);
	virtual ~Presence() {};		virtual ~Presence() {};
	};		};
	}		}
	#endif // PRESENCE_H		#endif // JREEN_PRESENCE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	privacymanager.h		privacymanager.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef PRIVACYMANAGER_H		#ifndef JREEN_PRIVACYMANAGER_H
	#define PRIVACYMANAGER_H		#define JREEN_PRIVACYMANAGER_H
	#include "jid.h"		#include "jid.h"
	namespace Jreen		namespace Jreen
	{		{
	class Client;		class Client;
	class IQ;		class IQ;
	class RosterItem;		class RosterItem;
	class PrivacyManagerPrivate;		class PrivacyManagerPrivate;
	class PrivacyItemPrivate;		class PrivacyItemPrivate;
	skipping to change at line 131		skipping to change at line 131
	void activeListChanged(const QString &name);		void activeListChanged(const QString &name);
	void defaultListChanged(const QString &name);		void defaultListChanged(const QString &name);
	void listsReceived();		void listsReceived();
	void listReceived(const QString &name, const QList<Jreen::PrivacyIte m> &list);		void listReceived(const QString &name, const QList<Jreen::PrivacyIte m> &list);
	void listChanged(const QString &name);		void listChanged(const QString &name);
	private:		private:
	QScopedPointer<PrivacyManagerPrivate> d_ptr;		QScopedPointer<PrivacyManagerPrivate> d_ptr;
	};		};
	}		}
	#endif // PRIVACYMANAGER_H		#endif // JREEN_PRIVACYMANAGER_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	privatexml.h		privatexml.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef PRIVATEXML_H		#ifndef JREEN_PRIVATEXML_H
	#define PRIVATEXML_H		#define JREEN_PRIVATEXML_H
	#include <QObject>		#include <QObject>
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen		namespace Jreen
	{		{
	class IQ;		class IQ;
	class PrivateXmlPrivate;		class PrivateXmlPrivate;
	skipping to change at line 67		skipping to change at line 67
	void request(const QString &name, const QString &xmlns, QObject *han dler, const char *member);		void request(const QString &name, const QString &xmlns, QObject *han dler, const char *member);
	void store(const Payload::Ptr &node, QObject *handler, const char *m ember);		void store(const Payload::Ptr &node, QObject *handler, const char *m ember);
	private slots:		private slots:
	void handleIQ(const Jreen::IQ &iq, int context);		void handleIQ(const Jreen::IQ &iq, int context);
	private:		private:
	QScopedPointer<PrivateXmlPrivate> d_ptr;		QScopedPointer<PrivateXmlPrivate> d_ptr;
	};		};
	}		}
	#endif // PRIVATEXML_H		#endif // JREEN_PRIVATEXML_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	pubsubevent.h		pubsubevent.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef PUBSUBEVENT_H		#ifndef JREEN_PUBSUBEVENT_H
	#define PUBSUBEVENT_H		#define JREEN_PUBSUBEVENT_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen		namespace Jreen
	{		{
	namespace PubSub		namespace PubSub
	{		{
	class EventPrivate;		class EventPrivate;
	class JREEN_EXPORT Event : public Payload		class JREEN_EXPORT Event : public Payload
	{		{
	skipping to change at line 57		skipping to change at line 57
	QString node() const;		QString node() const;
	void addItem(Payload *item);		void addItem(Payload *item);
	void addItem(const Payload::Ptr &item);		void addItem(const Payload::Ptr &item);
	QList<Payload::Ptr> items() const;		QList<Payload::Ptr> items() const;
	private:		private:
	QScopedPointer<EventPrivate> d_ptr;		QScopedPointer<EventPrivate> d_ptr;
	};		};
	}		}
	}		}
	#endif // PUBSUBEVENT_H		#endif // JREEN_PUBSUBEVENT_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	pubsubmanager.h		pubsubmanager.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef PUBSUBMANAGER_H		#ifndef JREEN_PUBSUBMANAGER_H
	#define PUBSUBMANAGER_H		#define JREEN_PUBSUBMANAGER_H
	#include "pubsubevent.h"		#include "pubsubevent.h"
	namespace Jreen		namespace Jreen
	{		{
	class JID;		class JID;
	class Message;		class Message;
	namespace PubSub		namespace PubSub
	{		{
	skipping to change at line 90		skipping to change at line 90
	protected slots:		protected slots:
	void handleMessage(const Jreen::Message &message);		void handleMessage(const Jreen::Message &message);
	signals:		signals:
	void eventReceived(const Jreen::PubSub::Event::Ptr &event, const Jre en::JID &from);		void eventReceived(const Jreen::PubSub::Event::Ptr &event, const Jre en::JID &from);
	private:		private:
	QScopedPointer<ManagerPrivate> d_ptr;		QScopedPointer<ManagerPrivate> d_ptr;
	};		};
	}		}
	}		}
	#endif // PUBSUBMANAGER_H		#endif // JREEN_PUBSUBMANAGER_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	receipt.h		receipt.h
	skipping to change at line 27		skipping to change at line 27
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef RECEIPT_H		#ifndef JREEN_RECEIPT_H
	#define RECEIPT_H		#define JREEN_RECEIPT_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen		namespace Jreen
	{		{
	class ReceiptPrivate;		class ReceiptPrivate;
	class JREEN_EXPORT Receipt : public Payload		class JREEN_EXPORT Receipt : public Payload
	{		{
	Q_DECLARE_PRIVATE(Receipt)		Q_DECLARE_PRIVATE(Receipt)
	skipping to change at line 59		skipping to change at line 59
	~Receipt();		~Receipt();
	Type type() const;		Type type() const;
	QString id() const;		QString id() const;
	private:		private:
	QScopedPointer<ReceiptPrivate> d_ptr;		QScopedPointer<ReceiptPrivate> d_ptr;
	};		};
	}		}
	#endif // RECEIPT_H		#endif // JREEN_RECEIPT_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	registrationmanager.h		registrationmanager.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef REGISTRATIONMANAGER_H		#ifndef JREEN_REGISTRATIONMANAGER_H
	#define REGISTRATIONMANAGER_H		#define JREEN_REGISTRATIONMANAGER_H
	#include "dataform.h"		#include "dataform.h"
	#include "error.h"		#include "error.h"
	#include "bitsofbinary.h"		#include "bitsofbinary.h"
	#include "iq.h"		#include "iq.h"
	namespace Jreen		namespace Jreen
	{		{
	class RegistrationManager;		class RegistrationManager;
	skipping to change at line 118		skipping to change at line 118
	private:		private:
	Q_PRIVATE_SLOT(d_func(), void _q_form_received(const Jreen::IQ &iq))		Q_PRIVATE_SLOT(d_func(), void _q_form_received(const Jreen::IQ &iq))
	Q_PRIVATE_SLOT(d_func(), void _q_result_received(const Jreen::IQ &iq ))		Q_PRIVATE_SLOT(d_func(), void _q_result_received(const Jreen::IQ &iq ))
	Q_PRIVATE_SLOT(d_func(), void _q_on_disconnect(Jreen::Client::Discon nectReason))		Q_PRIVATE_SLOT(d_func(), void _q_on_disconnect(Jreen::Client::Discon nectReason))
	QScopedPointer<RegistrationManagerPrivate> d_ptr;		QScopedPointer<RegistrationManagerPrivate> d_ptr;
	};		};
	}		}
	#endif // REGISTRATIONMANAGER_H		#endif // JREEN_REGISTRATIONMANAGER_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	softwareversion.h		softwareversion.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef SOFTWAREVERSION_H		#ifndef JREEN_SOFTWAREVERSION_H
	#define SOFTWAREVERSION_H		#define JREEN_SOFTWAREVERSION_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen		namespace Jreen
	{		{
	/*		/*
	* Implementation of XEP-0092		* Implementation of XEP-0092
	* http://xmpp.org/extensions/xep-0092.html		* http://xmpp.org/extensions/xep-0092.html
	*/		*/
	skipping to change at line 61		skipping to change at line 61
	QString os() const;		QString os() const;
	private:		private:
	QScopedPointer<SoftwareVersionPrivate> d_ptr;		QScopedPointer<SoftwareVersionPrivate> d_ptr;
	QString m_name;		QString m_name;
	QString m_version;		QString m_version;
	QString m_os;		QString m_os;
	};		};
	}		}
	#endif // SOFTWAREVERSION_H		#endif // JREEN_SOFTWAREVERSION_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	stanza.h		stanza.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef STANZA_H		#ifndef JREEN_STANZA_H
	#define STANZA_H		#define JREEN_STANZA_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	#include "error.h"		#include "error.h"
	#include "jid.h"		#include "jid.h"
	#include <QMap>		#include <QMap>
	class QXmlStreamWriter;		class QXmlStreamWriter;
	namespace Jreen		namespace Jreen
	{		{
	skipping to change at line 87		skipping to change at line 87
	void removePayload(int id);		void removePayload(int id);
	Error::Ptr error() const;		Error::Ptr error() const;
	protected:		protected:
	Stanza(StanzaPrivate &);		Stanza(StanzaPrivate &);
	Stanza &operator =(const Stanza &stanza);		Stanza &operator =(const Stanza &stanza);
	StanzaPrivate *d_ptr;		StanzaPrivate *d_ptr;
	};		};
	}		}
	#endif // STANZA_H		#endif // JREEN_STANZA_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	stanzaextension.h		stanzaextension.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef STANZAEXTENSION_H		#ifndef JREEN_STANZAEXTENSION_H
	#define STANZAEXTENSION_H		#define JREEN_STANZAEXTENSION_H
	#include <QObject>		#include <QObject>
	#include <QSharedPointer>		#include <QSharedPointer>
	#include <QMetaTypeId>		#include <QMetaTypeId>
	#include "jreen.h"		#include "jreen.h"
	class QXmlStreamWriter;		class QXmlStreamWriter;
	class QXmlStreamAttributes;		class QXmlStreamAttributes;
	template <typename T, typename X> class QMultiMap;		template <typename T, typename X> class QMultiMap;
	skipping to change at line 132		skipping to change at line 132
	{		{
	return payload_cast<T>(se);		return payload_cast<T>(se);
	}		}
	}		}
	#define J_PAYLOAD(Class) \		#define J_PAYLOAD(Class) \
	public: \		public: \
	typedef QSharedPointer<Class> Ptr; \		typedef QSharedPointer<Class> Ptr; \
	static int staticPayloadType() \		static int staticPayloadType() \
	{ \		{ \
	static QBasicAtomicInt payloadType = Q_BASIC_ATOMIC_ INITIALIZER(0); \		static int payloadType = 0; \
	if (!payloadType) { \		if (!payloadType) { \
	payloadType = Payload::registerPayloadType( #Class ); \		payloadType = Payload::registerPayloadType( #Class ); \
	Class *useFullNameWithNamespaces = reinterpr et_cast< ::Class* >(0); \		Class *useFullNameWithNamespaces = reinterpr et_cast< ::Class* >(0); \
	Q_UNUSED(useFullNameWithNamespaces); \		Q_UNUSED(useFullNameWithNamespaces); \
	} \		} \
	return payloadType; \		return payloadType; \
	} \		} \
	virtual int payloadType() const \		virtual int payloadType() const \
	{ \		{ \
	Q_UNUSED(static_cast<const ::Class*>(this)); \		Q_UNUSED(static_cast<const ::Class*>(this)); \
	return staticPayloadType(); \		return staticPayloadType(); \
	} \		} \
	private:		private:
	#endif // STANZAEXTENSION_H		#endif // JREEN_STANZAEXTENSION_H
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	streamprocessor.h		streamprocessor.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef STREAMPROCESSOR_H		#ifndef JREEN_STREAMPROCESSOR_H
	#define STREAMPROCESSOR_H		#define JREEN_STREAMPROCESSOR_H
	#include "jreen.h"		#include "jreen.h"
	#include <QObject>		#include <QObject>
	namespace Jreen		namespace Jreen
	{		{
	class StreamInfo;		class StreamInfo;
	class JID;		class JID;
	class JREEN_EXPORT StreamProcessor		class JREEN_EXPORT StreamProcessor
	{		{
	skipping to change at line 52		skipping to change at line 52
	virtual void authorized() = 0;		virtual void authorized() = 0;
	virtual QString sessionID() const = 0;		virtual QString sessionID() const = 0;
	virtual void setJID(const JID &jid) = 0;		virtual void setJID(const JID &jid) = 0;
	virtual void setStreamParser(XmlStreamParser *parser) = 0;		virtual void setStreamParser(XmlStreamParser *parser) = 0;
	virtual void restartStream() = 0;		virtual void restartStream() = 0;
	};		};
	}		}
	Q_DECLARE_INTERFACE(Jreen::StreamProcessor, "org.qutim.Jreen.StreamProcesso r")		Q_DECLARE_INTERFACE(Jreen::StreamProcessor, "org.qutim.Jreen.StreamProcesso r")
	#endif // STREAMPROCESSOR_H		#endif // JREEN_STREAMPROCESSOR_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	subscription.h		subscription.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef SUBSCRIPTION_H		#ifndef JREEN_SUBSCRIPTION_H
	#define SUBSCRIPTION_H		#define JREEN_SUBSCRIPTION_H
	#include "stanza.h"		#include "stanza.h"
	namespace Jreen		namespace Jreen
	{		{
	//struct SubscriptionPrivate;		//struct SubscriptionPrivate;
	//class JREEN_EXPORT Subscription : public Stanza		//class JREEN_EXPORT Subscription : public Stanza
	//{		//{
	skipping to change at line 59		skipping to change at line 59
	// Subscription(Type type, const JID& to, const QString &status = QStri ng(), const QString &xmllang = QString());		// Subscription(Type type, const JID& to, const QString &status = QStri ng(), const QString &xmllang = QString());
	// inline Subscription &operator =(const Subscription &stanza)		// inline Subscription &operator =(const Subscription &stanza)
	// { return *static_cast<Subscription *>(&Jreen::Stanza::operat or =(stanza)); }		// { return *static_cast<Subscription *>(&Jreen::Stanza::operat or =(stanza)); }
	// Type subtype() const;		// Type subtype() const;
	// const QString &status(const QString &lang = QString()) const;		// const QString &status(const QString &lang = QString()) const;
	// void writeXml(QXmlStreamWriter *writer) const;		// void writeXml(QXmlStreamWriter *writer) const;
	//};		//};
	}		}
	#endif // SUBSCRIPTION_H		#endif // JREEN_SUBSCRIPTION_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	tcpconnection.h		tcpconnection.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef TCPCONNECTION_H		#ifndef JREEN_TCPCONNECTION_H
	#define TCPCONNECTION_H		#define JREEN_TCPCONNECTION_H
	#include "directconnection.h"		#include "directconnection.h"
	namespace Jreen		namespace Jreen
	{		{
	class JREEN_EXPORT TcpConnection : public DirectConnection		class JREEN_EXPORT TcpConnection : public DirectConnection
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	TcpConnection(const QString &host_name, qint16 port = -1);		TcpConnection(const QString &host_name, qint16 port = -1);
	TcpConnection(const QHostAddress &address, qint16 port);		TcpConnection(const QHostAddress &address, qint16 port);
	};		};
	}		}
	#endif // TCPCONNECTION_H		#endif // JREEN_TCPCONNECTION_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	tune.h		tune.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef TUNE_H		#ifndef JREEN_TUNE_H
	#define TUNE_H		#define JREEN_TUNE_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen		namespace Jreen
	{		{
	class TunePrivate;		class TunePrivate;
	class JREEN_EXPORT Tune : public Payload		class JREEN_EXPORT Tune : public Payload
	{		{
	J_PAYLOAD(Jreen::Tune)		J_PAYLOAD(Jreen::Tune)
	Q_DECLARE_PRIVATE(Tune)		Q_DECLARE_PRIVATE(Tune)
	skipping to change at line 61		skipping to change at line 61
	QString title() const;		QString title() const;
	void setTrack(const QString &);		void setTrack(const QString &);
	QString track() const;		QString track() const;
	void setUri(const QUrl &);		void setUri(const QUrl &);
	QUrl uri() const;		QUrl uri() const;
	private:		private:
	QScopedPointer<TunePrivate> d_ptr;		QScopedPointer<TunePrivate> d_ptr;
	};		};
	}		}
	#endif // TUNE_H		#endif // JREEN_TUNE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	udpconnection.h		udpconnection.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef UDPCONNECTION_H		#ifndef JREEN_UDPCONNECTION_H
	#define UDPCONNECTION_H		#define JREEN_UDPCONNECTION_H
	#include "directconnection.h"		#include "directconnection.h"
	namespace Jreen		namespace Jreen
	{		{
	class JREEN_EXPORT UdpConnection : public DirectConnection		class JREEN_EXPORT UdpConnection : public DirectConnection
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	UdpConnection(const QString &host_name, qint16 port = -1);		UdpConnection(const QString &host_name, qint16 port = -1);
	UdpConnection(const QHostAddress &address, qint16 port);		UdpConnection(const QHostAddress &address, qint16 port);
	};		};
	}		}
	#endif // UDPCONNECTION_H		#endif // JREEN_UDPCONNECTION_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	util.h		util.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef UTIL_H		#ifndef JREEN_UTIL_H
	#define UTIL_H		#define JREEN_UTIL_H
	#include "jreen.h"		#include "jreen.h"
	#include <QDateTime>		#include <QDateTime>
	#include <QXmlStreamWriter>		#include <QXmlStreamWriter>
	namespace Jreen		namespace Jreen
	{		{
	class JID;		class JID;
	skipping to change at line 70		skipping to change at line 70
	const QLatin1String &name,const QString &value)		const QLatin1String &name,const QString &value)
	{		{
	if(!value.isEmpty())		if(!value.isEmpty())
	writer->writeTextElement(name,value);		writer->writeTextElement(name,value);
	}		}
	}		}
	}		}
	#endif // UTIL_H		#endif // JREEN_UTIL_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	vcard.h		vcard.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef VCARD_H		#ifndef JREEN_VCARD_H
	#define VCARD_H		#define JREEN_VCARD_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	#include "nickname.h"		#include "nickname.h"
	#include <QDateTime>		#include <QDateTime>
	//implementation of XEP 0054		//implementation of XEP 0054
	//http://xmpp.org/extensions/xep-0054.html		//http://xmpp.org/extensions/xep-0054.html
	namespace Jreen {		namespace Jreen {
	class VCardPrivate;		class VCardPrivate;
	skipping to change at line 410		skipping to change at line 410
	*/		*/
	Organization organization();		Organization organization();
	private:		private:
	QScopedPointer<VCardPrivate> d_ptr;		QScopedPointer<VCardPrivate> d_ptr;
	};		};
	} // namespace Jreen		} // namespace Jreen
	Q_DECLARE_OPERATORS_FOR_FLAGS(Jreen::VCard::Telephone::Types)		Q_DECLARE_OPERATORS_FOR_FLAGS(Jreen::VCard::Telephone::Types)
	#endif // VCARD_H		#endif // JREEN_VCARD_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	vcardmanager.h		vcardmanager.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef VCARDMANAGER_H		#ifndef JREEN_VCARDMANAGER_H
	#define VCARDMANAGER_H		#define JREEN_VCARDMANAGER_H
	#include "vcard.h"		#include "vcard.h"
	#include "vcardupdate.h"		#include "vcardupdate.h"
	#include "error.h"		#include "error.h"
	namespace Jreen		namespace Jreen
	{		{
	class JID;		class JID;
	class IQ;		class IQ;
	class Presence;		class Presence;
	skipping to change at line 89		skipping to change at line 89
	void finished();		void finished();
	private:		private:
	VCardReply(const JID &jid, VCardManager *manager, IQReply *reply);		VCardReply(const JID &jid, VCardManager *manager, IQReply *reply);
	friend class VCardManager;		friend class VCardManager;
	Q_PRIVATE_SLOT(d_func(), void _q_received(const Jreen::IQ &))		Q_PRIVATE_SLOT(d_func(), void _q_received(const Jreen::IQ &))
	QScopedPointer<VCardReplyPrivate> d_ptr;		QScopedPointer<VCardReplyPrivate> d_ptr;
	};		};
	}		}
	#endif // VCARDMANAGER_H		#endif // JREEN_VCARDMANAGER_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	vcardupdate.h		vcardupdate.h
	skipping to change at line 26		skipping to change at line 26
	** but WITHOUT ANY WARRANTY; without even the implied warranty of		** but WITHOUT ANY WARRANTY; without even the implied warranty of
	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.		** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
	** See the GNU General Public License for more details.		** See the GNU General Public License for more details.
	**		**
	** You should have received a copy of the GNU General Public License		** You should have received a copy of the GNU General Public License
	** along with this program. If not, see http://www.gnu.org/licenses/.		** along with this program. If not, see http://www.gnu.org/licenses/.
	** $JREEN_END_LICENSE$		** $JREEN_END_LICENSE$
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef VCARDUPDATE_H		#ifndef JREEN_VCARDUPDATE_H
	#define VCARDUPDATE_H		#define JREEN_VCARDUPDATE_H
	#include "stanzaextension.h"		#include "stanzaextension.h"
	namespace Jreen		namespace Jreen
	{		{
	class VCardUpdatePrivate;		class VCardUpdatePrivate;
	//XEP-0153: vCard-Based Avatars		//XEP-0153: vCard-Based Avatars
	//http://xmpp.org/extensions/xep-0153.html		//http://xmpp.org/extensions/xep-0153.html
	class JREEN_EXPORT VCardUpdate : public Payload		class JREEN_EXPORT VCardUpdate : public Payload
	skipping to change at line 57		skipping to change at line 57
	void setPhotoHash(const QString &photoHash);		void setPhotoHash(const QString &photoHash);
	void clear();		void clear();
	bool hasPhotoInfo() const;		bool hasPhotoInfo() const;
	private:		private:
	QScopedPointer<VCardUpdatePrivate> d_ptr;		QScopedPointer<VCardUpdatePrivate> d_ptr;
	};		};
	} // namespace Jreen		} // namespace Jreen
	#endif // VCARDUPDATE_H		#endif // JREEN_VCARDUPDATE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/