Git commit 7a40f38d0ec1c5444c6405c915fb06afa080391b by Montel Laurent.
Committed on 31/08/2017 at 20:46.
Pushed by mlaurent into branch 'master'.

Rename variable

M  +1    -1    autotests/roommodeltest.cpp
M  +3    -3    src/rocketchatbackend.cpp
M  +11   -6    src/room.cpp
M  +2    -5    src/room.h
M  +10   -10   src/roommodel.cpp

https://commits.kde.org/ruqola/7a40f38d0ec1c5444c6405c915fb06afa080391b

diff --git a/autotests/roommodeltest.cpp b/autotests/roommodeltest.cpp
index 3978d73..4ca456b 100644
--- a/autotests/roommodeltest.cpp
+++ b/autotests/roommodeltest.cpp
@@ -35,7 +35,7 @@ RoomModelTest::RoomModelTest(QObject *parent)
 void RoomModelTest::shouldSerialized()
 {
     Room input;
-    input.id =3D QStringLiteral("foo");
+    input.mId =3D QStringLiteral("foo");
     input.mChannelType =3D QStringLiteral("p");
     input.mName =3D QStringLiteral("d");
     input.mAnnouncement =3D QStringLiteral("AA");
diff --git a/src/rocketchatbackend.cpp b/src/rocketchatbackend.cpp
index a5e5b06..a460e74 100644
--- a/src/rocketchatbackend.cpp
+++ b/src/rocketchatbackend.cpp
@@ -59,8 +59,8 @@ void rooms_parsing(const QJsonDocument &doc, RocketChatAc=
count *account)
             if (account->loginStatus() =3D=3D DDPClient::LoggedIn) {
                 Room r;
                 r.parseRoom(roomJson);
-                qCDebug(RUQOLA_LOG) << "Adding room" << r.id << r.mTopic <=
< r.mAnnouncement;
-                model->updateRoom(r.mName, r.id, r.mTopic, r.mAnnouncement=
);
+                qCDebug(RUQOLA_LOG) << "Adding room" << r.mId << r.mTopic =
<< r.mAnnouncement;
+                model->updateRoom(r.mName, r.mId, r.mTopic, r.mAnnouncemen=
t);
             }
         }
     }
@@ -92,7 +92,7 @@ void getsubscription_parsing(const QJsonDocument &doc, Ro=
cketChatAccount *accoun
             if (account->loginStatus() =3D=3D DDPClient::LoggedIn) {
                 Room r;
                 r.parseSubscriptionRoom(room);
-                qCDebug(RUQOLA_LOG) << "Adding room subscription" << r.mNa=
me << r.id << r.mTopic;
+                qCDebug(RUQOLA_LOG) << "Adding room subscription" << r.mNa=
me << r.mId << r.mTopic;
 =

                 model->addRoom(r);
             }
diff --git a/src/room.cpp b/src/room.cpp
index 72e347c..c76efd1 100644
--- a/src/room.cpp
+++ b/src/room.cpp
@@ -29,7 +29,7 @@ Room::Room()
 bool Room::operator=3D=3D(const Room &other) const
 {
     //qDebug() << " other.id"<<other.id << " id " << id;
-    return other.id =3D=3D id;
+    return other.mId =3D=3D mId;
 }
 =

 bool Room::operator<(const Room &other) const
@@ -39,7 +39,7 @@ bool Room::operator<(const Room &other) const
 =

 bool Room::isEqual(const Room &other) const
 {
-    return (id =3D=3D other.id)
+    return (mId =3D=3D other.mId)
            && (mChannelType =3D=3D other.mChannelType)
            && (mName =3D=3D other.mName)
            && (mAnnouncement =3D=3D other.mAnnouncement)
@@ -55,9 +55,14 @@ bool Room::isEqual(const Room &other) const
            && (mOpen =3D=3D other.mOpen);
 }
 =

+QString Room::getName() const
+{
+    return mName;
+}
+
 QDebug operator <<(QDebug d, const Room &t)
 {
-    d << "id :" << t.id;
+    d << "id :" << t.mId;
     d << "type :" << t.mChannelType;
     d << "name :" << t.mName;
     d << "mAnnouncement :" << t.mAnnouncement;
@@ -78,7 +83,7 @@ void Room::parseUpdateRoom(const QJsonObject &json)
 {
     //QJsonArray(["updated",{"_id":"7jHqcrZ8FYXJBwgRB","_updatedAt":{"$dat=
e":1503902695955},"alert":false,"f":true,"groupMentions":0,"ls":{"$date":15=
03902695955},"name":"dev","open":true,"rid":"dBWXYy4nyBHn8Q7dv","t":"c","ts=
":{"$date":1493034182680},"u":{"_id":"uKK39zoewTkdacidH","username":"lauren=
t"},"unread":0,"userMentions":0}])
     if (json.contains(QStringLiteral("rid"))) {
-        id =3D json.value(QStringLiteral("rid")).toString();
+        mId =3D json.value(QStringLiteral("rid")).toString();
     }
     if (json.contains(QStringLiteral("alert"))) {
         mAlert =3D json[QStringLiteral("alert")].toBool();
@@ -101,7 +106,7 @@ void Room::parseUpdateRoom(const QJsonObject &json)
 =

 void Room::parseRoom(const QJsonObject &json)
 {
-    id =3D json.value(QStringLiteral("_id")).toString();
+    mId =3D json.value(QStringLiteral("_id")).toString();
     mName =3D json[QStringLiteral("name")].toString();
     mTopic =3D json[QStringLiteral("topic")].toString();
     mAnnouncement =3D json[QStringLiteral("announcement")].toString();
@@ -110,7 +115,7 @@ void Room::parseRoom(const QJsonObject &json)
 void Room::parseSubscriptionRoom(const QJsonObject &json)
 {
     const QString roomID =3D json.value(QStringLiteral("rid")).toString();
-    id =3D roomID;
+    mId =3D roomID;
     mName =3D json[QStringLiteral("name")].toString();
     mTopic =3D json[QStringLiteral("topic")].toString();
     mAnnouncement =3D json[QStringLiteral("announcement")].toString();
diff --git a/src/room.h b/src/room.h
index b92ed00..4f26804 100644
--- a/src/room.h
+++ b/src/room.h
@@ -47,10 +47,7 @@ public:
     *
     * @return QString, The name of the room
     */
-    QString getName() const
-    {
-        return mName;
-    }
+    QString getName() const;
 =

     void parseSubscriptionRoom(const QJsonObject &json);
     void parseRoom(const QJsonObject &json);
@@ -59,7 +56,7 @@ public:
     //Room Object Fields
 =

     // _id
-    QString id;
+    QString mId;
 =

     // t (can take values "d" , "c" or "p")
     QString mChannelType;
diff --git a/src/roommodel.cpp b/src/roommodel.cpp
index 665d015..8542c36 100644
--- a/src/roommodel.cpp
+++ b/src/roommodel.cpp
@@ -66,7 +66,7 @@ void RoomModel::clear()
 RoomWrapper *RoomModel::findRoom(const QString &roomID) const
 {
     foreach (const Room &r, mRoomsList) {
-        if (r.id =3D=3D roomID) {
+        if (r.mId =3D=3D roomID) {
             return new RoomWrapper(r);
         }
     }
@@ -141,7 +141,7 @@ QVariant RoomModel::data(const QModelIndex &index, int =
role) const
     case RoomModel::RoomName:
         return r.mName;
     case RoomModel::RoomID:
-        return r.id;
+        return r.mId;
     case RoomModel::RoomSelected:
         return r.mSelected;
     case RoomModel::RoomType:
@@ -198,7 +198,7 @@ void RoomModel::addRoom(const QString &roomID, const QS=
tring &roomName, bool sel
     qCDebug(RUQOLA_LOG) << "Adding room : roomId: " << roomID << " room Na=
me " << roomName << " isSelected : " << selected;
 =

     Room r;
-    r.id =3D roomID;
+    r.mId =3D roomID;
     r.mName =3D roomName;
     r.mSelected =3D selected;
     addRoom(r);
@@ -226,7 +226,7 @@ void RoomModel::addRoom(const Room &room)
         endInsertRows();
     }
 =

-    mRocketChatAccount->getMessageModelForRoom(room.id);
+    mRocketChatAccount->getMessageModelForRoom(room.mId);
 }
 =

 void RoomModel::updateSubscription(const QJsonArray &array)
@@ -237,7 +237,7 @@ void RoomModel::updateSubscription(const QJsonArray &ar=
ray)
         qDebug() << " REMOVE ROOM";
         qDebug() << " name " << roomData.value(QStringLiteral("name")) << =
" rid " << roomData.value(QStringLiteral("rid"));
         Room room;
-        room.id =3D roomData.value(QStringLiteral("rid")).toString();
+        room.mId =3D roomData.value(QStringLiteral("rid")).toString();
         room.mName =3D roomData.value(QStringLiteral("name")).toString();
         auto existingRoom =3D std::find(mRoomsList.begin(), mRoomsList.end=
(), room);
         bool present =3D (existingRoom !=3D mRoomsList.end());
@@ -279,7 +279,7 @@ void RoomModel::updateRoom(const QJsonObject &roomData)
                 mRoomsList.replace(i, room);
                 Q_EMIT dataChanged(createIndex(1, 1), createIndex(i, 1));
 =

-                mRocketChatAccount->getMessageModelForRoom(room.id);
+                mRocketChatAccount->getMessageModelForRoom(room.mId);
                 break;
             }
         }
@@ -291,7 +291,7 @@ void RoomModel::updateRoom(const QJsonObject &roomData)
 void RoomModel::updateRoom(const QString &name, const QString &roomID, con=
st QString &topic, const QString &announcement)
 {
     Room room;
-    room.id =3D roomID;
+    room.mId =3D roomID;
     room.mName =3D name;
     auto existingRoom =3D std::find(mRoomsList.begin(), mRoomsList.end(), =
room);
     bool present =3D (existingRoom !=3D mRoomsList.end());
@@ -314,14 +314,14 @@ void RoomModel::updateRoom(const QString &name, const=
 QString &roomID, const QSt
     mRoomsList.replace(pos - 1, foundRoom);
     Q_EMIT dataChanged(createIndex(1, 1), createIndex(pos, 1));
 =

-    mRocketChatAccount->getMessageModelForRoom(room.id);
+    mRocketChatAccount->getMessageModelForRoom(room.mId);
 }
 =

 Room RoomModel::fromJSon(const QJsonObject &o)
 {
     Room r;
 =

-    r.id =3D o[QStringLiteral("id")].toString();
+    r.mId =3D o[QStringLiteral("id")].toString();
     r.mChannelType =3D o[QStringLiteral("t")].toString();
     r.mName =3D o[QStringLiteral("name")].toString();
     r.mUserName =3D o[QStringLiteral("userName")].toString();
@@ -345,7 +345,7 @@ QByteArray RoomModel::serialize(const Room &r)
     QJsonDocument d;
     QJsonObject o;
 =

-    o[QStringLiteral("id")] =3D r.id;
+    o[QStringLiteral("id")] =3D r.mId;
     o[QStringLiteral("t")] =3D r.mChannelType;
     o[QStringLiteral("name")] =3D r.mName;
     o[QStringLiteral("userName")] =3D r.mUserName;