Enable -Wconversion

4 files changed, 12 insertions, 11 deletions

diff --git a/src/timeline/CommunitiesModel.cpp b/src/timeline/CommunitiesModel.cpp

index ef023cee..96d090f7 100644
--- a/src/timeline/CommunitiesModel.cpp
+++ b/src/timeline/CommunitiesModel.cpp
@@ -153,7 +153,8 @@ CommunitiesModel::data(const QModelIndex &index, int role) const
             int count = 0;
             auto end  = spaceOrder_.lastChild(index.row() - 2);
             for (int i = index.row() - 2; i <= end; i++)
-                count += spaceOrder_.tree[i].notificationCounts.notification_count;
+                count +=
+                  static_cast<int>(spaceOrder_.tree[i].notificationCounts.notification_count);
             return count;
         }
         case CommunitiesModel::Roles::HasLoudNotification: {
diff --git a/src/timeline/Permissions.cpp b/src/timeline/Permissions.cpp

index 9fa833b7..78bb3cf6 100644
--- a/src/timeline/Permissions.cpp
+++ b/src/timeline/Permissions.cpp
@@ -66,24 +66,24 @@ Permissions::canSend(int eventType)
 int
 Permissions::defaultLevel()
 {
-    return pl.users_default;
+    return static_cast<int>(pl.users_default);
 }
 int
 Permissions::redactLevel()
 {
-    return pl.redact;
+    return static_cast<int>(pl.redact);
 }
 int
 Permissions::changeLevel(int eventType)
 {
-    return pl.state_level(to_string(
-      qml_mtx_events::fromRoomEventType(static_cast<qml_mtx_events::EventType>(eventType))));
+    return static_cast<int>(pl.state_level(to_string(
+      qml_mtx_events::fromRoomEventType(static_cast<qml_mtx_events::EventType>(eventType)))));
 }
 int
 Permissions::sendLevel(int eventType)
 {
-    return pl.event_level(to_string(
-      qml_mtx_events::fromRoomEventType(static_cast<qml_mtx_events::EventType>(eventType))));
+    return static_cast<int>(pl.event_level(to_string(
+      qml_mtx_events::fromRoomEventType(static_cast<qml_mtx_events::EventType>(eventType)))));
 }
 
 bool
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index 5ffd7415..6cf361aa 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -679,7 +679,7 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
         if (w == 0)
             w = 1;
 
-        double prop = media_height(event) / (double)w;
+        double prop = (double)media_height(event) / (double)w;
 
         return {prop > 0 ? prop : 1.};
     }
@@ -2881,7 +2881,7 @@ TimelineModel::pinnedMessages() const
         return {};
 
     QStringList list;
-    list.reserve((qsizetype)pinned->content.pinned.size());
+    list.reserve((int)pinned->content.pinned.size());
     for (const auto &p : pinned->content.pinned)
         list.push_back(QString::fromStdString(p));
 
@@ -2912,7 +2912,7 @@ TimelineModel::widgetLinks() const
         theme.clear();
     user = QUrl::toPercentEncoding(user);
 
-    list.reserve((qsizetype)evs.size());
+    list.reserve((int)evs.size());
     for (const auto &p : evs) {
         auto url = QString::fromStdString(p.content.url);
 
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h

index 2a04c9c9..8bf18f19 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -406,7 +406,7 @@ public slots:
     RoomSummary *parentSpace();
 
     bool hasMentions() const { return highlight_count > 0; }
-    int notificationCount() const { return notification_count; }
+    int notificationCount() const { return static_cast<int>(notification_count); }
 
     QString scrollTarget() const;