blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull requests 3 Releases 10 Wiki Activity Actions

some warnings fixed, new way of drawing avatars in message line

Browse source
This commit is contained in:
Blue 2022-01-05 22:29:34 +03:00
parent e27ae1a82f
commit 7130e674c4
Signed by: blue
GPG key ID: 9B203B252A63EE38
7 changed files with 65 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/account.cpp
View file

@ -601,6 +601,9 @@ void Core::Account::onClientError(QXmppClient::Error err)
errorText = "Policy violation";
break;
#endif
default:
errorText = "Unknown Error";
break;
}
errorType = "Client stream error";
@ -837,7 +840,6 @@ void Core::Account::uploadVCard(const Shared::VCard& card)
QXmppVCardIq iq;
initializeQXmppVCard(iq, card);
bool avatarChanged = false;
if (card.getAvatarType() != Shared::Avatar::empty) {
QString newPath = card.getAvatarPath();
QString oldPath = getAvatarPath();
@ -859,7 +861,6 @@ void Core::Account::uploadVCard(const Shared::VCard& card)
}
} else {
data = avatar.readAll();
avatarChanged = true;
}
} else {
if (avatarType.size() > 0) {

2
core/adapterFuctions.cpp
View file

@ -264,7 +264,7 @@ void Core::initializeQXmppVCard(QXmppVCardIq& iq, const Shared::VCard& card) {
phone.setType(phone.type() | QXmppVCardPhone::Preferred);
}
}
for (const std::pair<QString, QXmppVCardPhone>& phone : phones) {
for (const std::pair<const QString, QXmppVCardPhone>& phone : phones) {
phs.push_back(phone.second);
}

2
core/conference.cpp
View file

@ -356,7 +356,7 @@ Shared::VCard Core::Conference::handleResponseVCard(const QXmppVCardIq& card, co
QMap<QString, QVariant> Core::Conference::getAllAvatars() const
{
QMap<QString, QVariant> result;
for (const std::pair<QString, Archive::AvatarInfo>& pair : exParticipants) {
for (const std::pair<const QString, Archive::AvatarInfo>& pair : exParticipants) {
result.insert(pair.first, avatarPath(pair.first) + "." + pair.second.type);
}
return result;