Fix for

Issue 23: QXmppBind compilation error on macosx starting from r23
Issue 26: examples fail to link on macosx and linux
Issue 24: all text files should have the svn property eol-style set

Contributed by: Marco Molteni

1 files changed, 108 insertions, 108 deletions

diff --git a/source/QXmppRoster.h b/source/QXmppRoster.h
index f9982083..ef1b40d4 100644
--- a/source/QXmppRoster.h
+++ b/source/QXmppRoster.h
@@ -1,108 +1,108 @@
-/*

- * Copyright (C) 2008-2009 Manjeet Dahiya

- *

- * Author:

- *	Manjeet Dahiya

- *

- * Source:

- *	http://code.google.com/p/qxmpp

- *

- * This file is a part of QXmpp library.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- */

-

-

-#ifndef QXMPPROSTER_H

-#define QXMPPROSTER_H

-

-#include <QObject>

-#include <QMap>

-#include <QSet>

-#include <QStringList>

-

-#include "QXmppClient.h"

-

-class QXmppRosterIq;

-class QXmppPresence;

-

-class QXmppRoster : public QObject

-{

-    Q_OBJECT

-

-public:

-    class QXmppRosterEntry

-    {

-    public:

-        enum SubscriptionType

-        {

-            None = 0,

-            Both,

-            From,

-            To,

-            Remove

-        };

-

-        QString getBareJid() const;

-        QString getName() const;

-        QXmppRosterEntry::SubscriptionType getSubscriptionType() const;

-        QString getSubscriptionStatus() const;

-        QSet<QString> getGroups() const;

-

-        void setBareJid(const QString&);

-        void setName(const QString&);

-        void setSubscriptionType(QXmppRosterEntry::SubscriptionType);

-        void setSubscriptionStatus(const QString&);

-        void setGroups(const QSet<QString>&);

-        void addGroupEntry(const QString&);

-

-    private:

-        QString m_bareJid;

-        SubscriptionType m_type;

-        QString m_name;

-        // can be subscribe/unsubscribe (attribute "ask")

-        QString m_subscriptionStatus;

-        QSet<QString> m_groups;

-    };

-

-    QXmppRoster(QXmppStream* stream);

-    ~QXmppRoster();

-    

-    QStringList getRosterBareJids() const;

-    QXmppRoster::QXmppRosterEntry getRosterEntry(const QString& bareJid) const;

-    QMap<QString, QXmppRoster::QXmppRosterEntry> getRosterEntries() const;

-    

-    QStringList getResources(const QString& bareJid) const;

-    QMap<QString, QMap<QString, QXmppPresence> > getAllPresences() const;

-    QMap<QString, QXmppPresence> getAllPresencesForBareJid(

-            const QString& bareJid) const;

-    QXmppPresence getPresence(const QString& bareJid,

-                              const QString& resource) const;

-

-signals:

-    void presenceChanged(const QString& bareJid, const QString& resource);

-    void rosterChanged(const QString& bareJid);

-

-private:

-    //reverse pointer to stream

-    QXmppStream* m_stream;

-    //map of bareJid and its rosterEntry

-    QMap<QString, QXmppRoster::QXmppRosterEntry> m_entries;

-    // map of resources of the jid and map of resouces and presences

-    QMap<QString, QMap<QString, QXmppPresence> > m_presences;

-

-private slots:

-    void presenceReceived(const QXmppPresence&);

-    void rosterIqReceived(const QXmppRosterIq&);

-};

-

-#endif // QXMPPROSTER_H

+/*
+ * Copyright (C) 2008-2009 Manjeet Dahiya
+ *
+ * Author:
+ *	Manjeet Dahiya
+ *
+ * Source:
+ *	http://code.google.com/p/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPROSTER_H
+#define QXMPPROSTER_H
+
+#include <QObject>
+#include <QMap>
+#include <QSet>
+#include <QStringList>
+
+#include "QXmppClient.h"
+
+class QXmppRosterIq;
+class QXmppPresence;
+
+class QXmppRoster : public QObject
+{
+    Q_OBJECT
+
+public:
+    class QXmppRosterEntry
+    {
+    public:
+        enum SubscriptionType
+        {
+            None = 0,
+            Both,
+            From,
+            To,
+            Remove
+        };
+
+        QString getBareJid() const;
+        QString getName() const;
+        QXmppRosterEntry::SubscriptionType getSubscriptionType() const;
+        QString getSubscriptionStatus() const;
+        QSet<QString> getGroups() const;
+
+        void setBareJid(const QString&);
+        void setName(const QString&);
+        void setSubscriptionType(QXmppRosterEntry::SubscriptionType);
+        void setSubscriptionStatus(const QString&);
+        void setGroups(const QSet<QString>&);
+        void addGroupEntry(const QString&);
+
+    private:
+        QString m_bareJid;
+        SubscriptionType m_type;
+        QString m_name;
+        // can be subscribe/unsubscribe (attribute "ask")
+        QString m_subscriptionStatus;
+        QSet<QString> m_groups;
+    };
+
+    QXmppRoster(QXmppStream* stream);
+    ~QXmppRoster();
+    
+    QStringList getRosterBareJids() const;
+    QXmppRoster::QXmppRosterEntry getRosterEntry(const QString& bareJid) const;
+    QMap<QString, QXmppRoster::QXmppRosterEntry> getRosterEntries() const;
+    
+    QStringList getResources(const QString& bareJid) const;
+    QMap<QString, QMap<QString, QXmppPresence> > getAllPresences() const;
+    QMap<QString, QXmppPresence> getAllPresencesForBareJid(
+            const QString& bareJid) const;
+    QXmppPresence getPresence(const QString& bareJid,
+                              const QString& resource) const;
+
+signals:
+    void presenceChanged(const QString& bareJid, const QString& resource);
+    void rosterChanged(const QString& bareJid);
+
+private:
+    //reverse pointer to stream
+    QXmppStream* m_stream;
+    //map of bareJid and its rosterEntry
+    QMap<QString, QXmppRoster::QXmppRosterEntry> m_entries;
+    // map of resources of the jid and map of resouces and presences
+    QMap<QString, QMap<QString, QXmppPresence> > m_presences;
+
+private slots:
+    void presenceReceived(const QXmppPresence&);
+    void rosterIqReceived(const QXmppRosterIq&);
+};
+
+#endif // QXMPPROSTER_H