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

List:       kde-commits
Subject:    [ruqola] src: Coding style
From:       Montel Laurent <null () kde ! org>
Date:       2017-08-08 12:00:28
Message-ID: E1df3BU-0005vN-9F () code ! kde ! org
[Download RAW message or body]

Git commit 7b7412014e5ee3f124a59f93ce47aa69080bd8c6 by Montel Laurent.
Committed on 08/08/2017 at 11:53.
Pushed by mlaurent into branch 'master'.

Coding style

M  +42   -42   src/roommodel.cpp
M  +2    -2    src/roommodel.h

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

diff --git a/src/roommodel.cpp b/src/roommodel.cpp
index 77836fe..3ebe0bd 100644
--- a/src/roommodel.cpp
+++ b/src/roommodel.cpp
@@ -35,59 +35,21 @@ RoomWrapper::RoomWrapper(QObject *parent)
 RoomWrapper::RoomWrapper(const Room &r, QObject *parent)
     : QObject(parent)
 {
-    m_name = r.name;
-    m_topic = r.topic;
+    mName = r.name;
+    mTopic = r.topic;
     m_unread = r.unread;
     m_id = r.id;
     m_selected = r.selected;
 }
 
-Room RoomModel::fromJSon(const QJsonObject &o)
-{
-    Room r;
-
-    r.id = o[QStringLiteral("id")].toString();
-    r.type = o[QStringLiteral("t")].toString();
-    r.name = o[QStringLiteral("name")].toString();
-    r.userName = o[QStringLiteral("userName")].toString();
-    r.userID = o[QStringLiteral("userID")].toString();
-    r.topic = o[QStringLiteral("topic")].toString();
-    r.mutedUsers = o[QStringLiteral("mutedUsers")].toString();
-    r.jitsiTimeout = o[QStringLiteral("jitsiTimeout")].toDouble();
-    r.ro = o[QStringLiteral("ro")].toBool();
-    r.unread = o[QStringLiteral("unread")].toInt(0);
-
-    return r;
-}
-
-QByteArray RoomModel::serialize(const Room &r)
-{
-    QJsonDocument d;
-    QJsonObject o;
-
-    o[QStringLiteral("id")] = r.id;
-    o[QStringLiteral("t")] = r.type;
-    o[QStringLiteral("name")] = r.name;
-    o[QStringLiteral("userName")] = r.userName;
-    o[QStringLiteral("userID")] = r.userID;
-    o[QStringLiteral("topic")] = r.topic;
-    o[QStringLiteral("mutedUsers")] = r.mutedUsers;
-    o[QStringLiteral("jitsiTimeout")] = r.jitsiTimeout;
-    o[QStringLiteral("ro")] = r.ro;
-    o[QStringLiteral("unread")] = r.unread;
-
-    d.setObject(o);
-    return d.toBinaryData();
-}
-
 QString RoomWrapper::getName() const
 {
-    return m_name;
+    return mName;
 }
 
 QString RoomWrapper::getTopic() const
 {
-    return m_topic;
+    return mTopic;
 }
 
 RoomModel::RoomModel(QObject *parent)
@@ -265,3 +227,41 @@ void RoomModel::addRoom(const Room &room)
 
     Ruqola::self()->getModelForRoom(room.id);
 }
+
+Room RoomModel::fromJSon(const QJsonObject &o)
+{
+    Room r;
+
+    r.id = o[QStringLiteral("id")].toString();
+    r.type = o[QStringLiteral("t")].toString();
+    r.name = o[QStringLiteral("name")].toString();
+    r.userName = o[QStringLiteral("userName")].toString();
+    r.userID = o[QStringLiteral("userID")].toString();
+    r.topic = o[QStringLiteral("topic")].toString();
+    r.mutedUsers = o[QStringLiteral("mutedUsers")].toString();
+    r.jitsiTimeout = o[QStringLiteral("jitsiTimeout")].toDouble();
+    r.ro = o[QStringLiteral("ro")].toBool();
+    r.unread = o[QStringLiteral("unread")].toInt(0);
+
+    return r;
+}
+
+QByteArray RoomModel::serialize(const Room &r)
+{
+    QJsonDocument d;
+    QJsonObject o;
+
+    o[QStringLiteral("id")] = r.id;
+    o[QStringLiteral("t")] = r.type;
+    o[QStringLiteral("name")] = r.name;
+    o[QStringLiteral("userName")] = r.userName;
+    o[QStringLiteral("userID")] = r.userID;
+    o[QStringLiteral("topic")] = r.topic;
+    o[QStringLiteral("mutedUsers")] = r.mutedUsers;
+    o[QStringLiteral("jitsiTimeout")] = r.jitsiTimeout;
+    o[QStringLiteral("ro")] = r.ro;
+    o[QStringLiteral("unread")] = r.unread;
+
+    d.setObject(o);
+    return d.toBinaryData();
+}
diff --git a/src/roommodel.h b/src/roommodel.h
index 7c99808..af93a85 100644
--- a/src/roommodel.h
+++ b/src/roommodel.h
@@ -111,8 +111,8 @@ signals:
     void topicChanged();
 
 private:
-    QString m_name;
-    QString m_topic;
+    QString mName;
+    QString mTopic;
     QString m_id;
     int m_unread;
     bool m_selected;

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