style: modernize ServerNotificationHandler::slotNotificationsReceived.

Signed-off-by: Camila Ayres <[email protected]>

Author: camilasan

src/gui/tray/notificationhandler.cpp

@@ -98,14 +98,14 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
 
     const auto notifies = json.object().value("ocs"_L1).toObject().value("data"_L1).toArray();
 
-    auto *ai = qvariant_cast<AccountState *>(sender()->property(propertyAccountStateC));
+    auto accountState = qvariant_cast<AccountState *>(sender()->property(propertyAccountStateC));
 
     ActivityList list;
     ActivityList callList;
 
-    for (const auto element : notifies) {
-        auto json = element.toObject();
-        auto a = Activity::fromActivityJson(json, ai->account());
+    for (const auto &element : notifies) {
+        const auto json = element.toObject();
+        auto activity = Activity::fromActivityJson(json, accountState->account());
 
         a._type = Activity::NotificationType;
         a._id = json.value("notification_id"_L1).toInteger();
@@ -136,17 +136,18 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
             const auto objectId = json.value("object_id"_L1).toString();
             const auto objectIdData = objectId.split(u'/');
 
-            ActivityLink al;
-            al._label = tr("Reply");
-            al._verb = "REPLY";
-            al._primary = true;
+            ActivityLink link;
+            link._label = tr("Reply");
+            link._verb = "REPLY";
+            link._primary = true;
 
-            a._talkNotificationData.conversationToken = objectIdData.first();
+            activity._talkNotificationData.conversationToken = objectIdData.first();
 
-            if (a._objectType == "chat" && objectIdData.size() > 1) {
-                a._talkNotificationData.messageId = objectIdData.last();
+            if (activity._objectType == "chat" && objectIdData.size() > 1) {
+                activity._talkNotificationData.messageId = objectIdData.last();
             } else {
-                qCInfo(lcServerNotification) << "Replying directly to Talk conversation" << a._talkNotificationData.conversationToken << "will not be possible because the notification doesn't contain the message ID.";
+                qCInfo(lcServerNotification) << "Replying directly to Talk conversation" << activity._talkNotificationData.conversationToken
+                                             << "will not be possible because the notification doesn't contain the message ID.";
             }
 
             if (a._subjectRichParameters.contains("user"_L1)) {
@@ -164,7 +165,7 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
                 callList.append(a);
             }
 
-            a._links.insert(al._primary? 0 : a._links.size(), al);
+            activity._links.insert(link._primary? 0 : activity._links.size(), link);
         }
 
         QUrl link(json.value("link"_L1).toString());
@@ -173,13 +174,13 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
                 link.setScheme(ai->account()->url().scheme());
                 link.setHost(ai->account()->url().host());
             }
-            if (link.port() == -1) {
-                link.setPort(ai->account()->url().port());
+            if (url.port() == -1) {
+                url.setPort(accountState->account()->url().port());
             }
         }
-        a._link = link;
+        activity._link = url;
 
-        list.append(a);
+        list.append(activity);
     }
     emit newNotificationList(list);
     emit newIncomingCallsList(callList);