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, 84 insertions, 84 deletions

diff --git a/source/QXmppRosterIq.h b/source/QXmppRosterIq.h
index c750946e..409f4d55 100644
--- a/source/QXmppRosterIq.h
+++ b/source/QXmppRosterIq.h
@@ -1,84 +1,84 @@
-/*

- * 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 QXMPPROSTERIQ_H

-#define QXMPPROSTERIQ_H

-

-#include "QXmppIq.h"

-#include <QList>

-#include <QSet>

-

-class QXmppRosterIq : public QXmppIq

-{

-public:

-

-    class Item

-    {

-    public:

-        enum SubscriptionType

-        {

-            NotSet = 0,

-            None,

-            Both,

-            From,

-            To,

-            Remove

-        };

-

-        SubscriptionType getSubscriptionType() const;

-        QString getName() const;

-        QString getSubscriptionStatus() const;

-        QString getBareJid() const;

-        QSet<QString> getGroups() const;

-        void setName(const QString&);

-        void setSubscriptionStatus(const QString&);

-        void addGroup(const QString&);

-        void setBareJid(const QString&);

-        void setSubscriptionType(SubscriptionType);

-        QString getSubscriptionTypeStr() const;

-        void setSubscriptionTypeFromStr(const QString&);

-        void toXml(QXmlStreamWriter *writer) const;

-        

-    private:

-        QString m_bareJid;

-        SubscriptionType m_type;

-        QString m_name;

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

-        QString m_subscriptionStatus;

-        QSet<QString> m_groups;

-    };

-

-    QXmppRosterIq(QXmppIq::Type type);

-    QXmppRosterIq(const QString& type);

-    ~QXmppRosterIq();

-    

-    void addItem(const Item&);

-    QList<Item> getItems() const;

-    void toXmlElementFromChild(QXmlStreamWriter *writer) const;

-

-private:

-    QList<Item> m_items;

-};

-

-#endif // QXMPPROSTERIQ_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 QXMPPROSTERIQ_H
+#define QXMPPROSTERIQ_H
+
+#include "QXmppIq.h"
+#include <QList>
+#include <QSet>
+
+class QXmppRosterIq : public QXmppIq
+{
+public:
+
+    class Item
+    {
+    public:
+        enum SubscriptionType
+        {
+            NotSet = 0,
+            None,
+            Both,
+            From,
+            To,
+            Remove
+        };
+
+        SubscriptionType getSubscriptionType() const;
+        QString getName() const;
+        QString getSubscriptionStatus() const;
+        QString getBareJid() const;
+        QSet<QString> getGroups() const;
+        void setName(const QString&);
+        void setSubscriptionStatus(const QString&);
+        void addGroup(const QString&);
+        void setBareJid(const QString&);
+        void setSubscriptionType(SubscriptionType);
+        QString getSubscriptionTypeStr() const;
+        void setSubscriptionTypeFromStr(const QString&);
+        void toXml(QXmlStreamWriter *writer) const;
+        
+    private:
+        QString m_bareJid;
+        SubscriptionType m_type;
+        QString m_name;
+         // can be subscribe/unsubscribe (attribute "ask")
+        QString m_subscriptionStatus;
+        QSet<QString> m_groups;
+    };
+
+    QXmppRosterIq(QXmppIq::Type type);
+    QXmppRosterIq(const QString& type);
+    ~QXmppRosterIq();
+    
+    void addItem(const Item&);
+    QList<Item> getItems() const;
+    void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+
+private:
+    QList<Item> m_items;
+};
+
+#endif // QXMPPROSTERIQ_H