Make clang-format happy

(cherry picked from commit 6fe9a4354e)
This commit is contained in:
Albert Astals Cid 2024-03-27 19:22:02 +01:00
parent b5258058ab
commit 3908aca513
4 changed files with 11 additions and 20 deletions

View file

@ -64,8 +64,7 @@ void ContactsPlugin::synchronizeRemoteWithLocal()
bool ContactsPlugin::handleResponseUIDsTimestamps(const NetworkPacket &np)
{
if (!np.has(QStringLiteral("uids"))) {
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseUIDsTimestamps:"
<< "Malformed packet does not have uids key";
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseUIDsTimestamps:" << "Malformed packet does not have uids key";
return false;
}
uIDList_t uIDsToUpdate;
@ -97,8 +96,8 @@ bool ContactsPlugin::handleResponseUIDsTimestamps(const NetworkPacket &np)
// Check if the vcard needs to be updated
if (!vcardFile.open(QIODevice::ReadOnly)) {
qCWarning(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseUIDsTimestamps:"
<< "Unable to open" << filename << "to read even though it was reported to exist";
qCWarning(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseUIDsTimestamps:" << "Unable to open" << filename
<< "to read even though it was reported to exist";
continue;
}
@ -136,8 +135,7 @@ bool ContactsPlugin::handleResponseUIDsTimestamps(const NetworkPacket &np)
bool ContactsPlugin::handleResponseVCards(const NetworkPacket &np)
{
if (!np.has(QStringLiteral("uids"))) {
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:"
<< "Malformed packet does not have uids key";
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:" << "Malformed packet does not have uids key";
return false;
}
@ -151,8 +149,7 @@ bool ContactsPlugin::handleResponseVCards(const NetworkPacket &np)
QFile vcardFile(filename);
bool vcardFileOpened = vcardFile.open(QIODevice::WriteOnly); // Want to smash anything that might have already been there
if (!vcardFileOpened) {
qCWarning(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:"
<< "Unable to open" << filename;
qCWarning(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:" << "Unable to open" << filename;
continue;
}
@ -160,8 +157,7 @@ bool ContactsPlugin::handleResponseVCards(const NetworkPacket &np)
const QString &vcard = np.get<QString>(ID);
fileWriteStream << vcard;
}
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:"
<< "Got" << uIDs.size() << "VCards";
qCDebug(KDECONNECT_PLUGIN_CONTACTS) << "handleResponseVCards:" << "Got" << uIDs.size() << "VCards";
Q_EMIT localCacheSynchronized(uIDs);
return true;
}

View file

@ -194,8 +194,7 @@ void DBusNotificationsListenerThread::run()
"member='Notify'");
if (!error.isEmpty()) {
qCWarning(KDECONNECT_PLUGIN_SENDNOTIFICATIONS).noquote() << "Failed to become a DBus monitor."
<< "No notifictions will be sent. Error:" << error;
qCWarning(KDECONNECT_PLUGIN_SENDNOTIFICATIONS).noquote() << "Failed to become a DBus monitor." << "No notifictions will be sent. Error:" << error;
}
// wake up every minute to see if we are still connected
@ -376,8 +375,7 @@ QSharedPointer<QIODevice> DBusNotificationsListener::iconForImageData(const QVar
return QSharedPointer<QIODevice>();
if (bitsPerSample != 8) {
qCWarning(KDECONNECT_PLUGIN_SENDNOTIFICATIONS) << "Unsupported image format:"
<< "width=" << width << "height=" << height << "rowStride=" << rowStride
qCWarning(KDECONNECT_PLUGIN_SENDNOTIFICATIONS) << "Unsupported image format:" << "width=" << width << "height=" << height << "rowStride=" << rowStride
<< "bitsPerSample=" << bitsPerSample << "channels=" << channels << "hasAlpha=" << hasAlpha;
return QSharedPointer<QIODevice>();
}

View file

@ -76,14 +76,12 @@ QVariantList ConversationsDbusInterface::activeConversations()
void ConversationsDbusInterface::requestConversation(const qint64 &conversationID, int start, int end)
{
if (start < 0 || end < 0) {
qCWarning(KDECONNECT_CONVERSATIONS) << "requestConversation"
<< "Start and end must be >= 0";
qCWarning(KDECONNECT_CONVERSATIONS) << "requestConversation" << "Start and end must be >= 0";
return;
}
if (end - start < 0) {
qCWarning(KDECONNECT_CONVERSATIONS) << "requestConversation"
<< "Start must be before end";
qCWarning(KDECONNECT_CONVERSATIONS) << "requestConversation" << "Start must be before end";
return;
}

View file

@ -58,8 +58,7 @@ void ConversationModel::setDeviceId(const QString &deviceId)
if (deviceId == m_deviceId)
return;
qCDebug(KDECONNECT_SMS_CONVERSATION_MODEL) << "setDeviceId"
<< "of" << this;
qCDebug(KDECONNECT_SMS_CONVERSATION_MODEL) << "setDeviceId" << "of" << this;
if (m_conversationsInterface) {
disconnect(m_conversationsInterface, &DeviceConversationsDbusInterface::conversationUpdated, this, &ConversationModel::handleConversationUpdate);
disconnect(m_conversationsInterface, &DeviceConversationsDbusInterface::conversationLoaded, this, &ConversationModel::handleConversationLoaded);