diff --git a/src/authority/storagehelper.cpp b/src/authority/storagehelper.cpp index aa6e78a5effbe12e9f6ad295770c3e344b397002..dfd15af45a248ea4335e62f0092b4cf69be02bca 100644 --- a/src/authority/storagehelper.cpp +++ b/src/authority/storagehelper.cpp @@ -298,8 +298,7 @@ setProfile(const QString& accountId, const api::profile::Info& profileInfo, cons qWarning().noquote() << "Can't open file for writing: " << file.fileName(); return; } - QTextStream in(&file); - in << vcard; + QTextStream(&file) << vcard; file.close(); lf.unlock(); } @@ -361,8 +360,7 @@ getAccountAvatar(const QString& accountId) qWarning() << "Can't open file: " << filePath; return {}; } - QTextStream in(&file); - const auto vCard = lrc::vCard::utils::toHashMap(in.readAll().toUtf8()); + const auto vCard = lrc::vCard::utils::toHashMap(file.readAll()); const auto photo = (vCard.find(vCard::Property::PHOTO_PNG) == vCard.end()) ? vCard[vCard::Property::PHOTO_JPEG] : vCard[vCard::Property::PHOTO_PNG]; @@ -398,9 +396,7 @@ buildContactFromProfile(const QString& accountId, return {profileInfo, "", true, false}; } } - QTextStream in(&file); - QByteArray vcard = in.readAll().toUtf8(); - const auto vCard = lrc::vCard::utils::toHashMap(vcard); + const auto vCard = lrc::vCard::utils::toHashMap(file.readAll()); const auto alias = vCard[vCard::Property::FORMATTED_NAME]; if (lrc::api::Lrc::cacheAvatars.load()) { for (const auto& key : vCard.keys()) { @@ -424,9 +420,7 @@ avatar(const QString& accountId, const QString& contactId) if (!file.open(QIODevice::ReadOnly)) { return {}; } - QTextStream in(&file); - QByteArray vcard = in.readAll().toUtf8(); - const auto vCard = lrc::vCard::utils::toHashMap(vcard); + const auto vCard = lrc::vCard::utils::toHashMap(file.readAll()); for (const auto& key : vCard.keys()) { if (key.contains("PHOTO")) return vCard[key]; @@ -434,7 +428,6 @@ avatar(const QString& accountId, const QString& contactId) return {}; } - VectorString getAllConversations(Database& db) {