summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp4
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp2
-rw-r--r--src/bluetooth/qbluetoothdeviceinfo.h2
-rw-r--r--src/bluetooth/qbluetoothlocaldevice.h2
-rw-r--r--src/bluetooth/qbluetoothlocaldevice_bluez.cpp2
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp2
-rw-r--r--src/bluetooth/qbluetoothsocket.h2
-rw-r--r--src/bluetooth/qbluetoothsocket_bluez.cpp8
-rw-r--r--src/bluetooth/qbluetoothtransfermanager.h2
-rw-r--r--src/bluetooth/qbluetoothtransferreply_bluez.cpp2
-rw-r--r--src/bluetooth/qbluetoothtransferrequest.h2
-rw-r--r--src/nfc/qllcpserver_p.cpp2
-rw-r--r--src/nfc/qllcpsocket.cpp2
-rw-r--r--src/nfc/qllcpsocket_p.cpp2
-rw-r--r--tests/btclient/btclient.c12
15 files changed, 24 insertions, 24 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;
diff --git a/src/nfc/qllcpserver_p.cpp b/src/nfc/qllcpserver_p.cpp
index 55d2a866..c22c868a 100644
--- a/src/nfc/qllcpserver_p.cpp
+++ b/src/nfc/qllcpserver_p.cpp
@@ -49,7 +49,7 @@ QLlcpServerPrivate::QLlcpServerPrivate(QLlcpServer *q)
}
QLlcpServerPrivate::~QLlcpServerPrivate()
-{
+{
}
bool QLlcpServerPrivate::listen(const QString &serviceUri)
diff --git a/src/nfc/qllcpsocket.cpp b/src/nfc/qllcpsocket.cpp
index 2bf3e2c3..79cb1284 100644
--- a/src/nfc/qllcpsocket.cpp
+++ b/src/nfc/qllcpsocket.cpp
@@ -231,7 +231,7 @@ qint64 QLlcpSocket::writeDatagram(const char *data, qint64 size)
*/
bool QLlcpSocket::isSequential() const
{
- return true;
+ return true;
}
/*!
diff --git a/src/nfc/qllcpsocket_p.cpp b/src/nfc/qllcpsocket_p.cpp
index 4d076b9c..b1af336f 100644
--- a/src/nfc/qllcpsocket_p.cpp
+++ b/src/nfc/qllcpsocket_p.cpp
@@ -50,7 +50,7 @@ QLlcpSocketPrivate::QLlcpSocketPrivate(QLlcpSocket *q)
QLlcpSocketPrivate::~QLlcpSocketPrivate()
{
-
+
}
void QLlcpSocketPrivate::connectToService(QNearFieldTarget *target, const QString &serviceUri)
diff --git a/tests/btclient/btclient.c b/tests/btclient/btclient.c
index 17c220b0..e6f6f0b0 100644
--- a/tests/btclient/btclient.c
+++ b/tests/btclient/btclient.c
@@ -118,11 +118,11 @@ struct fdlist {
struct fdlist *head = 0;
-void removefd(struct fdlist *fdl, int fd){
+void removefd(struct fdlist *fdl, int fd) {
struct fdlist *prev = fdl;
while(fdl && fdl->fd != fd) {
prev = fdl;
- fdl = fdl->next;
+ fdl = fdl->next;
}
assert(fdl);
@@ -482,7 +482,7 @@ void registerService()
// change path to use any
strcpy(rindex(path, '/'), "/any");
- printf("Using path: %s\n", path);
+ printf("Using path: %s\n", path);
dbus_message_unref(msg);
@@ -538,9 +538,9 @@ void registerService()
int main(int argc, char **argv)
{
- int socket;
+ int socket;
#define MAX_POLL 256
- struct pollfd fds[MAX_POLL];
+ struct pollfd fds[MAX_POLL];
UNUSED(argc);
UNUSED(argv);
@@ -558,7 +558,7 @@ int main(int argc, char **argv)
while(1){
int n = mkpoll(head, fds, MAX_POLL);
- if(poll(fds, n, -1)){
+ if (poll(fds, n, -1)) {
struct fdlist *fdl = head;
int i;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 00:50:21 +0000