[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [ruqola] /: Rename variable
From: Montel Laurent <null () kde ! org>
Date: 2017-08-28 6:22:18
Message-ID: E1dmDRC-0005tk-FC () code ! kde ! org
[Download RAW message or body]
Git commit 6702a7cfd35647c60ef1834ad0df30d9a19a0271 by Montel Laurent.
Committed on 28/08/2017 at 06:10.
Pushed by mlaurent into branch 'master'.
Rename variable
M +13 -13 autotests/roommodeltest.cpp
M +3 -3 src/rocketchatbackend.cpp
M +35 -35 src/room.cpp
M +15 -14 src/room.h
M +49 -49 src/roommodel.cpp
M +2 -2 src/roomwrapper.cpp
https://commits.kde.org/ruqola/6702a7cfd35647c60ef1834ad0df30d9a19a0271
diff --git a/autotests/roommodeltest.cpp b/autotests/roommodeltest.cpp
index 3db25a1..3978d73 100644
--- a/autotests/roommodeltest.cpp
+++ b/autotests/roommodeltest.cpp
@@ -36,20 +36,20 @@ void RoomModelTest::shouldSerialized()
{
Room input;
input.id = QStringLiteral("foo");
- input.type = QStringLiteral("p");
- input.name = QStringLiteral("d");
+ input.mChannelType = QStringLiteral("p");
+ input.mName = QStringLiteral("d");
input.mAnnouncement = QStringLiteral("AA");
- input.userName = QStringLiteral("pp");
- input.userID = QStringLiteral("sdfsdfs");
- input.topic = QStringLiteral("topic");
- input.mutedUsers = QStringLiteral("mutedUsers");
- input.jitsiTimeout = 55;
- input.ro = true;
- input.unread = 66;
- input.selected = true;
- input.favorite = true;
- input.alert = true;
- input.open = true;
+ input.mUserName = QStringLiteral("pp");
+ input.mUserId = QStringLiteral("sdfsdfs");
+ input.mTopic = QStringLiteral("topic");
+ input.mMutedUsers = QStringLiteral("mutedUsers");
+ input.mJitsiTimeout = 55;
+ input.mReadOnly = true;
+ input.mUnread = 66;
+ input.mSelected = true;
+ input.mFavorite = true;
+ input.mAlert = true;
+ input.mOpen = true;
const QByteArray ba = RoomModel::serialize(input);
Room output = RoomModel::fromJSon(QJsonObject(QJsonDocument::fromBinaryData(ba).object()));
QVERIFY(input.isEqual(output));
diff --git a/src/rocketchatbackend.cpp b/src/rocketchatbackend.cpp
index 42f8cde..eabdec8 100644
--- a/src/rocketchatbackend.cpp
+++ b/src/rocketchatbackend.cpp
@@ -56,8 +56,8 @@ void rooms_parsing(const QJsonDocument &doc, RocketChatAccount \
*account) if (account->loginStatus() == DDPClient::LoggedIn) {
Room r;
r.parseRoom(roomJson);
- qCDebug(RUQOLA_LOG) << "Adding room" << r.id << r.topic << \
r.mAnnouncement;
- model->updateRoom(r.name, r.id, r.topic, r.mAnnouncement);
+ qCDebug(RUQOLA_LOG) << "Adding room" << r.id << r.mTopic << \
r.mAnnouncement; + model->updateRoom(r.mName, r.id, r.mTopic, \
r.mAnnouncement); }
}
}
@@ -89,7 +89,7 @@ void getsubscription_parsing(const QJsonDocument &doc, \
RocketChatAccount *accoun if (account->loginStatus() == DDPClient::LoggedIn) {
Room r;
r.parseSubscriptionRoom(room);
- qCDebug(RUQOLA_LOG) << "Adding room subscription" << r.name << r.id \
<< r.topic; + qCDebug(RUQOLA_LOG) << "Adding room subscription" << \
r.mName << r.id << r.mTopic;
model->addRoom(r);
}
diff --git a/src/room.cpp b/src/room.cpp
index e88a6f5..0e19205 100644
--- a/src/room.cpp
+++ b/src/room.cpp
@@ -34,43 +34,43 @@ bool Room::operator==(const Room &other) const
bool Room::operator<(const Room &other) const
{
- return name < other.name;
+ return mName < other.mName;
}
bool Room::isEqual(const Room &other) const
{
return (id == other.id)
- && (type == other.type)
- && (name == other.name)
+ && (mChannelType == other.mChannelType)
+ && (mName == other.mName)
&& (mAnnouncement == other.mAnnouncement)
- && (userName == other.userName)
- && (userID == other.userID)
- && (topic == other.topic)
- && (mutedUsers == other.mutedUsers)
- && (jitsiTimeout == other.jitsiTimeout)
- && (ro == other.ro)
- && (unread == other.unread)
- && (selected == other.selected)
- && (favorite == other.favorite)
- && (open == other.open);
+ && (mUserName == other.mUserName)
+ && (mUserId == other.mUserId)
+ && (mTopic == other.mTopic)
+ && (mMutedUsers == other.mMutedUsers)
+ && (mJitsiTimeout == other.mJitsiTimeout)
+ && (mReadOnly == other.mReadOnly)
+ && (mUnread == other.mUnread)
+ && (mSelected == other.mSelected)
+ && (mFavorite == other.mFavorite)
+ && (mOpen == other.mOpen);
}
QDebug operator <<(QDebug d, const Room &t)
{
d << "id :" << t.id;
- d << "type :" << t.type;
- d << "name :" << t.name;
+ d << "type :" << t.mChannelType;
+ d << "name :" << t.mName;
d << "mAnnouncement :" << t.mAnnouncement;
- d << "userName :" << t.userName;
- d << "userID :" << t.userID;
- d << "topic :" << t.topic;
- d << "mutedUsers :" << t.mutedUsers;
- d << "jitsiTimeout :" << t.jitsiTimeout;
- d << "ro :" << t.ro;
- d << "unread :" << t.unread;
- d << "selected :" << t.selected;
- d << "favorite :" << t.favorite;
- d << "open :" << t.open;
+ d << "userName :" << t.mUserName;
+ d << "userID :" << t.mUserId;
+ d << "topic :" << t.mTopic;
+ d << "mutedUsers :" << t.mMutedUsers;
+ d << "jitsiTimeout :" << t.mJitsiTimeout;
+ d << "ro :" << t.mReadOnly;
+ d << "unread :" << t.mUnread;
+ d << "selected :" << t.mSelected;
+ d << "favorite :" << t.mFavorite;
+ d << "open :" << t.mOpen;
return d;
}
@@ -82,8 +82,8 @@ void Room::parseUpdateRoom(const QJsonObject &json)
void Room::parseRoom(const QJsonObject &json)
{
id = json.value(QStringLiteral("_id")).toString();
- name = json[QStringLiteral("name")].toString();
- topic = json[QStringLiteral("topic")].toString();
+ mName = json[QStringLiteral("name")].toString();
+ mTopic = json[QStringLiteral("topic")].toString();
mAnnouncement = json[QStringLiteral("announcement")].toString();
}
@@ -91,20 +91,20 @@ void Room::parseSubscriptionRoom(const QJsonObject &json)
{
const QString roomID = json.value(QStringLiteral("rid")).toString();
id = roomID;
- name = json[QStringLiteral("name")].toString();
- topic = json[QStringLiteral("topic")].toString();
+ mName = json[QStringLiteral("name")].toString();
+ mTopic = json[QStringLiteral("topic")].toString();
mAnnouncement = json[QStringLiteral("announcement")].toString();
const QString roomType = json.value(QStringLiteral("t")).toString();
- type = roomType;
+ mChannelType = roomType;
QJsonValue favoriteValue = json.value(QStringLiteral("f"));
if (!favoriteValue.isUndefined()) {
- favorite = favoriteValue.toBool();
+ mFavorite = favoriteValue.toBool();
}
//Only private room has this settings.
if (roomType == QLatin1String("p")) {
- ro = json[QStringLiteral("ro")].toString() == QLatin1String("true");
+ mReadOnly = json[QStringLiteral("ro")].toString() == QLatin1String("true");
}
- unread = json[QStringLiteral("unread")].toInt();
- open = json[QStringLiteral("open")].toBool();
- alert = json[QStringLiteral("alert")].toBool();
+ mUnread = json[QStringLiteral("unread")].toInt();
+ mOpen = json[QStringLiteral("open")].toBool();
+ mAlert = json[QStringLiteral("alert")].toBool();
}
diff --git a/src/room.h b/src/room.h
index bde6e3f..7ebd3d8 100644
--- a/src/room.h
+++ b/src/room.h
@@ -49,7 +49,7 @@ public:
*/
QString getName() const
{
- return name;
+ return mName;
}
void parseSubscriptionRoom(const QJsonObject &json);
@@ -63,37 +63,38 @@ public:
QString id;
// t (can take values "d" , "c" or "p")
- QString type;
+ QString mChannelType;
// name
- QString name;
+ QString mName;
// Announcement
QString mAnnouncement;
// u
- QString userName;
- QString userID;
+ QString mUserName;
+ QString mUserId;
// topic
- QString topic;
+ QString mTopic;
// muted - collection of muted users by its usernames
- QString mutedUsers; // --> TODO: this really is a list - it requires some more \
work + QString mMutedUsers; // --> TODO: this really is a list - it requires some \
more work
// jitsiTimeout
- qint64 jitsiTimeout = -1;
+ qint64 mJitsiTimeout = -1;
// ro - read-only chat or not
- bool ro = false;
+ bool mReadOnly = false;
- int unread = -1;
- bool selected = false;
- bool favorite = false;
+ //quint64 ?
+ int mUnread = -1;
+ bool mSelected = false;
+ bool mFavorite = false;
//We can hide it or not.
- bool open = false;
+ bool mOpen = false;
- bool alert = false;
+ bool mAlert = false;
};
LIBRUQOLACORE_EXPORT QDebug operator <<(QDebug d, const Room &t);
diff --git a/src/roommodel.cpp b/src/roommodel.cpp
index d5ca372..fcb402a 100644
--- a/src/roommodel.cpp
+++ b/src/roommodel.cpp
@@ -45,7 +45,7 @@ RoomModel::~RoomModel()
if (f.open(QIODevice::WriteOnly)) {
QDataStream out(&f);
for (const Room &m : qAsConst(mRoomsList)) {
- qDebug() << " save cache for room " << m.name;
+ qDebug() << " save cache for room " << m.mName;
const QByteArray ms = RoomModel::serialize(m);
out.writeBytes(ms, ms.size());
}
@@ -136,48 +136,48 @@ QVariant RoomModel::data(const QModelIndex &index, int role) \
const
switch (role) {
case RoomModel::RoomName:
- return r.name;
+ return r.mName;
case RoomModel::RoomID:
return r.id;
case RoomModel::RoomSelected:
- return r.selected;
+ return r.mSelected;
case RoomModel::RoomType:
- return r.type;
+ return r.mChannelType;
case RoomModel::RoomUserID:
- return r.userID;
+ return r.mUserId;
case RoomModel::RoomUserName:
- return r.userName;
+ return r.mUserName;
case RoomModel::RoomTopic:
- return r.topic;
+ return r.mTopic;
case RoomModel::RoomMutedUsers:
- return r.mutedUsers;
+ return r.mMutedUsers;
case RoomModel::RoomJitsiTimeout:
- return r.jitsiTimeout;
+ return r.mJitsiTimeout;
case RoomModel::RoomRO:
- return r.ro;
+ return r.mReadOnly;
case RoomModel::RoomAnnoucement:
return r.mAnnouncement;
case RoomModel::RoomUnread:
- return r.unread;
+ return r.mUnread;
case RoomModel::RoomOpen:
- return r.open;
+ return r.mOpen;
case RoomModel::RoomAlert:
- return r.alert;
+ return r.mAlert;
case RoomModel::RoomOrder:
{
QString str;
- if (r.favorite) {
+ if (r.mFavorite) {
str = tr("Favorites");
} else {
- if (r.type == QLatin1String("c")) {
+ if (r.mChannelType == QLatin1String("c")) {
str = tr("Rooms");
- } else if (r.type == QLatin1String("d")) {
+ } else if (r.mChannelType == QLatin1String("d")) {
str = tr("Private Message");
} else {
str = QString();
}
}
- qDebug() <<" str " << str << " name "<< r.name;
+ qDebug() <<" str " << str << " name "<< r.mName;
return str;
}
}
@@ -194,8 +194,8 @@ void RoomModel::addRoom(const QString &roomID, const QString \
&roomName, bool sel
Room r;
r.id = roomID;
- r.name = roomName;
- r.selected = selected;
+ r.mName = roomName;
+ r.mSelected = selected;
addRoom(r);
}
@@ -246,7 +246,7 @@ void RoomModel::updateSubscription(const QJsonArray &array)
qDebug() << " name " << roomData.value(QStringLiteral("name")) << " rid " << \
roomData.value(QStringLiteral("rid")); Room room;
room.id = roomData.value(QStringLiteral("rid")).toString();
- room.name = roomData.value(QStringLiteral("name")).toString();
+ room.mName = roomData.value(QStringLiteral("name")).toString();
auto existingRoom = std::find(mRoomsList.begin(), mRoomsList.end(), room);
bool present = (existingRoom != mRoomsList.end());
if (present) {
@@ -281,7 +281,7 @@ void RoomModel::updateRoom(const QJsonArray &array)
const QString roomName = roomData.value(QStringLiteral("name")).toString();
if (!roomName.isEmpty()) {
for (int i = 0; i < mRoomsList.size(); ++i) {
- if (mRoomsList.at(i).name == roomName) {
+ if (mRoomsList.at(i).mName == roomName) {
//TODO update it.
break;
}
@@ -294,7 +294,7 @@ void RoomModel::updateRoom(const QString &name, const QString \
&roomID, const QSt {
Room room;
room.id = roomID;
- room.name = name;
+ room.mName = name;
auto existingRoom = std::find(mRoomsList.begin(), mRoomsList.end(), room);
bool present = (existingRoom != mRoomsList.end());
@@ -318,7 +318,7 @@ void RoomModel::updateRoom(const QString &name, const QString \
&roomID, const QSt
if (roomChanged) {
Room foundRoom = mRoomsList.value(pos - 1);
- foundRoom.topic = topic;
+ foundRoom.mTopic = topic;
foundRoom.mAnnouncement = announcement;
mRoomsList.replace(pos - 1, foundRoom);
}
@@ -333,20 +333,20 @@ 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);
+ r.mChannelType = o[QStringLiteral("t")].toString();
+ r.mName = o[QStringLiteral("name")].toString();
+ r.mUserName = o[QStringLiteral("userName")].toString();
+ r.mUserId = o[QStringLiteral("userID")].toString();
+ r.mTopic = o[QStringLiteral("topic")].toString();
+ r.mMutedUsers = o[QStringLiteral("mutedUsers")].toString();
+ r.mJitsiTimeout = o[QStringLiteral("jitsiTimeout")].toDouble();
+ r.mReadOnly = o[QStringLiteral("ro")].toBool();
+ r.mUnread = o[QStringLiteral("unread")].toInt(0);
r.mAnnouncement = o[QStringLiteral("announcement")].toString();
- r.selected = o[QStringLiteral("selected")].toBool();
- r.favorite = o[QStringLiteral("favorite")].toBool();
- r.alert = o[QStringLiteral("alert")].toBool();
- r.open = o[QStringLiteral("open")].toBool();
+ r.mSelected = o[QStringLiteral("selected")].toBool();
+ r.mFavorite = o[QStringLiteral("favorite")].toBool();
+ r.mAlert = o[QStringLiteral("alert")].toBool();
+ r.mOpen = o[QStringLiteral("open")].toBool();
return r;
}
@@ -357,20 +357,20 @@ QByteArray RoomModel::serialize(const Room &r)
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;
+ o[QStringLiteral("t")] = r.mChannelType;
+ o[QStringLiteral("name")] = r.mName;
+ o[QStringLiteral("userName")] = r.mUserName;
+ o[QStringLiteral("userID")] = r.mUserId;
+ o[QStringLiteral("topic")] = r.mTopic;
+ o[QStringLiteral("mutedUsers")] = r.mMutedUsers;
+ o[QStringLiteral("jitsiTimeout")] = r.mJitsiTimeout;
+ o[QStringLiteral("ro")] = r.mReadOnly;
+ o[QStringLiteral("unread")] = r.mUnread;
o[QStringLiteral("announcement")] = r.mAnnouncement;
- o[QStringLiteral("selected")] = r.selected;
- o[QStringLiteral("favorite")] = r.favorite;
- o[QStringLiteral("alert")] = r.alert;
- o[QStringLiteral("open")] = r.open;
+ o[QStringLiteral("selected")] = r.mSelected;
+ o[QStringLiteral("favorite")] = r.mFavorite;
+ o[QStringLiteral("alert")] = r.mAlert;
+ o[QStringLiteral("open")] = r.mOpen;
d.setObject(o);
return d.toBinaryData();
diff --git a/src/roomwrapper.cpp b/src/roomwrapper.cpp
index a1acad6..3c4a904 100644
--- a/src/roomwrapper.cpp
+++ b/src/roomwrapper.cpp
@@ -36,12 +36,12 @@ RoomWrapper::RoomWrapper(const Room &r, QObject *parent)
QString RoomWrapper::name() const
{
- return mRoom.name;
+ return mRoom.mName;
}
QString RoomWrapper::topic() const
{
- return mRoom.topic;
+ return mRoom.mTopic;
}
QString RoomWrapper::announcement() const
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic