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

9 files changed, 229 insertions, 229 deletions

diff --git a/example/example.pro b/example/example.pro
index 1447c88f..d26a7a23 100644
--- a/example/example.pro
+++ b/example/example.pro
@@ -1,5 +1,5 @@
-TEMPLATE = subdirs

-

-SUBDIRS = example_0_connected\

-            example_1_echoClient

-

+TEMPLATE = subdirs
+
+SUBDIRS = example_0_connected\
+            example_1_echoClient
+
diff --git a/example/example_0_connected/README b/example/example_0_connected/README
index 54d162de..fb84fea9 100644
--- a/example/example_0_connected/README
+++ b/example/example_0_connected/README
@@ -1,5 +1,5 @@
-This example just connects to the xmpp server. And start receiving presences (updates) from the server.

-

-After running this example, you can see this user online, if it's added in your roster (friends list).

-

-Logging type has been set to stdout. You can see the progress on the command line.

+This example just connects to the xmpp server. And start receiving presences (updates) from the server.
+
+After running this example, you can see this user online, if it's added in your roster (friends list).
+
+Logging type has been set to stdout. You can see the progress on the command line.
diff --git a/example/example_0_connected/example_0_connected.pro b/example/example_0_connected/example_0_connected.pro
index 967ceade..4dbef891 100644
--- a/example/example_0_connected/example_0_connected.pro
+++ b/example/example_0_connected/example_0_connected.pro
@@ -1,19 +1,19 @@
-TEMPLATE = app

-

-TARGET = example_0_connected

-

-SOURCES += main.cpp

-

-INCLUDEPATH += ../../source

-

-QT += network xml

-

-CONFIG += console debug_and_release

-

-CONFIG(debug, debug|release) {

-    LIBS += -L../../source/debug -lQXmppClient_d

- } else {

-    LIBS += -L../../source/release -lQXmppClient

- }

-

-OTHER_FILES += README

+TEMPLATE = app
+
+TARGET = example_0_connected
+
+SOURCES += main.cpp
+
+INCLUDEPATH += ../../source
+
+QT += network xml
+
+CONFIG += console debug_and_release
+
+CONFIG(debug, debug|release) {
+    LIBS += -L../../source/debug -lQXmppClient_d
+ } else {
+    LIBS += -L../../source/release -lQXmppClient
+ }
+
+OTHER_FILES += README
diff --git a/example/example_0_connected/main.cpp b/example/example_0_connected/main.cpp
index fb9b54b8..110e1630 100644
--- a/example/example_0_connected/main.cpp
+++ b/example/example_0_connected/main.cpp
@@ -1,47 +1,47 @@
-/*

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

- *

- */

-

-

-#include <QtCore/QCoreApplication>

-

-#include "QXmppClient.h"

-#include "QXmppLogger.h"

-

-int main(int argc, char *argv[])

-{

-    QCoreApplication a(argc, argv);

-    

-    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::STDOUT);

-

-    QXmppClient client;

-

-//  For google talk

-//    client.connectToServer("talk.google.com", "usernamewithoutdomain", "passwd", "gmail.com");

-

-//  For jabber

-//    client.connectToServer("jabber.org", "usernamewithoutdomain", "passwd", "jabber.org");

-

-    client.connectToServer("talk.google.com", "qxmpp.test1", "qxmpp123", "gmail.com");

-

-    return a.exec();

-}

+/*
+ * 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.
+ *
+ */
+
+
+#include <QtCore/QCoreApplication>
+
+#include "QXmppClient.h"
+#include "QXmppLogger.h"
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+    
+    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::STDOUT);
+
+    QXmppClient client;
+
+//  For google talk
+//    client.connectToServer("talk.google.com", "usernamewithoutdomain", "passwd", "gmail.com");
+
+//  For jabber
+//    client.connectToServer("jabber.org", "usernamewithoutdomain", "passwd", "jabber.org");
+
+    client.connectToServer("talk.google.com", "qxmpp.test1", "qxmpp123", "gmail.com");
+
+    return a.exec();
+}
diff --git a/example/example_1_echoClient/README b/example/example_1_echoClient/README
index a8e19abf..4c3ac681 100644
--- a/example/example_1_echoClient/README
+++ b/example/example_1_echoClient/README
@@ -1,5 +1,5 @@
-This is a very simple bot which echoes the message sent to it.

-

-Run this example, send it a message from a friend of this bot. You will recieve the message back.

-

-This example shows how to receive and send messages.

+This is a very simple bot which echoes the message sent to it.
+
+Run this example, send it a message from a friend of this bot. You will recieve the message back.
+
+This example shows how to receive and send messages.
diff --git a/example/example_1_echoClient/echoClient.cpp b/example/example_1_echoClient/echoClient.cpp
index c5738811..f16b076f 100644
--- a/example/example_1_echoClient/echoClient.cpp
+++ b/example/example_1_echoClient/echoClient.cpp
@@ -1,47 +1,47 @@
-/*

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

- *

- */

-

-

-#include "echoClient.h"

-#include "QXmppMessage.h"

-

-echoClient::echoClient(QObject *parent)

-    : QXmppClient(parent)

-{

-    bool check = connect(this, SIGNAL(messageReceived(const QXmppMessage&)),

-        SLOT(messageReceived(const QXmppMessage&)));

-    Q_ASSERT(check);

-}

-

-echoClient::~echoClient()

-{

-

-}

-

-void echoClient::messageReceived(const QXmppMessage& message)

-{

-    QString from = message.getFrom();

-    QString msg = message.getBody();

-

-    sendPacket(QXmppMessage("", from, "Your message: " + msg));

-}

+/*
+ * 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.
+ *
+ */
+
+
+#include "echoClient.h"
+#include "QXmppMessage.h"
+
+echoClient::echoClient(QObject *parent)
+    : QXmppClient(parent)
+{
+    bool check = connect(this, SIGNAL(messageReceived(const QXmppMessage&)),
+        SLOT(messageReceived(const QXmppMessage&)));
+    Q_ASSERT(check);
+}
+
+echoClient::~echoClient()
+{
+
+}
+
+void echoClient::messageReceived(const QXmppMessage& message)
+{
+    QString from = message.getFrom();
+    QString msg = message.getBody();
+
+    sendPacket(QXmppMessage("", from, "Your message: " + msg));
+}
diff --git a/example/example_1_echoClient/echoClient.h b/example/example_1_echoClient/echoClient.h
index 342cc099..a1a0d04c 100644
--- a/example/example_1_echoClient/echoClient.h
+++ b/example/example_1_echoClient/echoClient.h
@@ -1,42 +1,42 @@
-/*

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

-#define ECHOCLIENT_H

-

-#include "QXmppClient.h"

-

-class echoClient : public QXmppClient

-{

-    Q_OBJECT

-

-public:

-    echoClient(QObject *parent = 0);

-    ~echoClient();

-

-public slots:

-    void messageReceived(const QXmppMessage&);

-};

-

-#endif // ECHOCLIENT_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 ECHOCLIENT_H
+#define ECHOCLIENT_H
+
+#include "QXmppClient.h"
+
+class echoClient : public QXmppClient
+{
+    Q_OBJECT
+
+public:
+    echoClient(QObject *parent = 0);
+    ~echoClient();
+
+public slots:
+    void messageReceived(const QXmppMessage&);
+};
+
+#endif // ECHOCLIENT_H
diff --git a/example/example_1_echoClient/example_1_echoClient.pro b/example/example_1_echoClient/example_1_echoClient.pro
index 562cf273..f0555e46 100644
--- a/example/example_1_echoClient/example_1_echoClient.pro
+++ b/example/example_1_echoClient/example_1_echoClient.pro
@@ -1,21 +1,21 @@
-TEMPLATE = app

-

-TARGET = example_1_echoClient

-

-SOURCES +=  main.cpp \

-            echoClient.cpp

-

-HEADERS +=  echoClient.h

-

-INCLUDEPATH += ../../source

-

-QT += network xml

-CONFIG += console debug_and_release

-

-CONFIG(debug, debug|release) {

-    LIBS += -L../../source/debug -lQXmppClient_d

- } else {

-    LIBS += -L../../source/release -lQXmppClient

- }

-

-OTHER_FILES += README

+TEMPLATE = app
+
+TARGET = example_1_echoClient
+
+SOURCES +=  main.cpp \
+            echoClient.cpp
+
+HEADERS +=  echoClient.h
+
+INCLUDEPATH += ../../source
+
+QT += network xml
+CONFIG += console debug_and_release
+
+CONFIG(debug, debug|release) {
+    LIBS += -L../../source/debug -lQXmppClient_d
+ } else {
+    LIBS += -L../../source/release -lQXmppClient
+ }
+
+OTHER_FILES += README
diff --git a/example/example_1_echoClient/main.cpp b/example/example_1_echoClient/main.cpp
index 8c56e412..0cbfae17 100644
--- a/example/example_1_echoClient/main.cpp
+++ b/example/example_1_echoClient/main.cpp
@@ -1,38 +1,38 @@
-/*

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

- *

- */

-

-

-#include <QtCore/QCoreApplication>

-#include "echoClient.h"

-#include "QXmppLogger.h"

-

-int main(int argc, char *argv[])

-{

-    QCoreApplication a(argc, argv);

-    

-    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::STDOUT);

-

-    echoClient client;

-    client.connectToServer("talk.google.com", "qxmpp.test1", "qxmpp123", "gmail.com");

-    return a.exec();

-}

+/*
+ * 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.
+ *
+ */
+
+
+#include <QtCore/QCoreApplication>
+#include "echoClient.h"
+#include "QXmppLogger.h"
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+    
+    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::STDOUT);
+
+    echoClient client;
+    client.connectToServer("talk.google.com", "qxmpp.test1", "qxmpp123", "gmail.com");
+    return a.exec();
+}