[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ruqola] src: Move parsing in room.h
From:       Montel Laurent <null () kde ! org>
Date:       2017-08-16 6:39:15
Message-ID: E1dhrz1-0005Kx-Lt () code ! kde ! org
[Download RAW message or body]

Git commit affa170dfb180a1cdbdef70dd03af7ac93ac5cb0 by Montel Laurent.
Committed on 16/08/2017 at 06:35.
Pushed by mlaurent into branch 'master'.

Move parsing in room.h

M  +4    -6    src/rocketchatbackend.cpp
M  +9    -0    src/room.cpp
M  +2    -0    src/room.h

https://commits.kde.org/ruqola/affa170dfb180a1cdbdef70dd03af7ac93ac5cb0

diff --git a/src/rocketchatbackend.cpp b/src/rocketchatbackend.cpp
index 2c8da12..c5f78ab 100644
--- a/src/rocketchatbackend.cpp
+++ b/src/rocketchatbackend.cpp
@@ -53,12 +53,10 @@ void rooms_parsing(const QJsonDocument &doc)
             || roomType == QLatin1String("p") /*Private chat*/) {
             // let's be extra safe around crashes
             if (Ruqola::self()->loginStatus() == DDPClient::LoggedIn) {
-                const QString roomID = room.value(QStringLiteral("_id")).toString();
-                QString name = room[QStringLiteral("name")].toString();
-                QString topic = room[QStringLiteral("topic")].toString();
-                QString announcement = room[QStringLiteral("announcement")].toString();
-                qCDebug(RUQOLA_LOG) << "Adding room" << roomID << topic << announcement;
-                model->updateRoom(name, roomID, topic, announcement);
+                Room r;
+                r.parseRoom(room);
+                qCDebug(RUQOLA_LOG) << "Adding room" << r.id << r.topic << r.mAnnouncement;
+                model->updateRoom(r.name, r.id, r.topic, r.mAnnouncement);
             }
         }
     }
diff --git a/src/room.cpp b/src/room.cpp
index 98e7b91..ca2ae5d 100644
--- a/src/room.cpp
+++ b/src/room.cpp
@@ -63,6 +63,15 @@ QDebug operator <<(QDebug d, const Room &t)
     return d;
 }
 
+
+void Room::parseRoom(const QJsonObject &json)
+{
+    id = json.value(QStringLiteral("_id")).toString();
+    name = json[QStringLiteral("name")].toString();
+    topic = json[QStringLiteral("topic")].toString();
+    mAnnouncement = json[QStringLiteral("announcement")].toString();
+}
+
 void Room::parseSubscriptionRoom(const QJsonObject &json)
 {
     QString roomID = json.value(QStringLiteral("rid")).toString();
diff --git a/src/room.h b/src/room.h
index 156f145..923cced 100644
--- a/src/room.h
+++ b/src/room.h
@@ -68,6 +68,8 @@ public:
     }
 
     void parseSubscriptionRoom(const QJsonObject &json);
+    void parseRoom(const QJsonObject &json);
+
 
     //Room Object Fields
 
[prev in list] [next in list] [prev in thread] [next in thread]