tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle qDDebug/qCWarning categories more consistently

Browse source 
We can always provide a function rather than a value.
This is what we do in most places already and is consistent with the
rest of KDE.
This gets compiled to the same code.

```cpp
explicit QLoggingCategoryMacroHolder(const QLoggingCategory &cat)
{
    if (IsOutputEnabled)
        init(cat);
}
explicit QLoggingCategoryMacroHolder(QMessageLogger::CategoryFunction catfunc)
{
    if (IsOutputEnabled)
        init(catfunc());
}
```
This commit is contained in:
Alexander Lohnau 2023-08-04 17:04:15 +02:00 committed by Albert Vaca Cintora
parent ee2e782748
commit 49a51e2d27
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/backends/bluetooth/bluetoothlinkprovider.cpp
View file

@ -109,7 +109,7 @@ void BluetoothLinkProvider::serviceDiscovered(const QBluetoothServiceInfo &old_i
socket->connectToService(info);
qCDebug(KDECONNECT_CORE()) << "Connecting to" << info.device().address();
qCDebug(KDECONNECT_CORE) << "Connecting to" << info.device().address();
if (socket->error() != QBluetoothSocket::SocketError::NoSocketError) {
qCWarning(KDECONNECT_CORE) << "Socket connection error:" << socket->errorString();
@ -124,10 +124,10 @@ void BluetoothLinkProvider::clientConnected(QPointer<QBluetoothSocket> socket)
auto peer = socket->peerAddress();
qCDebug(KDECONNECT_CORE()) << "Connected to" << peer;
qCDebug(KDECONNECT_CORE) << "Connected to" << peer;
if (mSockets.contains(socket->peerAddress())) {
qCWarning(KDECONNECT_CORE()) << "Duplicate connection to" << peer;
qCWarning(KDECONNECT_CORE) << "Duplicate connection to" << peer;
socket->close();
socket->deleteLater();
return;
@ -177,7 +177,7 @@ void BluetoothLinkProvider::clientIdentityReceived(const QBluetoothAddress &peer
return;
}
qCDebug(KDECONNECT_CORE()) << "Received identity packet from" << peer;
qCDebug(KDECONNECT_CORE) << "Received identity packet from" << peer;
// TODO?
// disconnect(socket, SIGNAL(error(QBluetoothSocket::SocketError)), this, SLOT(connectError()));
@ -212,12 +212,12 @@ void BluetoothLinkProvider::serverNewConnection()
{
QBluetoothSocket *socket = mBluetoothServer->nextPendingConnection();
qCDebug(KDECONNECT_CORE()) << "Received connection from" << socket->peerAddress();
qCDebug(KDECONNECT_CORE) << "Received connection from" << socket->peerAddress();
QBluetoothAddress peer = socket->peerAddress();
if (mSockets.contains(peer)) {
qCDebug(KDECONNECT_CORE()) << "Duplicate connection from" << peer;
qCDebug(KDECONNECT_CORE) << "Duplicate connection from" << peer;
socket->close();
socket->deleteLater();
return;
@ -246,7 +246,7 @@ void BluetoothLinkProvider::serverNewConnection()
myIdentity.set(QStringLiteral("certificate"), QString::fromLatin1(myDeviceInfo.certificate.toPem()));
socket->write(myIdentity.serialize());
qCDebug(KDECONNECT_CORE()) << "Sent identity packet to" << socket->peerAddress();
qCDebug(KDECONNECT_CORE) << "Sent identity packet to" << socket->peerAddress();
}
// I'm the existing device and this is the answer to my identity packet (data received)
@ -275,7 +275,7 @@ void BluetoothLinkProvider::serverDataReceived(const QBluetoothAddress &peer, QS
return;
}
qCDebug(KDECONNECT_CORE()) << "Received identity packet from" << peer;
qCDebug(KDECONNECT_CORE) << "Received identity packet from" << peer;
QSslCertificate receivedCertificate(receivedPacket.get<QString>(QStringLiteral("certificate")).toLatin1());
DeviceInfo deviceInfo = deviceInfo.FromIdentityPacketAndCert(receivedPacket, receivedCertificate);
@ -295,7 +295,7 @@ void BluetoothLinkProvider::onLinkDestroyed(const QString &deviceId, DeviceLink
void BluetoothLinkProvider::socketDisconnected(const QBluetoothAddress &peer, MultiplexChannel *socket)
{
qCDebug(KDECONNECT_CORE()) << "Disconnected";
qCDebug(KDECONNECT_CORE) << "Disconnected";
disconnect(socket, nullptr, this, nullptr);
mSockets.remove(peer);

2
core/backends/bluetooth/bluetoothuploadjob.cpp
View file

@ -47,7 +47,7 @@ void BluetoothUploadJob::writeSome()
int bytesWritten = mSocket->write(mData->read(bytes));
if (bytesWritten < 0) {
qCWarning(KDECONNECT_CORE()) << "error when writing data to bluetooth upload" << bytes << mData->bytesAvailable();
qCWarning(KDECONNECT_CORE) << "error when writing data to bluetooth upload" << bytes << mData->bytesAvailable();
errorOccurred = true;
break;
}

4
core/backends/lan/lanlinkprovider.cpp
View file

@ -171,7 +171,7 @@ void LanLinkProvider::broadcastUdpIdentityPacket()
qWarning() << "Not broadcasting UDP because KDECONNECT_DISABLE_UDP_BROADCAST is set";
return;
}
qCDebug(KDECONNECT_CORE()) << "Broadcasting identity packet";
qCDebug(KDECONNECT_CORE) << "Broadcasting identity packet";
QList<QHostAddress> addresses = getBroadcastAddresses();
@ -184,7 +184,7 @@ void LanLinkProvider::broadcastUdpIdentityPacket()
for (const QNetworkAddressEntry &ifaceAddress : iface.addressEntries()) {
QHostAddress sourceAddress = ifaceAddress.ip();
if (sourceAddress.protocol() == QAbstractSocket::IPv4Protocol && sourceAddress != QHostAddress::LocalHost) {
qCDebug(KDECONNECT_CORE()) << "Broadcasting as" << sourceAddress;
qCDebug(KDECONNECT_CORE) << "Broadcasting as" << sourceAddress;
sendSocket.bind(sourceAddress);
sendUdpIdentityPacket(sendSocket, addresses);
sendSocket.close();