Git commit c48860f00d842668ac6d3d9cacdebd9035c8535e by Laurent Montel.
Committed on 31/01/2018 at 21:22.
Pushed by mlaurent into branch 'master'.

Coding style

M  +0    -2    autotests/emojimanagertest.cpp
M  +4    -2    autotests/textconvertertest.cpp
M  +6    -6    src/emoji.cpp
M  +0    -1    src/rocketchataccount.cpp
M  +2    -0    src/rocketchatmessage.cpp
M  +1    -1    src/user.cpp
M  +0    -1    src/user.h
M  +0    -1    src/utils.cpp

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

diff --git a/autotests/emojimanagertest.cpp b/autotests/emojimanagertest.cpp
index 7018946..2873f1e 100644
--- a/autotests/emojimanagertest.cpp
+++ b/autotests/emojimanagertest.cpp
@@ -84,7 +84,6 @@ void EmojiManagerTest::shouldGenerateHtml()
     //It exists
     QCOMPARE(manager.html(QStringLiteral(":react_rocket:")), QStringLitera=
l("<img height=3D'22' width=3D'22' src=3D'http://www.kde.org/emoji-custom/r=
eact_rocket.png'/>"));
 =

-
     QCOMPARE(manager.html(QStringLiteral(":totoro:")), QStringLiteral("<im=
g height=3D'22' width=3D'22' src=3D'http://www.kde.org/emoji-custom/totoro.=
gif'/>"));
 =

     //Test aliases
@@ -113,5 +112,4 @@ void EmojiManagerTest::shouldChangeServerUrl()
     serverUrl =3D QStringLiteral("www.bla.org");
     manager.setServerUrl(serverUrl);
     QCOMPARE(manager.html(QStringLiteral(":react_rocket:")), QStringLitera=
l("<img height=3D'22' width=3D'22' src=3D'http://%1/emoji-custom/react_rock=
et.png'/>").arg(serverUrl));
-
 }
diff --git a/autotests/textconvertertest.cpp b/autotests/textconvertertest.=
cpp
index baf6740..45ab78c 100644
--- a/autotests/textconvertertest.cpp
+++ b/autotests/textconvertertest.cpp
@@ -60,12 +60,14 @@ void TextConverterTest::shouldConvertTextWithEmoji_data=
()
                                              << QStringLiteral("<img heigh=
t=3D'22' width=3D'22' src=3D'http://www.kde.org/emoji-custom/totoro.gif'/>")
                                              << QStringLiteral("www.kde.or=
g");
     QTest::newRow("customemojiwithmanager2") << QStringLiteral(":totoro::t=
otoro:")
-                                             << QStringLiteral("<img heigh=
t=3D'22' width=3D'22' src=3D'http://www.kde.org/emoji-custom/totoro.gif'/><=
img height=3D'22' width=3D'22' src=3D'http://www.kde.org/emoji-custom/totor=
o.gif'/>")
+                                             << QStringLiteral(
+        "<img height=3D'22' width=3D'22' src=3D'http://www.kde.org/emoji-c=
ustom/totoro.gif'/><img height=3D'22' width=3D'22' src=3D'http://www.kde.or=
g/emoji-custom/totoro.gif'/>")
                                              << QStringLiteral("www.kde.or=
g");
 =

     //Use server with http://
     QTest::newRow("customemojiwithmanager2") << QStringLiteral(":totoro::t=
otoro:")
-                                             << QStringLiteral("<img heigh=
t=3D'22' width=3D'22' src=3D'http://www.kde.org/emoji-custom/totoro.gif'/><=
img height=3D'22' width=3D'22' src=3D'http://www.kde.org/emoji-custom/totor=
o.gif'/>")
+                                             << QStringLiteral(
+        "<img height=3D'22' width=3D'22' src=3D'http://www.kde.org/emoji-c=
ustom/totoro.gif'/><img height=3D'22' width=3D'22' src=3D'http://www.kde.or=
g/emoji-custom/totoro.gif'/>")
                                              << QStringLiteral("http://www=
.kde.org");
     //TODO add alias support too
 }
diff --git a/src/emoji.cpp b/src/emoji.cpp
index bcb7879..d78d0ff 100644
--- a/src/emoji.cpp
+++ b/src/emoji.cpp
@@ -33,7 +33,7 @@ Emoji::~Emoji()
 =

 bool Emoji::hasEmoji(const QString &identifier) const
 {
-    return ((mEmojiIdentifier =3D=3D identifier) || mAliases.contains(iden=
tifier));
+    return (mEmojiIdentifier =3D=3D identifier) || mAliases.contains(ident=
ifier);
 }
 =

 void Emoji::parseEmoji(const QJsonObject &emoji)
@@ -138,11 +138,11 @@ QString Emoji::name() const
 =

 bool Emoji::operator=3D=3D(const Emoji &other) const
 {
-    return (mName =3D=3D other.name()) &&
-            (mExtension =3D=3D other.extension()) &&
-            (mIdentifier =3D=3D other.identifier() &&
-             (mAliases =3D=3D other.aliases()) &&
-             (mEmojiIdentifier =3D=3D other.emojiIdentifier()));
+    return (mName =3D=3D other.name())
+           && (mExtension =3D=3D other.extension())
+           && (mIdentifier =3D=3D other.identifier()
+               && (mAliases =3D=3D other.aliases())
+               && (mEmojiIdentifier =3D=3D other.emojiIdentifier()));
 }
 =

 Emoji &Emoji::operator=3D(const Emoji &other)
diff --git a/src/rocketchataccount.cpp b/src/rocketchataccount.cpp
index 8cdc72b..e498748 100644
--- a/src/rocketchataccount.cpp
+++ b/src/rocketchataccount.cpp
@@ -658,7 +658,6 @@ void RocketChatAccount::parseOtr(const QJsonArray &cont=
ents)
     const Otr t =3D mOtrManager->parseOtr(contents);
     qDebug() << " void RocketChatAccount::parseOtr(const QJsonArray &conte=
nts)"<<t;
     //TODO add notification ?
-
 }
 =

 void RocketChatAccount::sendNotification(const QJsonArray &contents)
diff --git a/src/rocketchatmessage.cpp b/src/rocketchatmessage.cpp
index 7c07b14..070763e 100644
--- a/src/rocketchatmessage.cpp
+++ b/src/rocketchatmessage.cpp
@@ -226,6 +226,7 @@ RocketChatMessage::RocketChatMessageResult RocketChatMe=
ssage::setRoomJoinCode(co
 {
     return saveRoomSettings(QStringLiteral("joinCode"), roomId, joinCode, =
id);
 }
+
 //TODO verify
 RocketChatMessage::RocketChatMessageResult RocketChatMessage::blockUser(co=
nst QString &userId, quint64 id)
 {
@@ -234,6 +235,7 @@ RocketChatMessage::RocketChatMessageResult RocketChatMe=
ssage::blockUser(const QS
                             }};
     return generateMethod(QStringLiteral("unblockUser"), QJsonDocument(par=
ams), id);
 }
+
 //TODO verify
 RocketChatMessage::RocketChatMessageResult RocketChatMessage::unblockUser(=
const QString &userId, quint64 id)
 {
diff --git a/src/user.cpp b/src/user.cpp
index 3cc8b91..c06b950 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -74,7 +74,7 @@ bool User::operator =3D=3D(const User &other) const
     return (mName =3D=3D other.name())
            && (mUserId =3D=3D other.userId())
            && (mStatus =3D=3D other.status())
-            && (mUserName =3D=3D other.userName());
+           && (mUserName =3D=3D other.userName());
 }
 =

 bool User::operator !=3D(const User &other) const
diff --git a/src/user.h b/src/user.h
index da6dcb0..01b8862 100644
--- a/src/user.h
+++ b/src/user.h
@@ -54,7 +54,6 @@ public:
     QString status() const;
     void setStatus(const QString &status);
 =

-
     void parseUser(const QJsonObject &json);
     Q_INVOKABLE QString iconFromStatus() const;
 =

diff --git a/src/utils.cpp b/src/utils.cpp
index d9d41fd..dea1d93 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -134,4 +134,3 @@ void Utils::parseNotification(const QJsonArray &content=
s, QString &message, QStr
         qCDebug(RUQOLA_LOG) << "Problem with notication json: missing payl=
oad";
     }
 }
-