Make clang-format happy

(cherry picked from commit 9faa049c55)
This commit is contained in:
Albert Astals Cid 2024-06-04 19:02:58 +02:00
parent 6e70756cd0
commit f33abeefb3
6 changed files with 25 additions and 16 deletions

View file

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

View file

@ -194,7 +194,8 @@ void DBusNotificationsListenerThread::run()
"member='Notify'"); "member='Notify'");
if (!error.isEmpty()) { 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 // wake up every minute to see if we are still connected
@ -375,7 +376,8 @@ QSharedPointer<QIODevice> DBusNotificationsListener::iconForImageData(const QVar
return QSharedPointer<QIODevice>(); return QSharedPointer<QIODevice>();
if (bitsPerSample != 8) { 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; << "bitsPerSample=" << bitsPerSample << "channels=" << channels << "hasAlpha=" << hasAlpha;
return QSharedPointer<QIODevice>(); return QSharedPointer<QIODevice>();
} }

View file

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

View file

@ -35,7 +35,7 @@ public:
, _cRef(1) , _cRef(1)
{ {
} }
~CAudioEndpointVolumeCallback(){}; ~CAudioEndpointVolumeCallback() {};
// IUnknown methods -- AddRef, Release, and QueryInterface // IUnknown methods -- AddRef, Release, and QueryInterface
@ -91,9 +91,9 @@ class SystemvolumePlugin::CMMNotificationClient : public IMMNotificationClient
public: public:
CMMNotificationClient(SystemvolumePlugin &x) CMMNotificationClient(SystemvolumePlugin &x)
: enclosing(x) : enclosing(x)
, _cRef(1){}; , _cRef(1) {};
~CMMNotificationClient(){}; ~CMMNotificationClient() {};
// IUnknown methods -- AddRef, Release, and QueryInterface // IUnknown methods -- AddRef, Release, and QueryInterface

View file

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

View file

@ -30,8 +30,8 @@ public:
*/ */
qint32 messages; qint32 messages;
SmsCharCount(){}; SmsCharCount() {};
~SmsCharCount(){}; ~SmsCharCount() {};
}; };
#endif // CHARCOUNT_H #endif // CHARCOUNT_H