summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-01-08 16:50:54 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-08 17:39:09 +0100
commit49f098f6481213ca05b453e0acfd0102cd1a71f4 (patch)
treeeea93ca3ea26e4d022ea0ca8694aaed446406e39 /src
parentbbbaa123f63f675762309f4c7fe1bb2256670fd9 (diff)
BlackBerry: Fix compilation
qBBBluetoothDebug was removed by 94f862e2 Change-Id: I85eca3bfbec2190f8a7413ec708d5bf99bc6998a Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Diffstat (limited to 'src')
-rw-r--r--src/bluetooth/qbluetoothlocaldevice_qnx.cpp6
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp10
2 files changed, 8 insertions, 8 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
index 1bfbe530..d0236b6a 100644
--- a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
@@ -102,7 +102,7 @@ QList<QBluetoothAddress> QBluetoothLocalDevice::connectedDevices() const
QDir bluetoothDevices(QStringLiteral("/pps/services/bluetooth/remote_devices/"));
QStringList allFiles = bluetoothDevices.entryList(QDir::NoDotAndDotDot| QDir::Files);
for (int i = 0; i < allFiles.size(); i++) {
- qBBBluetoothDebug() << allFiles.at(i);
+ qCDebug(QT_BT_QNX) << allFiles.at(i);
int fileId;
const char *filePath = QByteArray("/pps/services/bluetooth/remote_devices/").append(allFiles.at(i).toUtf8().constData()).constData();
if ((fileId = qt_safe_open(filePath, O_RDONLY)) == -1)
@@ -126,9 +126,9 @@ QList<QBluetoothAddress> QBluetoothLocalDevice::connectedDevices() const
devices.append(deviceAddr);
}
else if ( a == PPS_DECODER_BAD_TYPE)
- qBBBluetoothDebug() << "Type missmatch";
+ qCDebug(QT_BT_QNX) << "Type missmatch";
else
- qBBBluetoothDebug() << "An unknown error occurred while checking connected status.";
+ qCDebug(QT_BT_QNX) << "An unknown error occurred while checking connected status.";
pps_decoder_cleanup(&ppsDecoder);
}
}
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
index 877d495b..0e4b8e7d 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
@@ -67,12 +67,12 @@ void QBluetoothServiceDiscoveryAgentPrivate::deviceServicesDiscoveryCallback(bt_
qCWarning(QT_BT_QNX) << "Error received in callback: " << errno << strerror(errno);
QPointer<QBluetoothServiceDiscoveryAgentPrivate> *classPointer = static_cast<QPointer<QBluetoothServiceDiscoveryAgentPrivate> *>(user_data);
if (classPointer->isNull()) {
- qBBBluetoothDebug() << "Pointer received in callback is null";
+ qCDebug(QT_BT_QNX) << "Pointer received in callback is null";
return;
}
QBluetoothServiceDiscoveryAgentPrivate *p = classPointer->data();
if ( result == 0) {
- qBBBluetoothDebug() << "Result received in callback is null.";
+ qCDebug(QT_BT_QNX) << "Result received in callback is null.";
p->errorString = QBluetoothServiceDiscoveryAgent::tr("Result received in callback is null.");
p->error = QBluetoothServiceDiscoveryAgent::InputOutputError;
p->q_ptr->error(p->error);
@@ -99,14 +99,14 @@ void QBluetoothServiceDiscoveryAgentPrivate::deviceServicesDiscoveryCallback(bt_
protocolDescriptorList << QVariant::fromValue(QString::fromLatin1(protoc.parm[k]));
}
serviceInfo.setAttribute(QBluetoothServiceInfo::ProtocolDescriptorList, protocolDescriptorList);
- qBBBluetoothDebug() << "Service name " << rec.name << " Description: " << rec.description << "uuid " << rec.serviceId << "provider: " << rec.provider;
- qBBBluetoothDebug() << "num protocol " << rec.num_protocol << "record handle " << rec.record_handle << "class id" << rec.num_classId << "availability " << rec.availability << rec.num_language;
+ qCDebug(QT_BT_QNX) << "Service name " << rec.name << " Description: " << rec.description << "uuid " << rec.serviceId << "provider: " << rec.provider;
+ qCDebug(QT_BT_QNX) << "num protocol " << rec.num_protocol << "record handle " << rec.record_handle << "class id" << rec.num_classId << "availability " << rec.availability << rec.num_language;
QList<QBluetoothUuid> serviceClassId;
for (int j = 0; j < rec.num_classId; j++) {
bt_sdp_class_t uuid = rec.classId[j];
- qBBBluetoothDebug() << "uuid: " << uuid.uuid;
+ qCDebug(QT_BT_QNX) << "uuid: " << uuid.uuid;
QString protocolUuid(uuid.uuid);
protocolUuid = QStringLiteral("0x") + protocolUuid;
QBluetoothUuid Uuid(protocolUuid.toUShort(0,0));