aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2022-12-28 19:20:26 +0100
committerLinus Jahn <lnj@kaidan.im>2022-12-28 19:20:26 +0100
commit927af006279ec87df2b840b49cf60411f6541143 (patch)
tree5d483d2f3b43204de387ebc35591a67dc6e04feb /src
parent765c13316cb35b0b3d7b12382e28ee5eed5263e3 (diff)
downloadqxmpp-927af006279ec87df2b840b49cf60411f6541143.tar.gz
omemo: Fix usage of Qt keywords
Diffstat (limited to 'src')
-rw-r--r--src/omemo/QXmppOmemoManager.cpp6
-rw-r--r--src/omemo/QXmppOmemoManager_p.cpp20
2 files changed, 13 insertions, 13 deletions
diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp
index 938df22a..1f26ee16 100644
--- a/src/omemo/QXmppOmemoManager.cpp
+++ b/src/omemo/QXmppOmemoManager.cpp
@@ -756,7 +756,7 @@ QFuture<QXmppPubSubManager::Result> Manager::removeContactDevices(const QString
auto future = d->trustManager->removeKeys(ns_omemo_2, jid);
await(future, this, [=]() mutable {
reportFinishedResult(interface, result);
- emit devicesRemoved(jid);
+ Q_EMIT devicesRemoved(jid);
});
});
}
@@ -1234,7 +1234,7 @@ void Manager::setClient(QXmppClient *client)
connect(d->trustManager, &QXmppTrustManager::trustLevelsChanged, this, [=](const QHash<QString, QMultiHash<QString, QByteArray>> &modifiedKeys) {
const auto &modifiedOmemoKeys = modifiedKeys.value(ns_omemo_2);
- emit trustLevelsChanged(modifiedOmemoKeys);
+ Q_EMIT trustLevelsChanged(modifiedOmemoKeys);
for (auto itr = modifiedOmemoKeys.cbegin(); itr != modifiedOmemoKeys.cend(); ++itr) {
const auto &keyOwnerJid = itr.key();
@@ -1244,7 +1244,7 @@ void Manager::setClient(QXmppClient *client)
const auto &devices = d->devices.value(keyOwnerJid);
for (auto itr = devices.cbegin(); itr != devices.cend(); ++itr) {
if (itr->keyId == keyId) {
- emit deviceChanged(keyOwnerJid, itr.key());
+ Q_EMIT deviceChanged(keyOwnerJid, itr.key());
return;
}
}
diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp
index eb727d68..b61918ec 100644
--- a/src/omemo/QXmppOmemoManager_p.cpp
+++ b/src/omemo/QXmppOmemoManager_p.cpp
@@ -960,7 +960,7 @@ void ManagerPrivate::removeDevicesRemovedFromServer()
devicesItr = userDevices.erase(devicesItr);
omemoStorage->removeDevice(jid, deviceId);
trustManager->removeKeys(ns_omemo_2, QList { device.keyId });
- emit q->deviceRemoved(jid, deviceId);
+ Q_EMIT q->deviceRemoved(jid, deviceId);
} else {
++devicesItr;
}
@@ -1231,12 +1231,12 @@ QFuture<std::optional<QXmppOmemoElement>> ManagerPrivate::encryptStanza(const T
auto future = storeKeyDependingOnSecurityPolicy(jid, key);
await(future, q, [=](TrustLevel trustLevel) mutable {
omemoStorage->addDevice(jid, deviceId, deviceBeingModified);
- emit q->deviceChanged(jid, deviceId);
+ Q_EMIT q->deviceChanged(jid, deviceId);
buildSessionDependingOnTrustLevel(deviceBundle, trustLevel);
});
} else {
omemoStorage->addDevice(jid, deviceId, deviceBeingModified);
- emit q->deviceChanged(jid, deviceId);
+ Q_EMIT q->deviceChanged(jid, deviceId);
buildSessionDependingOnTrustLevel(deviceBundle, trustLevel);
}
});
@@ -1716,7 +1716,7 @@ QFuture<QCA::SecureArray> ManagerPrivate::extractPayloadDecryptionData(const QSt
if (storedKeyId != createdKeyId) {
storedKeyId = createdKeyId;
omemoStorage->addDevice(senderJid, senderDeviceId, device);
- emit q->deviceChanged(senderJid, senderDeviceId);
+ Q_EMIT q->deviceChanged(senderJid, senderDeviceId);
}
// Decrypt the OMEMO envelope data and build a session.
@@ -2656,7 +2656,7 @@ void ManagerPrivate::updateOwnDevicesLocally(bool isDeviceListNodeExistent, Func
await(future, q, [=, &device]() mutable {
auto future = buildSessionForNewDevice(jid, deviceId, device);
await(future, q, [=](auto) mutable {
- emit q->deviceAdded(jid, deviceId);
+ Q_EMIT q->deviceAdded(jid, deviceId);
if (++(*processedDevicesCount) == devicesCount) {
continuation(true);
@@ -2784,7 +2784,7 @@ void ManagerPrivate::updateDevices(const QString &deviceOwnerJid, const QXmppOme
omemoStorage->addDevice(deviceOwnerJid, deviceId, device);
if (isDeviceLabelModified) {
- emit q->deviceChanged(deviceOwnerJid, deviceId);
+ Q_EMIT q->deviceChanged(deviceOwnerJid, deviceId);
}
}
@@ -2803,7 +2803,7 @@ void ManagerPrivate::updateDevices(const QString &deviceOwnerJid, const QXmppOme
auto future = buildSessionForNewDevice(deviceOwnerJid, deviceId, device);
await(future, q, [=](auto) {
- emit q->deviceAdded(deviceOwnerJid, deviceId);
+ Q_EMIT q->deviceAdded(deviceOwnerJid, deviceId);
});
}
}
@@ -3227,7 +3227,7 @@ QFuture<bool> ManagerPrivate::resetOwnDevice()
deviceBundle = {};
devices.clear();
- emit q->allDevicesRemoved();
+ Q_EMIT q->allDevicesRemoved();
}
reportFinishedResult(interface, isDeviceBundleDeleted);
@@ -3263,7 +3263,7 @@ QFuture<bool> ManagerPrivate::resetAll()
deviceBundle = {};
devices.clear();
- emit q->allDevicesRemoved();
+ Q_EMIT q->allDevicesRemoved();
}
reportFinishedResult(interface, isBundlesNodeDeleted);
@@ -3696,7 +3696,7 @@ QFuture<TrustLevel> ManagerPrivate::storeKey(const QString &keyOwnerJid, const Q
auto future = trustManager->addKeys(ns_omemo_2, keyOwnerJid, { createKeyId(key) }, trustLevel);
await(future, q, [=]() mutable {
- emit q->trustLevelsChanged({ { keyOwnerJid, key } });
+ Q_EMIT q->trustLevelsChanged({ { keyOwnerJid, key } });
reportFinishedResult(interface, trustLevel);
});