Remove LLCP from the public API

QLLCPServer does not work properly yet on BlackBerry so I would want to wait committing to this API till we have a backend that is working properly.

Change-Id: I62cbe9dae00ed47377086e4c8522298b4c9fa5a4
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

18 files changed, 155 insertions, 132 deletions

diff --git a/src/imports/nfc/nfc.pro b/src/imports/nfc/nfc.pro
index bed94d5f..a020f09b 100644
--- a/src/imports/nfc/nfc.pro
+++ b/src/imports/nfc/nfc.pro
@@ -2,7 +2,7 @@ QT = core qml nfc
 
 # Input
 HEADERS += \
-    qdeclarativenearfieldsocket_p.h \
+    #qdeclarativenearfieldsocket_p.h \
     qdeclarativenearfield_p.h \
     qdeclarativendeffilter_p.h \
     qdeclarativendeftextrecord_p.h \
@@ -10,7 +10,7 @@ HEADERS += \
     qdeclarativendefmimerecord_p.h
 
 SOURCES += plugin.cpp \
-    qdeclarativenearfieldsocket.cpp \
+    #qdeclarativenearfieldsocket.cpp \
     qdeclarativenearfield.cpp \
     qdeclarativendeffilter.cpp \
     qdeclarativendeftextrecord.cpp \
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp
index ba254768..dd97e296 100644
--- a/src/imports/nfc/plugin.cpp
+++ b/src/imports/nfc/plugin.cpp
@@ -43,7 +43,7 @@
 #include <QtQml/QQmlExtensionPlugin>
 
 #include "qdeclarativendefrecord.h"
-#include "qdeclarativenearfieldsocket_p.h"
+//#include "qdeclarativenearfieldsocket_p.h"
 #include "qdeclarativenearfield_p.h"
 #include "qdeclarativendeffilter_p.h"
 #include "qdeclarativendeftextrecord_p.h"
@@ -67,7 +67,7 @@ public:
 
         int major = 5;
         int minor = 0;
-        qmlRegisterType<QDeclarativeNearFieldSocket>(uri, major, minor, "NearFieldSocket");
+        //qmlRegisterType<QDeclarativeNearFieldSocket>(uri, major, minor, "NearFieldSocket");
 
         qmlRegisterType<QDeclarativeNearField>(uri, major, minor, "NearField");
         qmlRegisterType<QDeclarativeNdefFilter>(uri, major, minor, "NdefFilter");
diff --git a/src/imports/nfc/qdeclarativenearfieldsocket.cpp b/src/imports/nfc/qdeclarativenearfieldsocket.cpp
index 70b29415..15e59f9b 100644
--- a/src/imports/nfc/qdeclarativenearfieldsocket.cpp
+++ b/src/imports/nfc/qdeclarativenearfieldsocket.cpp
@@ -51,13 +51,12 @@
     \ingroup nfc-qml
     \inqmlmodule QtNfc 5.0
 
-    \sa QLlcpSocket
-    \sa QLlcpServer
-
     The NearFieldSocket type was introduced in \b {QtNfc 5.0}.
 
     The NearFieldSocket type can be used to create a peer-to-peer connection over NFC LLCP
     sockets.  NearfieldSocket can be used for both client and server side sockets.
+
+    \internal
 */
 
 /*!
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro
index fcc4e6a4..1b4d6e24 100644
--- a/src/nfc/nfc.pro
+++ b/src/nfc/nfc.pro
@@ -15,12 +15,12 @@ PUBLIC_HEADERS += \
     qndefmessage.h \
     qndeffilter.h \
     qndefnfcurirecord.h \
-    qllcpsocket.h \
-    qllcpserver.h \
     qdeclarativendefrecord.h \
     qndefnfcsmartposterrecord.h
 
 PRIVATE_HEADERS += \
+    qllcpsocket_p.h \
+    qllcpserver_p.h \
     qndefrecord_p.h \
     qnearfieldtarget_p.h \
     qnearfieldmanager_p.h \
@@ -93,8 +93,8 @@ isEmpty(NFC_BACKEND_AVAILABLE) {
     message("Unsupported NFC platform, will not build a working QtNfc library.")
 
     PRIVATE_HEADERS += \
-        qllcpsocket_p.h \
-        qllcpserver_p.h \
+        qllcpsocket_p_p.h \
+        qllcpserver_p_p.h \
         qnearfieldmanagerimpl_p.h
 
     SOURCES += \
diff --git a/src/nfc/qllcpserver.cpp b/src/nfc/qllcpserver.cpp
index 77215a1a..e7a2982d 100644
--- a/src/nfc/qllcpserver.cpp
+++ b/src/nfc/qllcpserver.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qllcpserver.h"
+#include "qllcpserver_p.h"
 
 #if defined(QT_SIMULATOR)
 #include "qllcpserver_simulator_p.h"
 #elif defined(QNX_NFC)
 #include "qllcpserver_qnx_p.h"
 #else
-#include "qllcpserver_p.h"
+#include "qllcpserver_p_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QLlcpServer
     \brief The QLlcpServer class provides an NFC LLCP socket based server.
+    \internal
 
     \ingroup connectivity-nfc
     \inmodule QtNfc
diff --git a/src/nfc/qllcpserver_p.cpp b/src/nfc/qllcpserver_p.cpp
index 7f2fd638..55d2a866 100644
--- a/src/nfc/qllcpserver_p.cpp
+++ b/src/nfc/qllcpserver_p.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qllcpserver_p.h"
+#include "qllcpserver_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/nfc/qllcpserver_p.h b/src/nfc/qllcpserver_p.h
index 00b4c3ac..5d72f558 100644
--- a/src/nfc/qllcpserver_p.h
+++ b/src/nfc/qllcpserver_p.h
@@ -39,22 +39,37 @@
 **
 ****************************************************************************/
 
-#ifndef QLLCPSERVER_P_H
-#define QLLCPSERVER_P_H
+#ifndef QLLCPSERVER_H
+#define QLLCPSERVER_H
 
-#include "qnfcglobal.h"
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
-#include "qllcpserver.h"
+#include <QtCore/QObject>
+#include <QtNfc/qnfcglobal.h>
+#include "qllcpsocket_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QLlcpServerPrivate 
+class QLlcpServerPrivate;
+
+class Q_NFC_EXPORT QLlcpServer : public QObject
 {
-    Q_DECLARE_PUBLIC(QLlcpServer)
+    Q_OBJECT
+
+    Q_DECLARE_PRIVATE(QLlcpServer)
 
 public:
-    QLlcpServerPrivate(QLlcpServer *q);
-    ~QLlcpServerPrivate();
+    explicit QLlcpServer(QObject *parent = 0);
+    virtual ~QLlcpServer();
 
     bool listen(const QString &serviceUri);
     bool isListening() const;
@@ -64,15 +79,18 @@ public:
     QString serviceUri() const;
     quint8 serverPort() const;
 
-    bool hasPendingConnections() const;
-    QLlcpSocket *nextPendingConnection();
+    virtual bool hasPendingConnections() const;
+    virtual QLlcpSocket *nextPendingConnection();
 
     QLlcpSocket::SocketError serverError() const;
 
+Q_SIGNALS:
+    void newConnection();
+
 private:
-    QLlcpServer *q_ptr;
+    QLlcpServerPrivate *d_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QLLCPSERVER_P_H
+#endif // QLLCPSERVER_H
diff --git a/src/nfc/qllcpserver.h b/src/nfc/qllcpserver_p_p.h
index 5798043e..488cbdfa 100644
--- a/src/nfc/qllcpserver.h
+++ b/src/nfc/qllcpserver_p_p.h
@@ -39,26 +39,22 @@
 **
 ****************************************************************************/
 
-#ifndef QLLCPSERVER_H
-#define QLLCPSERVER_H
+#ifndef QLLCPSERVER_P_H
+#define QLLCPSERVER_P_H
 
-#include <QtCore/QObject>
-#include <QtNfc/qnfcglobal.h>
-#include <QtNfc/QLlcpSocket>
+#include "qnfcglobal.h"
 
-QT_BEGIN_NAMESPACE
+#include "qllcpserver_p.h"
 
-class QLlcpServerPrivate;
+QT_BEGIN_NAMESPACE
 
-class Q_NFC_EXPORT QLlcpServer : public QObject
+class QLlcpServerPrivate
 {
-    Q_OBJECT
-
-    Q_DECLARE_PRIVATE(QLlcpServer)
+    Q_DECLARE_PUBLIC(QLlcpServer)
 
 public:
-    explicit QLlcpServer(QObject *parent = 0);
-    virtual ~QLlcpServer();
+    QLlcpServerPrivate(QLlcpServer *q);
+    ~QLlcpServerPrivate();
 
     bool listen(const QString &serviceUri);
     bool isListening() const;
@@ -68,18 +64,15 @@ public:
     QString serviceUri() const;
     quint8 serverPort() const;
 
-    virtual bool hasPendingConnections() const;
-    virtual QLlcpSocket *nextPendingConnection();
+    bool hasPendingConnections() const;
+    QLlcpSocket *nextPendingConnection();
 
     QLlcpSocket::SocketError serverError() const;
 
-Q_SIGNALS:
-    void newConnection();
-
 private:
-    QLlcpServerPrivate *d_ptr;
+    QLlcpServer *q_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QLLCPSERVER_H
+#endif // QLLCPSERVER_P_H
diff --git a/src/nfc/qllcpserver_qnx_p.h b/src/nfc/qllcpserver_qnx_p.h
index e7764441..21fa5cf0 100644
--- a/src/nfc/qllcpserver_qnx_p.h
+++ b/src/nfc/qllcpserver_qnx_p.h
@@ -42,7 +42,7 @@
 #ifndef QLLCPSERVER_QNX_P_H
 #define QLLCPSERVER_QNX_P_H
 
-#include "qllcpserver.h"
+#include "qllcpserver_p.h"
 #include "nfc/nfc.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/nfc/qllcpserver_simulator_p.h b/src/nfc/qllcpserver_simulator_p.h
index 93590a60..b976deff 100644
--- a/src/nfc/qllcpserver_simulator_p.h
+++ b/src/nfc/qllcpserver_simulator_p.h
@@ -44,7 +44,7 @@
 
 #include <qconnectivityglobal.h>
 
-#include "qllcpserver.h"
+#include "qllcpserver_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/nfc/qllcpsocket.cpp b/src/nfc/qllcpsocket.cpp
index f9cacd24..2bf3e2c3 100644
--- a/src/nfc/qllcpsocket.cpp
+++ b/src/nfc/qllcpsocket.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qllcpsocket.h"
+#include "qllcpsocket_p.h"
 
 #if defined(QT_SIMULATOR)
 #include "qllcpsocket_simulator_p.h"
 #elif defined(QNX_NFC)
 #include "qllcpsocket_qnx_p.h"
 #else
-#include "qllcpsocket_p.h"
+#include "qllcpsocket_p_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QLlcpSocket
     \brief The QLlcpSocket class provides an NFC LLCP socket.
+    \internal
 
     \ingroup connectivity-nfc
     \inmodule QtNfc
diff --git a/src/nfc/qllcpsocket_p.cpp b/src/nfc/qllcpsocket_p.cpp
index 27418d12..4d076b9c 100644
--- a/src/nfc/qllcpsocket_p.cpp
+++ b/src/nfc/qllcpsocket_p.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qllcpsocket_p.h"
+#include "qllcpsocket_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/nfc/qllcpsocket_p.h b/src/nfc/qllcpsocket_p.h
index 7f741f14..6bda57be 100644
--- a/src/nfc/qllcpsocket_p.h
+++ b/src/nfc/qllcpsocket_p.h
@@ -39,27 +39,62 @@
 **
 ****************************************************************************/
 
-#ifndef QLLCPSOCKET_P_H
-#define QLLCPSOCKET_P_H
-
-#include "qnfcglobal.h"
-
-#include "qllcpsocket.h"
+#ifndef QLLCPSOCKET_H
+#define QLLCPSOCKET_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/QIODevice>
+#include <QtNetwork/QAbstractSocket>
+#include <QtNfc/qnfcglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class QLlcpSocketPrivate
+class QNearFieldTarget;
+class QLlcpSocketPrivate;
+
+class Q_NFC_EXPORT QLlcpSocket : public QIODevice
 {
-    Q_DECLARE_PUBLIC(QLlcpSocket)
+    Q_OBJECT
+
+    Q_DECLARE_PRIVATE(QLlcpSocket)
+
+    friend class QLlcpServerPrivate;
 
 public:
-    QLlcpSocketPrivate(QLlcpSocket *q);
+    enum SocketState {
+        UnconnectedState = QAbstractSocket::UnconnectedState,
+        ConnectingState = QAbstractSocket::ConnectingState,
+        ConnectedState = QAbstractSocket::ConnectedState,
+        ClosingState = QAbstractSocket::ClosingState,
+        BoundState = QAbstractSocket::BoundState,
+        ListeningState = QAbstractSocket::ListeningState
+    };
+
+    enum SocketError {
+        UnknownSocketError = QAbstractSocket::UnknownSocketError,
+        RemoteHostClosedError = QAbstractSocket::RemoteHostClosedError,
+        SocketAccessError = QAbstractSocket::SocketAccessError,
+        SocketResourceError = QAbstractSocket::SocketResourceError
+    };
+
+    explicit QLlcpSocket(QObject *parent = 0);
+    ~QLlcpSocket();
 
-    ~QLlcpSocketPrivate();
-    
     void connectToService(QNearFieldTarget *target, const QString &serviceUri);
     void disconnectFromService();
 
+    void close();
+
     bool bind(quint8 port);
 
     bool hasPendingDatagrams() const;
@@ -74,24 +109,34 @@ public:
                          QNearFieldTarget *target, quint8 port);
     qint64 writeDatagram(const QByteArray &datagram, QNearFieldTarget *target, quint8 port);
 
-    QLlcpSocket::SocketError error() const;
-    QLlcpSocket::SocketState state() const;
-
-    qint64 readData(char *data, qint64 maxlen);
-    qint64 writeData(const char *data, qint64 len);
+    SocketError error() const;
+    SocketState state() const;
 
     qint64 bytesAvailable() const;
     bool canReadLine() const;
 
-    bool waitForReadyRead(int msecs);
-    bool waitForBytesWritten(int msecs);
-    bool waitForConnected(int msecs);
-    bool waitForDisconnected(int msecs);
+    bool waitForReadyRead(int msecs = 30000);
+    bool waitForBytesWritten(int msecs = 30000);
+    virtual bool waitForConnected(int msecs = 30000);
+    virtual bool waitForDisconnected(int msecs = 30000);
+    bool isSequential() const;
+
+Q_SIGNALS:
+    void connected();
+    void disconnected();
+    void error(QLlcpSocket::SocketError socketError);
+    void stateChanged(QLlcpSocket::SocketState socketState);
+
+protected:
+    qint64 readData(char *data, qint64 maxlen);
+    qint64 writeData(const char *data, qint64 len);
 
 private:
-    QLlcpSocket *q_ptr;
+    QLlcpSocket(QLlcpSocketPrivate *d, QObject *parent);
+
+    QLlcpSocketPrivate *d_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QLLCPSOCKET_P_H
+#endif // QLLCPSOCKET_H
diff --git a/src/nfc/qllcpsocket.h b/src/nfc/qllcpsocket_p_p.h
index e3f914d8..03787c69 100644
--- a/src/nfc/qllcpsocket.h
+++ b/src/nfc/qllcpsocket_p_p.h
@@ -39,51 +39,27 @@
 **
 ****************************************************************************/
 
-#ifndef QLLCPSOCKET_H
-#define QLLCPSOCKET_H
+#ifndef QLLCPSOCKET_P_H
+#define QLLCPSOCKET_P_H
 
-#include <QtCore/QIODevice>
-#include <QtNetwork/QAbstractSocket>
-#include <QtNfc/qnfcglobal.h>
+#include "qnfcglobal.h"
 
-QT_BEGIN_NAMESPACE
+#include "qllcpsocket_p.h"
 
-class QNearFieldTarget;
-class QLlcpSocketPrivate;
+QT_BEGIN_NAMESPACE
 
-class Q_NFC_EXPORT QLlcpSocket : public QIODevice
+class QLlcpSocketPrivate
 {
-    Q_OBJECT
-
-    Q_DECLARE_PRIVATE(QLlcpSocket)
-
-    friend class QLlcpServerPrivate;
+    Q_DECLARE_PUBLIC(QLlcpSocket)
 
 public:
-    enum SocketState {
-        UnconnectedState = QAbstractSocket::UnconnectedState,
-        ConnectingState = QAbstractSocket::ConnectingState,
-        ConnectedState = QAbstractSocket::ConnectedState,
-        ClosingState = QAbstractSocket::ClosingState,
-        BoundState = QAbstractSocket::BoundState,
-        ListeningState = QAbstractSocket::ListeningState
-    };
-
-    enum SocketError {
-        UnknownSocketError = QAbstractSocket::UnknownSocketError,
-        RemoteHostClosedError = QAbstractSocket::RemoteHostClosedError,
-        SocketAccessError = QAbstractSocket::SocketAccessError,
-        SocketResourceError = QAbstractSocket::SocketResourceError
-    };
-
-    explicit QLlcpSocket(QObject *parent = 0);
-    ~QLlcpSocket();
+    QLlcpSocketPrivate(QLlcpSocket *q);
+
+    ~QLlcpSocketPrivate();
 
     void connectToService(QNearFieldTarget *target, const QString &serviceUri);
     void disconnectFromService();
 
-    void close();
-
     bool bind(quint8 port);
 
     bool hasPendingDatagrams() const;
@@ -98,34 +74,24 @@ public:
                          QNearFieldTarget *target, quint8 port);
     qint64 writeDatagram(const QByteArray &datagram, QNearFieldTarget *target, quint8 port);
 
-    SocketError error() const;
-    SocketState state() const;
+    QLlcpSocket::SocketError error() const;
+    QLlcpSocket::SocketState state() const;
+
+    qint64 readData(char *data, qint64 maxlen);
+    qint64 writeData(const char *data, qint64 len);
 
     qint64 bytesAvailable() const;
     bool canReadLine() const;
 
-    bool waitForReadyRead(int msecs = 30000);
-    bool waitForBytesWritten(int msecs = 30000);
-    virtual bool waitForConnected(int msecs = 30000);
-    virtual bool waitForDisconnected(int msecs = 30000);
-    bool isSequential() const;
-
-Q_SIGNALS:
-    void connected();
-    void disconnected();
-    void error(QLlcpSocket::SocketError socketError);
-    void stateChanged(QLlcpSocket::SocketState socketState);
-
-protected:
-    qint64 readData(char *data, qint64 maxlen);
-    qint64 writeData(const char *data, qint64 len);
+    bool waitForReadyRead(int msecs);
+    bool waitForBytesWritten(int msecs);
+    bool waitForConnected(int msecs);
+    bool waitForDisconnected(int msecs);
 
 private:
-    QLlcpSocket(QLlcpSocketPrivate *d, QObject *parent);
-
-    QLlcpSocketPrivate *d_ptr;
+    QLlcpSocket *q_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif // QLLCPSOCKET_H
+#endif // QLLCPSOCKET_P_H
diff --git a/src/nfc/qllcpsocket_qnx_p.h b/src/nfc/qllcpsocket_qnx_p.h
index fc39b07e..32968695 100644
--- a/src/nfc/qllcpsocket_qnx_p.h
+++ b/src/nfc/qllcpsocket_qnx_p.h
@@ -42,7 +42,7 @@
 #ifndef QLLCPSOCKET_QNX_P_H
 #define QLLCPSOCKET_QNX_P_H
 
-#include "qllcpsocket.h"
+#include "qllcpsocket_p.h"
 
 #include "qnearfieldtarget_qnx_p.h"
 
diff --git a/src/nfc/qllcpsocket_simulator_p.h b/src/nfc/qllcpsocket_simulator_p.h
index 7d29c242..0867c05d 100644
--- a/src/nfc/qllcpsocket_simulator_p.h
+++ b/src/nfc/qllcpsocket_simulator_p.h
@@ -44,7 +44,7 @@
 
 #include <qconnectivityglobal.h>
 
-#include "qllcpsocket.h"
+#include "qllcpsocket_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tests/nfctestserver/servercontroller.h b/tests/nfctestserver/servercontroller.h
index a27ffffe..1104d2a7 100644
--- a/tests/nfctestserver/servercontroller.h
+++ b/tests/nfctestserver/servercontroller.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/QObject>
 
-#include <qllcpserver.h>
+#include <qllcpserver_p.h>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/nfctestserver/socketcontroller.h b/tests/nfctestserver/socketcontroller.h
index cbfc4109..04583547 100644
--- a/tests/nfctestserver/socketcontroller.h
+++ b/tests/nfctestserver/socketcontroller.h
@@ -45,7 +45,7 @@
 #include <QtCore/QObject>
 
 #include <qnearfieldmanager.h>
-#include <qllcpsocket.h>
+#include <qllcpsocket_p.h>
 
 QT_USE_NAMESPACE