From a973c8532e351782abffa8d42cf1e3b491f89722 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Fri, 14 Sep 2012 13:59:23 +0200 Subject: cleanup examples --- .../example_2_rosterHandling.cpp | 87 ++++++++++++++++++++++ .../example_2_rosterHandling.h | 44 +++++++++++ .../example_2_rosterHandling.pro | 5 +- examples/example_2_rosterHandling/main.cpp | 38 ---------- examples/example_2_rosterHandling/xmppClient.cpp | 82 -------------------- examples/example_2_rosterHandling/xmppClient.h | 44 ----------- 6 files changed, 133 insertions(+), 167 deletions(-) create mode 100644 examples/example_2_rosterHandling/example_2_rosterHandling.cpp create mode 100644 examples/example_2_rosterHandling/example_2_rosterHandling.h delete mode 100644 examples/example_2_rosterHandling/main.cpp delete mode 100644 examples/example_2_rosterHandling/xmppClient.cpp delete mode 100644 examples/example_2_rosterHandling/xmppClient.h (limited to 'examples/example_2_rosterHandling') diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.cpp b/examples/example_2_rosterHandling/example_2_rosterHandling.cpp new file mode 100644 index 00000000..2b5709bb --- /dev/null +++ b/examples/example_2_rosterHandling/example_2_rosterHandling.cpp @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2008-2012 The QXmpp developers + * + * 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 "QXmppMessage.h" +#include "QXmppRosterManager.h" + +#include "example_2_rosterHandling.h" + +xmppClient::xmppClient(QObject *parent) + : QXmppClient(parent) +{ + bool check; + Q_UNUSED(check); + + check = connect(this, SIGNAL(connected()), + SLOT(clientConnected())); + Q_ASSERT(check); + + check = connect(&this->rosterManager(), SIGNAL(rosterReceived()), + SLOT(rosterReceived())); + Q_ASSERT(check); + + /// Then QXmppRoster::presenceChanged() is emitted whenever presence of someone + /// in roster changes + check = connect(&this->rosterManager(), SIGNAL(presenceChanged(QString,QString)), + SLOT(presenceChanged(QString,QString))); + Q_ASSERT(check); +} + +xmppClient::~xmppClient() +{ + +} + +void xmppClient::clientConnected() +{ + qDebug("example_2_rosterHandling:: CONNECTED"); +} + +void xmppClient::rosterReceived() +{ + qDebug("example_2_rosterHandling:: Roster received"); + foreach (const QString &bareJid, rosterManager().getRosterBareJids()) { + QString name = rosterManager().getRosterEntry(bareJid).name(); + if(name.isEmpty()) + name = "-"; + qDebug("example_2_rosterHandling:: Roster received: %s [%s]", qPrintable(bareJid), qPrintable(name)); + } +} + +void xmppClient::presenceChanged(const QString& bareJid, + const QString& resource) +{ + qDebug("example_2_rosterHandling:: Presence changed %s/%s", qPrintable(bareJid), qPrintable(resource)); +} + +int main(int argc, char *argv[]) +{ + QCoreApplication app(argc, argv); + + xmppClient client; + client.connectToServer("qxmpp.test1@qxmpp.org", "qxmpp123"); + + return app.exec(); +} diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.h b/examples/example_2_rosterHandling/example_2_rosterHandling.h new file mode 100644 index 00000000..17d04c70 --- /dev/null +++ b/examples/example_2_rosterHandling/example_2_rosterHandling.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008-2012 The QXmpp developers + * + * 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 XMPPCLIENT_H +#define XMPPCLIENT_H + +#include "QXmppClient.h" + +class xmppClient : public QXmppClient +{ + Q_OBJECT + +public: + xmppClient(QObject *parent = 0); + ~xmppClient(); + +public slots: + void clientConnected(); + void rosterReceived(); + void presenceChanged(const QString& bareJid, const QString& resource); +}; + +#endif // XMPPCLIENT_H diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.pro b/examples/example_2_rosterHandling/example_2_rosterHandling.pro index 1098a221..c9c886f9 100644 --- a/examples/example_2_rosterHandling/example_2_rosterHandling.pro +++ b/examples/example_2_rosterHandling/example_2_rosterHandling.pro @@ -2,9 +2,8 @@ include(../examples.pri) TARGET = example_2_rosterHandling -SOURCES += main.cpp \ - xmppClient.cpp +SOURCES += example_2_rosterHandling.cpp -HEADERS += xmppClient.h +HEADERS += example_2_rosterHandling.h OTHER_FILES += README diff --git a/examples/example_2_rosterHandling/main.cpp b/examples/example_2_rosterHandling/main.cpp deleted file mode 100644 index 7223ddc1..00000000 --- a/examples/example_2_rosterHandling/main.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2008-2012 The QXmpp developers - * - * 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 "xmppClient.h" -#include "QXmppLogger.h" - -int main(int argc, char *argv[]) -{ - QCoreApplication a(argc, argv); - - QXmppLogger::getLogger()->setLoggingType(QXmppLogger::FileLogging); - - xmppClient client; - client.connectToServer("qxmpp.test1@gmail.com", "qxmpp123"); - return a.exec(); -} diff --git a/examples/example_2_rosterHandling/xmppClient.cpp b/examples/example_2_rosterHandling/xmppClient.cpp deleted file mode 100644 index 61f1956d..00000000 --- a/examples/example_2_rosterHandling/xmppClient.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2008-2012 The QXmpp developers - * - * 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 "QXmppMessage.h" -#include "QXmppRosterManager.h" - -#include "xmppClient.h" - -xmppClient::xmppClient(QObject *parent) - : QXmppClient(parent) -{ - bool check; - Q_UNUSED(check); - - check = connect(this, SIGNAL(connected()), - SLOT(clientConnected())); - Q_ASSERT(check); - - check = connect(&this->rosterManager(), SIGNAL(rosterReceived()), - SLOT(rosterReceived())); - Q_ASSERT(check); - - /// Then QXmppRoster::presenceChanged() is emitted whenever presence of someone - /// in roster changes - check = connect(&this->rosterManager(), SIGNAL(presenceChanged(QString,QString)), - SLOT(presenceChanged(QString,QString))); - Q_ASSERT(check); -} - -xmppClient::~xmppClient() -{ - -} - -void xmppClient::clientConnected() -{ - std::cout<<"example_2_rosterHandling:: CONNECTED"<