From: Janne Koschinski Date: Sun, 3 Sep 2017 20:41:00 +0000 (+0200) Subject: Fix minor stylistic issues with the code X-Git-Tag: travis-deploy-test~253 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=13a1c223286e5cc174177810d30298cf843f0973 Fix minor stylistic issues with the code Closes GH-278. --- diff --git a/src/common/message.h b/src/common/message.h index d61a8a72..6254a2fe 100644 --- a/src/common/message.h +++ b/src/common/message.h @@ -66,9 +66,11 @@ public: }; Q_DECLARE_FLAGS(Flags, Flag) - Message(const BufferInfo &bufferInfo = BufferInfo(), Type type = Plain, const QString &contents = "", const QString &sender = "", const QString &senderPrefixes = "", Flags flags = None); + Message(const BufferInfo &bufferInfo = BufferInfo(), Type type = Plain, const QString &contents = {}, + const QString &sender = {}, const QString &senderPrefixes = {}, Flags flags = None); Message(const QDateTime &ts, const BufferInfo &buffer = BufferInfo(), Type type = Plain, - const QString &contents = "", const QString &sender = "", const QString &senderPrefixes = "", Flags flags = None); + const QString &contents = {}, const QString &sender = {}, const QString &senderPrefixes = {}, + Flags flags = None); inline static Message ChangeOfDay(const QDateTime &day) { return Message(day, BufferInfo(), DayChange); } inline const MsgId &msgId() const { return _msgId; } diff --git a/src/common/network.h b/src/common/network.h index addb1d5f..8a810216 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -180,11 +180,11 @@ public : QString prefixToMode(const QString &prefix) const; inline QString prefixToMode(const QCharRef &prefix) const { return prefixToMode(QString(prefix)); } inline QString prefixesToModes(const QString &prefix) const { - QString mode = ""; + QString modes; for (QChar c : prefix) { - mode += prefixToMode(c); + modes += prefixToMode(c); } - return mode; + return modes; } /**@}*/ @@ -196,11 +196,11 @@ public : QString modeToPrefix(const QString &mode) const; inline QString modeToPrefix(const QCharRef &mode) const { return modeToPrefix(QString(mode)); } inline QString modesToPrefixes(const QString &mode) const { - QString prefix = ""; + QString prefixes; for (QChar c : mode) { - prefix += modeToPrefix(c); + prefixes += modeToPrefix(c); } - return prefix; + return prefixes; } /**@}*/ diff --git a/src/core/SQL/PostgreSQL/setup_060_backlog.sql b/src/core/SQL/PostgreSQL/setup_060_backlog.sql index 1711b231..4c75e099 100644 --- a/src/core/SQL/PostgreSQL/setup_060_backlog.sql +++ b/src/core/SQL/PostgreSQL/setup_060_backlog.sql @@ -5,6 +5,6 @@ CREATE TABLE backlog ( type integer NOT NULL, flags integer NOT NULL, senderid integer NOT NULL REFERENCES sender (senderid) ON DELETE SET NULL, - senderprefixes TEXT, + senderprefixes TEXT, message TEXT ) diff --git a/src/core/SQL/PostgreSQL/version/23/upgrade_000_create_mode.sql b/src/core/SQL/PostgreSQL/version/23/upgrade_000_create_senderprefixes.sql similarity index 100% rename from src/core/SQL/PostgreSQL/version/23/upgrade_000_create_mode.sql rename to src/core/SQL/PostgreSQL/version/23/upgrade_000_create_senderprefixes.sql diff --git a/src/core/SQL/SQLite/setup_060_backlog.sql b/src/core/SQL/SQLite/setup_060_backlog.sql index 59329e1f..df3c839d 100644 --- a/src/core/SQL/SQLite/setup_060_backlog.sql +++ b/src/core/SQL/SQLite/setup_060_backlog.sql @@ -5,5 +5,6 @@ CREATE TABLE backlog ( type INTEGER NOT NULL, flags INTEGER NOT NULL, senderid INTEGER NOT NULL, - senderprefixes TEXT, - message TEXT) + senderprefixes TEXT, + message TEXT +) diff --git a/src/core/SQL/SQLite/version/24/upgrade_000_create_mode.sql b/src/core/SQL/SQLite/version/24/upgrade_000_create_senderprefixes.sql similarity index 100% rename from src/core/SQL/SQLite/version/24/upgrade_000_create_mode.sql rename to src/core/SQL/SQLite/version/24/upgrade_000_create_senderprefixes.sql diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 8c012acc..3782f71d 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -428,16 +428,16 @@ QString CoreSession::senderPrefixes(const QString &sender, const BufferInfo &buf { CoreNetwork *currentNetwork = network(bufferInfo.networkId()); if (!currentNetwork) { - return ""; + return {}; } if (bufferInfo.type() != BufferInfo::ChannelBuffer) { - return ""; + return {}; } IrcChannel *currentChannel = currentNetwork->ircChannel(bufferInfo.bufferName()); if (!currentChannel) { - return ""; + return {}; } const QString modes = currentChannel->userModes(nickFromMask(sender).toLower()); diff --git a/src/core/sql.qrc b/src/core/sql.qrc index 1eee7d0d..63c884ad 100644 --- a/src/core/sql.qrc +++ b/src/core/sql.qrc @@ -104,7 +104,7 @@ ./SQL/PostgreSQL/version/21/upgrade_000_add_function_backlog_lastmsgid_update.sql ./SQL/PostgreSQL/version/21/upgrade_001_add_trigger_backlog_lastmsgid_update.sql ./SQL/PostgreSQL/version/22/upgrade_000_alter_quasseluser_add_authenticator.sql - ./SQL/PostgreSQL/version/23/upgrade_000_create_mode.sql + ./SQL/PostgreSQL/version/23/upgrade_000_create_senderprefixes.sql ./SQL/SQLite/delete_backlog_by_uid.sql ./SQL/SQLite/delete_backlog_for_buffer.sql ./SQL/SQLite/delete_backlog_for_network.sql @@ -282,6 +282,6 @@ ./SQL/SQLite/version/22/upgrade_000_add_trigger_backlog_lastmsgid_update_direct_insert.sql ./SQL/SQLite/version/22/upgrade_001_add_trigger_backlog_lastmsgid_update_direct_update.sql ./SQL/SQLite/version/23/upgrade_000_alter_quasseluser_add_authenticator.sql - ./SQL/SQLite/version/24/upgrade_000_create_mode.sql + ./SQL/SQLite/version/24/upgrade_000_create_senderprefixes.sql