Merge remote-tracking branch 'gerrit/dev' into btlebtle

Change-Id: Id7698ec157a4e06296bcc27d48aaa8325dd3c23a

1 files changed, 0 insertions, 171 deletions

diff --git a/src/bluetooth/qbluetoothsocket_p.cpp b/src/bluetooth/qbluetoothsocket_p.cpp
deleted file mode 100644
index 39d483d6..00000000
--- a/src/bluetooth/qbluetoothsocket_p.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtBluetooth module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qbluetoothsocket.h"
-#include "qbluetoothsocket_p.h"
-#ifndef QT_IOS_BLUETOOTH
-#include "dummy/dummy_helper_p.h"
-#endif
-
-QT_BEGIN_NAMESPACE
-
-QBluetoothSocketPrivate::QBluetoothSocketPrivate()
-    : socket(-1),
-      socketType(QBluetoothServiceInfo::UnknownProtocol),
-      state(QBluetoothSocket::UnconnectedState),
-      socketError(QBluetoothSocket::NoSocketError),
-      secFlags(QBluetooth::NoSecurity)
-{
-#ifndef QT_IOS_BLUETOOTH
-    printDummyWarning();
-#endif
-}
-
-QBluetoothSocketPrivate::~QBluetoothSocketPrivate()
-{
-}
-
-bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothServiceInfo::Protocol type)
-{
-    socketType = type;
-    return false;
-}
-
-void QBluetoothSocketPrivate::connectToService(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode)
-{
-    Q_UNUSED(openMode);
-    Q_UNUSED(address);
-    Q_UNUSED(port);
-}
-
-void QBluetoothSocketPrivate::abort()
-{
-}
-
-QString QBluetoothSocketPrivate::localName() const
-{
-    return QString();
-}
-
-QBluetoothAddress QBluetoothSocketPrivate::localAddress() const
-{
-    return QBluetoothAddress();
-}
-
-quint16 QBluetoothSocketPrivate::localPort() const
-{
-    return 0;
-}
-
-QString QBluetoothSocketPrivate::peerName() const
-{
-    return QString();
-}
-
-QBluetoothAddress QBluetoothSocketPrivate::peerAddress() const
-{
-    return QBluetoothAddress();
-}
-
-quint16 QBluetoothSocketPrivate::peerPort() const
-{
-    return 0;
-}
-
-qint64 QBluetoothSocketPrivate::writeData(const char *data, qint64 maxSize)
-{
-    Q_UNUSED(data);
-    Q_UNUSED(maxSize);
-
-    Q_Q(QBluetoothSocket);
-
-    if (state != QBluetoothSocket::ConnectedState) {
-        errorString = QBluetoothSocket::tr("Cannot write while not connected");
-        q->setSocketError(QBluetoothSocket::OperationError);
-        return -1;
-    }
-    return -1;
-}
-
-qint64 QBluetoothSocketPrivate::readData(char *data, qint64 maxSize)
-{
-    Q_UNUSED(data);
-    Q_UNUSED(maxSize);
-
-    Q_Q(QBluetoothSocket);
-
-    if (state != QBluetoothSocket::ConnectedState) {
-        errorString = QBluetoothSocket::tr("Cannot read while not connected");
-        q->setSocketError(QBluetoothSocket::OperationError);
-        return -1;
-    }
-
-    return -1;
-}
-
-void QBluetoothSocketPrivate::close()
-{
-}
-
-bool QBluetoothSocketPrivate::setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
-                                           QBluetoothSocket::SocketState socketState, QBluetoothSocket::OpenMode openMode)
-{
-    Q_UNUSED(socketDescriptor);
-    Q_UNUSED(socketType)
-    Q_UNUSED(socketState);
-    Q_UNUSED(openMode);
-    return false;
-}
-
-qint64 QBluetoothSocketPrivate::bytesAvailable() const
-{
-    return 0;
-}
-
-bool QBluetoothSocketPrivate::canReadLine() const
-{
-    return false;
-}
-
-qint64 QBluetoothSocketPrivate::bytesToWrite() const
-{
-    return 0;
-}
-
-QT_END_NAMESPACE