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, 63 insertions, 58 deletions

diff --git a/source/QXmppIq.h b/source/QXmppIq.h
index 54903d15..f0cc778d 100644
--- a/source/QXmppIq.h
+++ b/source/QXmppIq.h
@@ -1,58 +1,63 @@
-/*

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

-#define QXMPPIQ_H

-

-#include "QXmppStanza.h"

-class QXmlStreamWriter;

-

-class QXmppIq : public QXmppStanza

-{

-public:

-    enum Type

-    {

-        Error = 0,

-        Get,

-        Set,

-        Result

-    };

-

-    QXmppIq(QXmppIq::Type type = QXmppIq::Get);

-    QXmppIq(const QString& type);

-    ~QXmppIq();

-

-    QXmppIq::Type getType() const;

-    QString getTypeStr() const;

-    void setType(QXmppIq::Type);

-    void setTypeFromStr(const QString& str);

-

-    void toXml( QXmlStreamWriter *writer ) const;

-    virtual void toXmlElementFromChild( QXmlStreamWriter *writer ) const;

-

-private:

-    Type m_type;

-};

-

-#endif // QXMPPIQ_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 QXMPPIQ_H
+#define QXMPPIQ_H
+
+#include "QXmppStanza.h"
+
+// forward declarations of QXmlStream* classes will not work on Mac, we need to
+// include the whole header.
+// See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html
+// for an explanation.
+#include <QXmlStreamWriter>
+
+class QXmppIq : public QXmppStanza
+{
+public:
+    enum Type
+    {
+        Error = 0,
+        Get,
+        Set,
+        Result
+    };
+
+    QXmppIq(QXmppIq::Type type = QXmppIq::Get);
+    QXmppIq(const QString& type);
+    ~QXmppIq();
+
+    QXmppIq::Type getType() const;
+    QString getTypeStr() const;
+    void setType(QXmppIq::Type);
+    void setTypeFromStr(const QString& str);
+
+    void toXml( QXmlStreamWriter *writer ) const;
+    virtual void toXmlElementFromChild( QXmlStreamWriter *writer ) const;
+
+private:
+    Type m_type;
+};
+
+#endif // QXMPPIQ_H