diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2022-10-26 01:10:35 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2022-10-26 01:10:35 +0200 |
| commit | b28fa86e6ab633b2d3d9bfdb4642c661ff8c45fc (patch) | |
| tree | e3500273bcd79fc9e6389e8dcc626607a2677678 /src/ui | |
| parent | Merge pull request #1215 from foxB612/fix-thumbnail-size (diff) | |
| download | nheko-b28fa86e6ab633b2d3d9bfdb4642c661ff8c45fc.tar.xz | |
Enable -Wconversion
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/MxcAnimatedImage.cpp | 2 | ||||
| -rw-r--r-- | src/ui/MxcMediaProxy.cpp | 2 | ||||
| -rw-r--r-- | src/ui/RoomSettings.cpp | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/ui/MxcAnimatedImage.cpp b/src/ui/MxcAnimatedImage.cpp index 8ecea7d9..7f7210e3 100644 --- a/src/ui/MxcAnimatedImage.cpp +++ b/src/ui/MxcAnimatedImage.cpp @@ -82,7 +82,7 @@ MxcAnimatedImage::startDownload() std::string temp(ba.constData(), ba.size()); temp = mtx::crypto::to_string(mtx::crypto::decrypt_file(temp, encryptionInfo.value())); - buffer.setData(temp.data(), temp.size()); + buffer.setData(temp.data(), static_cast<int>(temp.size())); } else { buffer.setData(device.readAll()); } diff --git a/src/ui/MxcMediaProxy.cpp b/src/ui/MxcMediaProxy.cpp index 3676a74e..dadd4478 100644 --- a/src/ui/MxcMediaProxy.cpp +++ b/src/ui/MxcMediaProxy.cpp @@ -122,7 +122,7 @@ MxcMediaProxy::startDownload() QByteArray ba = device.readAll(); std::string temp(ba.constData(), ba.size()); temp = mtx::crypto::to_string(mtx::crypto::decrypt_file(temp, encryptionInfo.value())); - buffer.setData(temp.data(), temp.size()); + buffer.setData(temp.data(), static_cast<int>(temp.size())); } else { buffer.setData(device.readAll()); } diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp index 546cda29..67be0bbb 100644 --- a/src/ui/RoomSettings.cpp +++ b/src/ui/RoomSettings.cpp @@ -132,7 +132,7 @@ RoomSettings::roomAvatarUrl() int RoomSettings::memberCount() const { - return info_.member_count; + return static_cast<int>(info_.member_count); } void @@ -180,7 +180,8 @@ QStringList RoomSettings::allowedRooms() const { QStringList rooms; - rooms.reserve(accessRules_.allow.size()); + assert(accessRules_.allow.size() < std::numeric_limits<int>::max()); + rooms.reserve(static_cast<int>(accessRules_.allow.size())); for (const auto &e : accessRules_.allow) { if (e.type == mtx::events::state::JoinAllowanceType::RoomMembership) rooms.push_back(QString::fromStdString(e.room_id)); |