diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-17 19:04:41 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-20 09:26:30 +0100 |
commit | b4a5e7d3c3efddff23022acdb42485ad534553eb (patch) | |
tree | 6d72eac87ecc12b9fad6c696735c80264c8b42e9 /src/bluetooth | |
parent | a58f38f1c1ec41d5b886cca6486bf738f71253d1 (diff) |
whitespace fixes
remove trailing whitespace, expand tab
Change-Id: I3361c6c431231c7463bb1dc9b53268935b22a72b
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth')
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp | 4 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothdeviceinfo.h | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothlocaldevice.h | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_bluez.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothsocket.h | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothsocket_bluez.cpp | 8 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothtransfermanager.h | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothtransferreply_bluez.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothtransferrequest.h | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp index cce27dc5..40ee7024 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp @@ -163,7 +163,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &addres { const QBluetoothAddress btAddress(address); const QString btName = dict.value(QLatin1String("Name")).toString(); - quint32 btClass = dict.value(QLatin1String("Class")).toUInt(); + quint32 btClass = dict.value(QLatin1String("Class")).toUInt(); qCDebug(QT_BT_BLUEZ) << "Discovered: " << address << btName << "Num UUIDs" << dict.value(QLatin1String("UUIDs")).toStringList().count() @@ -202,7 +202,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &addres void QBluetoothDeviceDiscoveryAgentPrivate::_q_propertyChanged(const QString &name, const QDBusVariant &value) -{ +{ qCDebug(QT_BT_BLUEZ) << Q_FUNC_INFO << name << value.variant(); if (name == QLatin1String("Discovering") && !value.variant().toBool()) { diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp index 2c667607..72a3e853 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp @@ -85,7 +85,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &addres void QBluetoothDeviceDiscoveryAgentPrivate::_q_propertyChanged(const QString &name, const QDBusVariant &value) -{ +{ Q_UNUSED(name); Q_UNUSED(value); } diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index ee8be191..be605f8d 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.h +++ b/src/bluetooth/qbluetoothdeviceinfo.h @@ -142,7 +142,7 @@ public: enum MinorImagingClass { UncategorizedImagingDevice = 0, ImageDisplay = 0x04, - ImageCamera = 0x08, + ImageCamera = 0x08, ImageScanner = 0x10, ImagePrinter = 0x20 }; diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h index 33010e9c..caf2f050 100644 --- a/src/bluetooth/qbluetoothlocaldevice.h +++ b/src/bluetooth/qbluetoothlocaldevice.h @@ -68,7 +68,7 @@ public: AuthorizedPaired }; - enum HostMode { + enum HostMode { HostPoweredOff, HostConnectable, HostDiscoverable, diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp index a0c05a5c..8f15dc80 100644 --- a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp @@ -73,7 +73,7 @@ QBluetoothLocalDevice::QBluetoothLocalDevice(const QBluetoothAddress &address, Q } QString QBluetoothLocalDevice::name() const -{ +{ if (!d_ptr || !d_ptr->adapter) return QString(); diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp index 8f969ef6..0d50628c 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp @@ -70,7 +70,7 @@ QBluetoothServiceDiscoveryAgentPrivate::~QBluetoothServiceDiscoveryAgentPrivate( void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &address) { - Q_Q(QBluetoothServiceDiscoveryAgent); + Q_Q(QBluetoothServiceDiscoveryAgent); qCDebug(QT_BT_BLUEZ) << "Full discovery on: " << address.toString(); diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index cc580d0b..5a21d551 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -58,7 +58,7 @@ class QBluetoothServiceInfo; class Q_BLUETOOTH_EXPORT QBluetoothSocket : public QIODevice { - Q_OBJECT + Q_OBJECT Q_DECLARE_PRIVATE(QBluetoothSocket) friend class QBluetoothServer; diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index a3048546..58662d5b 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -117,7 +117,7 @@ bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothServiceInfo::Protocol Q_Q(QBluetoothSocket); readNotifier = new QSocketNotifier(socket, QSocketNotifier::Read); QObject::connect(readNotifier, SIGNAL(activated(int)), q, SLOT(_q_readNotify())); - connectWriteNotifier = new QSocketNotifier(socket, QSocketNotifier::Write, q); + connectWriteNotifier = new QSocketNotifier(socket, QSocketNotifier::Write, q); QObject::connect(connectWriteNotifier, SIGNAL(activated(int)), q, SLOT(_q_writeNotify())); connectWriteNotifier->setEnabled(false); @@ -215,7 +215,7 @@ void QBluetoothSocketPrivate::_q_writeNotify() connectWriteNotifier->setEnabled(false); this->close(); } - } + } } // TODO: move to private backend? @@ -238,7 +238,7 @@ void QBluetoothSocketPrivate::_q_readNotify() emit q->error(QBluetoothSocket::UnknownSocketError); q->disconnectFromService(); - q->setSocketState(QBluetoothSocket::UnconnectedState); + q->setSocketState(QBluetoothSocket::UnconnectedState); } else { buffer.chop(QPRIVATELINEARBUFFER_BUFFERSIZE - (readFromDevice < 0 ? 0 : readFromDevice)); @@ -467,7 +467,7 @@ qint64 QBluetoothSocketPrivate::writeData(const char *data, qint64 maxSize) return 0; if(txBuffer.size() == 0) { - connectWriteNotifier->setEnabled(true); + connectWriteNotifier->setEnabled(true); QMetaObject::invokeMethod(q, "_q_writeNotify", Qt::QueuedConnection); } diff --git a/src/bluetooth/qbluetoothtransfermanager.h b/src/bluetooth/qbluetoothtransfermanager.h index 520e0d73..501a40a0 100644 --- a/src/bluetooth/qbluetoothtransfermanager.h +++ b/src/bluetooth/qbluetoothtransfermanager.h @@ -63,7 +63,7 @@ public: explicit QBluetoothTransferManager(QObject *parent = 0); ~QBluetoothTransferManager(); - QBluetoothTransferReply *put(const QBluetoothTransferRequest &request, QIODevice *data); + QBluetoothTransferReply *put(const QBluetoothTransferRequest &request, QIODevice *data); Q_SIGNALS: void finished(QBluetoothTransferReply *reply); diff --git a/src/bluetooth/qbluetoothtransferreply_bluez.cpp b/src/bluetooth/qbluetoothtransferreply_bluez.cpp index 19be6d48..891fb012 100644 --- a/src/bluetooth/qbluetoothtransferreply_bluez.cpp +++ b/src/bluetooth/qbluetoothtransferreply_bluez.cpp @@ -128,7 +128,7 @@ bool QBluetoothTransferReplyBluez::start() QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection, Q_ARG(QBluetoothTransferReply*, this)); return false; } - m_size = file->size(); + m_size = file->size(); startOPP(file->fileName()); } return true; diff --git a/src/bluetooth/qbluetoothtransferrequest.h b/src/bluetooth/qbluetoothtransferrequest.h index 072d330f..b91429a0 100644 --- a/src/bluetooth/qbluetoothtransferrequest.h +++ b/src/bluetooth/qbluetoothtransferrequest.h @@ -72,7 +72,7 @@ public: void setAttribute(Attribute code, const QVariant &value); QBluetoothAddress address() const; - + bool operator!=(const QBluetoothTransferRequest &other) const; QBluetoothTransferRequest &operator=(const QBluetoothTransferRequest &other); bool operator==(const QBluetoothTransferRequest &other) const; |