merge examples 3 and 4

10 files changed, 1 insertions, 184 deletions

diff --git a/example/example.pro b/example/example.pro
index 7f83277f..e6b3e1ba 100644
--- a/example/example.pro
+++ b/example/example.pro
@@ -3,8 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS = example_0_connected\
           example_1_echoClient\
           example_2_rosterHandling\
-          example_3_ibbTransferSource\
-          example_4_ibbTransferTarget\
+          example_3_transferHandling\
           example_5_rpcInterface\
           example_6_rpcClient\
           example_7_archiveHandling
diff --git a/example/example_3_ibbTransferSource/example_3_ibbTransferSource.pro b/example/example_3_transferHandling/example_3_ibbTransferSource.pro
index 72aca2c3..72aca2c3 100644
--- a/example/example_3_ibbTransferSource/example_3_ibbTransferSource.pro
+++ b/example/example_3_transferHandling/example_3_ibbTransferSource.pro
diff --git a/example/example_3_ibbTransferSource/ibbClient.cpp b/example/example_3_transferHandling/ibbClient.cpp
index cfd78a42..cfd78a42 100644
--- a/example/example_3_ibbTransferSource/ibbClient.cpp
+++ b/example/example_3_transferHandling/ibbClient.cpp
diff --git a/example/example_3_ibbTransferSource/ibbClient.h b/example/example_3_transferHandling/ibbClient.h
index 5589aa6b..5589aa6b 100644
--- a/example/example_3_ibbTransferSource/ibbClient.h
+++ b/example/example_3_transferHandling/ibbClient.h
diff --git a/example/example_3_ibbTransferSource/main.cpp b/example/example_3_transferHandling/main.cpp
index 17dc7d10..17dc7d10 100644
--- a/example/example_3_ibbTransferSource/main.cpp
+++ b/example/example_3_transferHandling/main.cpp
diff --git a/example/example_4_ibbTransferTarget/README b/example/example_4_ibbTransferTarget/README
deleted file mode 100644
index 4c3ac681..00000000
--- a/example/example_4_ibbTransferTarget/README
+++ /dev/null
@@ -1,5 +0,0 @@
-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_4_ibbTransferTarget/example_4_ibbTransferTarget.pro b/example/example_4_ibbTransferTarget/example_4_ibbTransferTarget.pro
deleted file mode 100644
index 8111fb94..00000000
--- a/example/example_4_ibbTransferTarget/example_4_ibbTransferTarget.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-include(../example.pri)
-
-TARGET = example_4_ibbTransferTarget
-
-SOURCES +=  main.cpp \
-            ibbTransferTarget.cpp
-
-HEADERS +=  ibbTransferTarget.h
-
-OTHER_FILES += README
diff --git a/example/example_4_ibbTransferTarget/ibbTransferTarget.cpp b/example/example_4_ibbTransferTarget/ibbTransferTarget.cpp
deleted file mode 100644
index b70dcd85..00000000
--- a/example/example_4_ibbTransferTarget/ibbTransferTarget.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008-2010 QXmpp Developers
- *
- * Authors:
- *	Ian Reinhart Geiser
- *  Jeremy Lainé
- *
- * 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 <QBuffer>
-#include <QDebug>
-
-#include "QXmppMessage.h"
-
-#include "ibbTransferTarget.h"
-
-IbbTransferTarget::IbbTransferTarget(QObject *parent)
-    : QXmppClient(parent)
-{
-    m_buffer = new QBuffer(this);
-
-    bool check = connect(&transferManager(), SIGNAL(fileReceived(QXmppTransferJob*)),
-                    this, SLOT(slotFileReceived(QXmppTransferJob*)));
-    Q_ASSERT(check);
-    Q_UNUSED(check);
-
-    transferManager().setSupportedMethods(QXmppTransferJob::InBandMethod);
-}
-
-IbbTransferTarget::~IbbTransferTarget()
-{
-}
-
-void IbbTransferTarget::slotFileReceived(QXmppTransferJob *job)
-{
-    qDebug() << "Got transfer request from:" << job->jid();
-
-    bool check = connect(job, SIGNAL(error(QXmppTransferJob::Error)), this, SLOT(slotError(QXmppTransferJob::Error)));
-    Q_ASSERT(check);
-
-    check = connect(job, SIGNAL(finished()), this, SLOT(slotFinished()));
-    Q_ASSERT(check);
-
-    check = connect(job, SIGNAL(progress(qint64,qint64)), this, SLOT(slotProgress(qint64,qint64)));
-    Q_ASSERT(check);
-
-    m_buffer->open(QIODevice::WriteOnly);
-    job->accept(m_buffer);
-}
-
-void IbbTransferTarget::slotError(QXmppTransferJob::Error error)
-{
-    qDebug() << "Transmission failed:" << error;
-}
-
-void IbbTransferTarget::slotFinished()
-{
-    qDebug() << "Transfer finished:" << m_buffer->data();
-}
-
-void IbbTransferTarget::slotProgress(qint64 done, qint64 total)
-{
-     qDebug() << "Transfer progress:" << done << "/" << total;
-}
diff --git a/example/example_4_ibbTransferTarget/ibbTransferTarget.h b/example/example_4_ibbTransferTarget/ibbTransferTarget.h
deleted file mode 100644
index 6e6450b2..00000000
--- a/example/example_4_ibbTransferTarget/ibbTransferTarget.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2008-2009 QXmpp Developers
- *
- * Author:
- *	Ian Reinhart Geiser
- *
- * 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 IBBTRANSFERTARGET_H
-#define IBBTRANSFERTARGET_H
-
-#include "QXmppClient.h"
-#include "QXmppTransferManager.h"
-
-class QBuffer;
-class IbbTransferTarget : public QXmppClient
-{
-    Q_OBJECT
-
-public:
-    IbbTransferTarget(QObject *parent = 0);
-    ~IbbTransferTarget();
-
-public slots:
-    void slotError(QXmppTransferJob::Error error);
-    void slotFileReceived(QXmppTransferJob *job);
-    void slotFinished();
-    void slotProgress(qint64 done, qint64 total);
-private:
-    QBuffer *m_buffer;
-};
-
-#endif // IBBTRANSFERTARGET_H
diff --git a/example/example_4_ibbTransferTarget/main.cpp b/example/example_4_ibbTransferTarget/main.cpp
deleted file mode 100644
index 927c3fe5..00000000
--- a/example/example_4_ibbTransferTarget/main.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2008-2009 QXmpp Developers
- *
- * Author:
- *	Ian Reinhart Geiser
- *
- * 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 "ibbTransferTarget.h"
-#include "QXmppLogger.h"
-
-int main(int argc, char *argv[])
-{
-    QCoreApplication a(argc, argv);
-    
-    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::StdoutLogging);
-
-    IbbTransferTarget client;
-    client.getConfiguration().setUseSASLAuthentication( false );
-    client.connectToServer("jabber.geiseri.com", "client", "Passw0rd", "geiseri.com");
-    return a.exec();
-}