revert

3 files changed, 9 insertions, 83 deletions

diff --git a/examples/example_0_connected/example_0_connected.pro b/examples/example_0_connected/example_0_connected.pro
index 55a21aa1..86578b54 100644
--- a/examples/example_0_connected/example_0_connected.pro
+++ b/examples/example_0_connected/example_0_connected.pro
@@ -2,7 +2,6 @@ include(../examples.pri)
 
 TARGET = example_0_connected
 
-HEADERS += main.h
 SOURCES += main.cpp
 
 OTHER_FILES += README
diff --git a/examples/example_0_connected/main.cpp b/examples/example_0_connected/main.cpp
index 7bfeb19d..fee52c51 100644
--- a/examples/example_0_connected/main.cpp
+++ b/examples/example_0_connected/main.cpp
@@ -1,9 +1,8 @@
 /*
  * Copyright (C) 2008-2010 The QXmpp developers
  *
- * Authors:
+ * Author:
  *	Manjeet Dahiya
- *	Jeremy Lainé
  *
  * Source:
  *	http://code.google.com/p/qxmpp
@@ -23,51 +22,22 @@
  */
 
 
-#include <QApplication>
-#include <QDialogButtonBox>
-#include <QLayout>
-#include <QTextBrowser>
+#include <QtCore/QCoreApplication>
 
 #include "QXmppClient.h"
 #include "QXmppLogger.h"
-#include "main.h"
-
-LogViewer::LogViewer()
-{
-    QVBoxLayout *vbox = new QVBoxLayout;
-    vbox->setMargin(0);
-
-    m_browser = new QTextBrowser;
-    vbox->addWidget(m_browser);
-
-    QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok);
-    connect(buttons, SIGNAL(accepted()), qApp, SLOT(quit()));
-    vbox->addWidget(buttons);
-
-    setLayout(vbox);
-}
-
-void LogViewer::log(QXmppLogger::MessageType type, const QString& msg)
-{
-    m_browser->append(msg);
-}
 
 int main(int argc, char *argv[])
 {
-    QApplication a(argc, argv);
-  
-    // Set up logging 
-    QXmppLogger *logger = QXmppLogger::getLogger();
-    logger->setLoggingType(QXmppLogger::SignalLogging);
-
-    LogViewer viewer;
-    QObject::connect(logger, SIGNAL(message(QXmppLogger::MessageType,QString)),
-            &viewer, SLOT(log(QXmppLogger::MessageType,QString)));
-    viewer.show();
-
-    // Connect to server
+    QCoreApplication a(argc, argv);
+    
+    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::StdoutLogging);
     QXmppClient client;
+
+    // For jabber
     // client.connectToServer("username@jabber.org", "passwd");
+
+    // For google talk
     client.connectToServer("qxmpp.test1@gmail.com", "qxmpp123");
 
     return a.exec();
diff --git a/examples/example_0_connected/main.h b/examples/example_0_connected/main.h
deleted file mode 100644
index fb14b78d..00000000
--- a/examples/example_0_connected/main.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2008-2010 The QXmpp developers
- *
- * Authors:
- *	Manjeet Dahiya
- *	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 <QDialog>
-#include "QXmppLogger.h"
-
-class QTextBrowser;
-
-class LogViewer : public QDialog
-{
-    Q_OBJECT
-
-public:
-    LogViewer();
-
-private slots:
-    void log(QXmppLogger::MessageType type, const QString& text);
-
-private:
-    QTextBrowser *m_browser;
-};
-