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

List:       kde-commits
Subject:    [ruqola] src: Use method
From:       Montel Laurent <null () kde ! org>
Date:       2017-08-31 21:29:50
Message-ID: E1dnX26-000696-Kl () code ! kde ! org
[Download RAW message or body]

Git commit 24bd6f86b2e2166b7ff664b4ee758f031ace9a26 by Montel Laurent.
Committed on 31/08/2017 at 21:04.
Pushed by mlaurent into branch 'master'.

Use method

M  +70   -0    src/room.cpp
M  +21   -0    src/room.h
M  +17   -18   src/roommodel.cpp

https://commits.kde.org/ruqola/24bd6f86b2e2166b7ff664b4ee758f031ace9a26

diff --git a/src/room.cpp b/src/room.cpp
index 8bbf068..0b8c0a6 100644
--- a/src/room.cpp
+++ b/src/room.cpp
@@ -104,6 +104,76 @@ void Room::parseUpdateRoom(const QJsonObject &json)
     }
 }
 
+bool Room::selected() const
+{
+    return mSelected;
+}
+
+void Room::setSelected(bool selected)
+{
+    mSelected = selected;
+}
+
+int Room::unread() const
+{
+    return mUnread;
+}
+
+void Room::setUnread(int unread)
+{
+    mUnread = unread;
+}
+
+qint64 Room::jitsiTimeout() const
+{
+    return mJitsiTimeout;
+}
+
+void Room::setJitsiTimeout(const qint64 &jitsiTimeout)
+{
+    mJitsiTimeout = jitsiTimeout;
+}
+
+QString Room::mutedUsers() const
+{
+    return mMutedUsers;
+}
+
+void Room::setMutedUsers(const QString &mutedUsers)
+{
+    mMutedUsers = mutedUsers;
+}
+
+QString Room::userId() const
+{
+    return mUserId;
+}
+
+void Room::setUserId(const QString &userId)
+{
+    mUserId = userId;
+}
+
+QString Room::userName() const
+{
+    return mUserName;
+}
+
+void Room::setUserName(const QString &userName)
+{
+    mUserName = userName;
+}
+
+QString Room::id() const
+{
+    return mId;
+}
+
+void Room::setId(const QString &id)
+{
+    mId = id;
+}
+
 bool Room::alert() const
 {
     return mAlert;
diff --git a/src/room.h b/src/room.h
index 01f7695..2ff2a8a 100644
--- a/src/room.h
+++ b/src/room.h
@@ -42,6 +42,24 @@ public:
     //we can't use operator== as it tests only id. We need it for autotest
     bool isEqual(const Room &other) const;
 
+    QString userName() const;
+    void setUserName(const QString &userName);
+
+    QString userId() const;
+    void setUserId(const QString &userId);
+
+    QString mutedUsers() const;
+    void setMutedUsers(const QString &mutedUsers);
+
+    qint64 jitsiTimeout() const;
+    void setJitsiTimeout(const qint64 &jitsiTimeout);
+
+    int unread() const;
+    void setUnread(int unread);
+
+    bool selected() const;
+    void setSelected(bool selected);
+
     /**
     * @brief Return room name
     *
@@ -71,6 +89,9 @@ public:
     bool alert() const;
     void setAlert(bool alert);
 
+    QString id() const;
+    void setId(const QString &id);
+
     void parseSubscriptionRoom(const QJsonObject &json);
     void parseRoom(const QJsonObject &json);
     void parseUpdateRoom(const QJsonObject &json);
diff --git a/src/roommodel.cpp b/src/roommodel.cpp
index 8542c36..ff18c52 100644
--- a/src/roommodel.cpp
+++ b/src/roommodel.cpp
@@ -47,7 +47,7 @@ RoomModel::~RoomModel()
     if (f.open(QIODevice::WriteOnly)) {
         QDataStream out(&f);
         for (const Room &m : qAsConst(mRoomsList)) {
-            qDebug() << " save cache for room " << m.mName;
+            qCDebug(RUQOLA_LOG) << " save cache for room " << m.mName;
             const QByteArray ms = RoomModel::serialize(m);
             out.writeBytes(ms, ms.size());
         }
@@ -139,35 +139,35 @@ QVariant RoomModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case RoomModel::RoomName:
-        return r.mName;
+        return r.name();
     case RoomModel::RoomID:
-        return r.mId;
+        return r.id();
     case RoomModel::RoomSelected:
-        return r.mSelected;
+        return r.selected();
     case RoomModel::RoomType:
-        return r.mChannelType;
+        return r.channelType();
     case RoomModel::RoomUserID:
-        return r.mUserId;
+        return r.userId();
     case RoomModel::RoomUserName:
-        return r.mUserName;
+        return r.userName();
     case RoomModel::RoomTopic:
-        return r.mTopic;
+        return r.topic();
     case RoomModel::RoomMutedUsers:
-        return r.mMutedUsers;
+        return r.mutedUsers();
     case RoomModel::RoomJitsiTimeout:
-        return r.mJitsiTimeout;
+        return r.jitsiTimeout();
     case RoomModel::RoomRO:
-        return r.mReadOnly;
+        return r.readOnly();
     case RoomModel::RoomAnnoucement:
-        return r.mAnnouncement;
+        return r.announcement();
     case RoomModel::RoomUnread:
-        return r.mUnread;
+        return r.unread();
     case RoomModel::RoomOpen:
-        return r.mOpen;
+        return r.open();
     case RoomModel::RoomAlert:
-        return r.mAlert;
+        return r.alert();
     case RoomModel::RoomFavorite:
-        return r.mFavorite;
+        return r.favorite();
     case RoomModel::RoomOrder:
     {
         QString str;
@@ -296,8 +296,7 @@ void RoomModel::updateRoom(const QString &name, const QString &roomID, const QSt
     auto existingRoom = std::find(mRoomsList.begin(), mRoomsList.end(), room);
     bool present = (existingRoom != mRoomsList.end());
 
-    auto i = std::upper_bound(mRoomsList.begin(), mRoomsList.end(),
-                              room);
+    auto i = std::upper_bound(mRoomsList.begin(), mRoomsList.end(), room);
     int pos = i-mRoomsList.begin();
     qCDebug(RUQOLA_LOG) << pos;
 

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