From 239b2b15c3cfd9e4d7cc085ed31645d6ae6942ee Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Mon, 26 Oct 2009 17:01:09 +0000 Subject: 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 --- example/example_0_connected/README | 10 +-- .../example_0_connected/example_0_connected.pro | 38 ++++----- example/example_0_connected/main.cpp | 94 +++++++++++----------- 3 files changed, 71 insertions(+), 71 deletions(-) (limited to 'example/example_0_connected') 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 - -#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 + +#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(); +} -- cgit v1.2.3