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, 59 insertions, 54 deletions

diff --git a/source/QXmppUtils.h b/source/QXmppUtils.h
index 146057c7..f9a7cdfd 100644
--- a/source/QXmppUtils.h
+++ b/source/QXmppUtils.h
@@ -1,54 +1,59 @@
-/*

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

-#define QXMPPUTILS_H

-

-

-class QXmlStreamWriter;

-class QByteArray;

-class QString;

-class QImage;

-

-QString jidToResource(const QString& jid);

-QString jidToBareJid(const QString& jid);

-

-void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name,

-                             const QString& value);

-void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name,

-                           const QString& value);

-void helperToXmlAddNumberElement(QXmlStreamWriter* stream, const QString& name,

-                           int value);

-

-void log(const QString& str);

-void log(const QByteArray& str);

-

-QString escapeString(const QString& str);

-QString unescapeString(const QString& str);

-

-QString getImageType(const QByteArray& image);

-QString getImageHash(const QByteArray& image);

-QImage getImageFromByteArray(const QByteArray& image);

-

-#endif // QXMPPUTILS_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 QXMPPUTILS_H
+#define QXMPPUTILS_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 QByteArray;
+class QString;
+class QImage;
+
+QString jidToResource(const QString& jid);
+QString jidToBareJid(const QString& jid);
+
+void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name,
+                             const QString& value);
+void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name,
+                           const QString& value);
+void helperToXmlAddNumberElement(QXmlStreamWriter* stream, const QString& name,
+                           int value);
+
+void log(const QString& str);
+void log(const QByteArray& str);
+
+QString escapeString(const QString& str);
+QString unescapeString(const QString& str);
+
+QString getImageType(const QByteArray& image);
+QString getImageHash(const QByteArray& image);
+QImage getImageFromByteArray(const QByteArray& image);
+
+#endif // QXMPPUTILS_H