Fix MSVC warnings: Missing return value, cast type

Signed-off-by: Michael Schuster <michael@schuster.ms>

diff --git a/src/gui/tray/ActivityListModel.cpp b/src/gui/tray/ActivityListModel.cpp
index b13b402bf8a8ab987e46a36665b2886af527c78a..1562b77a622772d35c5bfb6470a794ef91fb2c3c 100644 (file)
--- a/src/gui/tray/ActivityListModel.cpp
+++ b/src/gui/tray/ActivityListModel.cpp
@@ -298,7 +298,7 @@ void ActivityListModel::slotActivitiesReceived(const QJsonDocument &json, int st
 
 void ActivityListModel::slotIconDownloaded(QByteArray iconData)
 {
-    for (size_t i = 0; i < _activityLists.count(); i++) {
+    for (auto i = 0; i < _activityLists.count(); i++) {
         if (_activityLists[i]._id == sender()->property("activityId").toLongLong()) {
             _activityLists[i]._iconData = iconData;
         }

diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp
index 4c0ebdd1e1c28107d50e84ebdd201528346f66e0..be6b51dbf82838546ced800ecae7b3c70b510c3a 100644 (file)
--- a/src/gui/tray/UserModel.cpp
+++ b/src/gui/tray/UserModel.cpp
@@ -406,6 +406,8 @@ Folder *User::getFolder()
             return folder;
         }
     }
+
+    return nullptr;
 }
 
 ActivityListModel *User::getActivityModel()