abstractroster.h   abstractroster.h 
skipping to change at line 159 skipping to change at line 159
SimpleRoster(Client *client, SimpleRosterPrivate *data = 0); SimpleRoster(Client *client, SimpleRosterPrivate *data = 0);
virtual ~SimpleRoster(); virtual ~SimpleRoster();
void subscribe(const JID &jid, const QString &msg, const QString &na me, const QStringList &groups); void subscribe(const JID &jid, const QString &msg, const QString &na me, const QStringList &groups);
void subscribe(const JID &jid, const QString &msg = QString()); void subscribe(const JID &jid, const QString &msg = QString());
void unsubscribe(const JID &jid, const QString &msg = QString()); void unsubscribe(const JID &jid, const QString &msg = QString());
void allowSubscription(const JID &jid, bool ok); void allowSubscription(const JID &jid, bool ok);
using AbstractRoster::add; using AbstractRoster::add;
using AbstractRoster::remove; using AbstractRoster::remove;
signals: signals:
void itemAdded(const RosterItem::Ptr &item); void itemAdded(const Jreen::RosterItem::Ptr &item);
void itemUpdated(const RosterItem::Ptr &item); void itemUpdated(const Jreen::RosterItem::Ptr &item);
void itemRemoved(const QString &jid); void itemRemoved(const QString &jid);
void presenceReceived(const Jreen::RosterItem::Ptr &item, const Jree n::Presence &presence); void presenceReceived(const Jreen::RosterItem::Ptr &item, const Jree n::Presence &presence);
void subscriptionReceived(const Jreen::RosterItem::Ptr &item, const Jreen::Presence &presence); void subscriptionReceived(const Jreen::RosterItem::Ptr &item, const Jreen::Presence &presence);
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);
}; };
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 client.h   client.h 
skipping to change at line 70 skipping to change at line 70
virtual void handleStreamEnd() = 0; virtual void handleStreamEnd() = 0;
virtual void handleIncomingData(const char *data, qint64 size) = 0; virtual void handleIncomingData(const char *data, qint64 size) = 0;
virtual void handleOutgoingData(const char *data, qint64 size) = 0; virtual void handleOutgoingData(const char *data, qint64 size) = 0;
}; };
class JREEN_EXPORT Client : public QObject class JREEN_EXPORT Client : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QSet<QString> serverFeatures READ serverFeatures NOTIFY s erverFeaturesReceived) Q_PROPERTY(QSet<QString> serverFeatures READ serverFeatures NOTIFY s erverFeaturesReceived)
Q_PROPERTY(Jreen::Disco::IdentityList serverIdentities READ serverId entities NOTIFY serverIdentitiesReceived) Q_PROPERTY(Jreen::Disco::IdentityList serverIdentities READ serverId entities NOTIFY serverIdentitiesReceived)
Q_ENUMS(DisconnectReason Feature FeatureConfig)
Q_DECLARE_PRIVATE(Client) Q_DECLARE_PRIVATE(Client)
public: public:
enum DisconnectReason enum DisconnectReason
{ {
User, User,
HostUnknown, HostUnknown,
ItemNotFound, ItemNotFound,
AuthorizationError, AuthorizationError,
RemoteStreamError, RemoteStreamError,
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 metacontactstorage.h   metacontactstorage.h 
skipping to change at line 44 skipping to change at line 44
{ {
class MetaContactStoragePrivate; class MetaContactStoragePrivate;
class JREEN_EXPORT MetaContactStorage : public QObject class JREEN_EXPORT MetaContactStorage : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(MetaContactStorage) Q_DECLARE_PRIVATE(MetaContactStorage)
public: public:
class ItemData; class ItemData;
class Item class JREEN_EXPORT Item
{ {
public: public:
Item(); Item();
Item(const JID &jid, const QString &tag); Item(const JID &jid, const QString &tag);
Item(const JID &jid, const QString &tag, uint order); Item(const JID &jid, const QString &tag, uint order);
Item(const Item &item); Item(const Item &item);
Item &operator =(const Item &item); Item &operator =(const Item &item);
~Item(); ~Item();
JID jid() const; JID jid() const;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/