Enable Bluetooth examples

Change-Id: Ifa01f167a576f167be5b0388e736c95c219a00f2
Reviewed-by: Alex <alex.blasche@nokia.com>

4 files changed, 23 insertions, 27 deletions

diff --git a/examples/bttennis/bttennis.pro b/examples/bttennis/bttennis.pro
index 85a93c95..39e33dcf 100644
--- a/examples/bttennis/bttennis.pro
+++ b/examples/bttennis/bttennis.pro
@@ -1,14 +1,8 @@
+TEMPLATE = app
 TARGET = bttennis
 
-INCLUDEPATH += \
-    ../../src/connectivity/bluetooth \
-    ../../src/connectivity/nfc
-
-DEPENDPATH += \
-    ../../src/connectivity/bluetooth \
-    ../../src/connectivity/nfc
-
-QT += concurrent bluetooth nfc widgets
+QT += concurrent bluetooth widgets
+#QT += nfc
 
 SOURCES = \
     main.cpp \
@@ -17,8 +11,8 @@ SOURCES = \
     controller.cpp \
     tennisserver.cpp \
     tennisclient.cpp \
-    tennisview.cpp \
-    handover.cpp
+    tennisview.cpp
+#    handover.cpp
 
 HEADERS = \
     board.h \
@@ -26,8 +20,8 @@ HEADERS = \
     controller.h \
     tennisserver.h \
     tennisclient.h \
-    tennisview.h \
-    handover.h
+    tennisview.h
+#    handover.h
 
 FORMS = \
     tennis.ui
diff --git a/examples/bttennis/tennis.cpp b/examples/bttennis/tennis.cpp
index eb012f9a..1501d7a8 100644
--- a/examples/bttennis/tennis.cpp
+++ b/examples/bttennis/tennis.cpp
@@ -53,7 +53,7 @@
 
 #include "tennisserver.h"
 #include "tennisclient.h"
-#include "handover.h"
+//#include "handover.h"
 
 #include <qbluetooth.h>
 #include <qbluetoothdeviceinfo.h>
@@ -61,13 +61,13 @@
 #include <qbluetoothservicediscoveryagent.h>
 #include <qbluetoothlocaldevice.h>
 
-#include <qnearfieldmanager.h>
-#include <qllcpserver.h>
-#include <qllcpsocket.h>
+//#include <qnearfieldmanager.h>
+//#include <qllcpserver.h>
+//#include <qllcpsocket.h>
 
 Tennis::Tennis(QWidget *parent)
 : QDialog(parent), ui(new Ui_Tennis), board(new Board), controller(new Controller), socket(0),
-  m_discoveryAgent(new QBluetoothServiceDiscoveryAgent), m_handover(0)
+  m_discoveryAgent(new QBluetoothServiceDiscoveryAgent)//, m_handover(0)
 {
     // start Bluetooth if not started
     QBluetoothLocalDevice *device = new QBluetoothLocalDevice();
@@ -139,7 +139,7 @@ Tennis::Tennis(QWidget *parent)
 //    ui->pongView->setBackgroundBrush(QBrush(Qt::white));
     ui->pongView->setCacheMode(QGraphicsView::CacheBackground);
 
-    QNearFieldManager nearFieldManager;
+/*    QNearFieldManager nearFieldManager;
     if (nearFieldManager.isAvailable()) {
         m_handover = new Handover(server->serverPort(), this);
         connect(m_handover, SIGNAL(bluetoothServiceChanged()), this, SLOT(nearFieldHandover()));
@@ -147,7 +147,7 @@ Tennis::Tennis(QWidget *parent)
         connect(m_discoveryAgent, SIGNAL(serviceDiscovered(QBluetoothServiceInfo)),
                 this, SLOT(serviceDiscovered(QBluetoothServiceInfo)));
         connect(m_discoveryAgent, SIGNAL(finished()), this, SLOT(discoveryFinished()));
-    }
+    }*/
 
 
     m_discoveryAgent->setUuidFilter(QBluetoothUuid(serviceUuid));
@@ -188,9 +188,9 @@ Tennis::Tennis(QWidget *parent)
         service.setDevice(device);
         client->startClient(service);
         board->setStatus("Connecting", 100, 25);
-    } else if (nearFieldManager.isAvailable()) {
+    } /*else if (nearFieldManager.isAvailable()) {
         board->setStatus(tr("Touch to play"), 100, 25);
-    }
+    }*/
 
     setEnabled(true);
 
@@ -394,7 +394,7 @@ void Tennis::lagReport(int ms)
     }
 }
 
-void Tennis::nearFieldHandover()
+/*void Tennis::nearFieldHandover()
 {
     qDebug() << "Connecting to NFC provided address" << m_handover->bluetoothAddress().toString();
 
@@ -415,7 +415,7 @@ void Tennis::nearFieldHandover()
 
     client->startClient(service);
     board->setStatus(tr("Connecting: %1 %2").arg(m_handover->bluetoothAddress().toString()).arg(m_handover->serverPort()), 100, 25);
-}
+}*/
 
 void Tennis::fps(const QString &f)
 {
diff --git a/examples/bttennis/tennis.h b/examples/bttennis/tennis.h
index 1664497a..0e86d488 100644
--- a/examples/bttennis/tennis.h
+++ b/examples/bttennis/tennis.h
@@ -65,7 +65,7 @@ static const QLatin1String serviceUuid("e8e10f95-1a70-4b27-9ccf-02010264e9c9");
 
 class TennisServer;
 class TennisClient;
-class Handover;
+//class Handover;
 
 //! [declaration]
 class Tennis : public QDialog
@@ -105,7 +105,7 @@ private slots:
 
     void lagReport(int ms);
 
-    void nearFieldHandover();
+//    void nearFieldHandover();
 
     void fps(const QString &f);
 
@@ -135,6 +135,6 @@ private:
     QPropertyAnimation *paddleAnimation;
 
     QBluetoothServiceDiscoveryAgent *m_discoveryAgent;
-    Handover *m_handover;
+//    Handover *m_handover;
 };
 //! [declaration]
diff --git a/examples/bttennis/tennisclient.h b/examples/bttennis/tennisclient.h
index 2bbd871d..430e8882 100644
--- a/examples/bttennis/tennisclient.h
+++ b/examples/bttennis/tennisclient.h
@@ -53,7 +53,9 @@ QTBLUETOOTH_BEGIN_NAMESPACE
 class QBluetoothSocket;
 QTBLUETOOTH_END_NAMESPACE
 
+QT_BEGIN_NAMESPACE
 class QDataStream;
+QT_END_NAMESPACE
 
 QTBLUETOOTH_USE_NAMESPACE