Fix minor stylistic issues with the code

Closes GH-278.

diff --git a/src/common/message.h b/src/common/message.h
index d61a8a7..6254a2f 100644 (file)
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -66,9 +66,11 @@ public:
     };
     Q_DECLARE_FLAGS(Flags, Flag)
 
     };
     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,
     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; }
 
     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 addb1d5..8a81021 100644 (file)
--- 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 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) {
         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 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) {
         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 1711b23..4c75e09 100644 (file)
--- 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,
        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
 )
        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 59329e1..df3c839 100644 (file)
--- 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,
        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 8c012ac..3782f71 100644 (file)
--- 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) {
 {
     CoreNetwork *currentNetwork = network(bufferInfo.networkId());
     if (!currentNetwork) {

-        return "";
+        return {};

     }
 
     if (bufferInfo.type() != BufferInfo::ChannelBuffer) {
     }
 
     if (bufferInfo.type() != BufferInfo::ChannelBuffer) {

-        return "";
+        return {};

     }
 
     IrcChannel *currentChannel = currentNetwork->ircChannel(bufferInfo.bufferName());
     if (!currentChannel) {
     }
 
     IrcChannel *currentChannel = currentNetwork->ircChannel(bufferInfo.bufferName());
     if (!currentChannel) {

-        return "";
+        return {};

     }
 
     const QString modes = currentChannel->userModes(nickFromMask(sender).toLower());
     }
 
     const QString modes = currentChannel->userModes(nickFromMask(sender).toLower());

diff --git a/src/core/sql.qrc b/src/core/sql.qrc
index 1eee7d0..63c884a 100644 (file)
--- a/src/core/sql.qrc
+++ b/src/core/sql.qrc
@@ -104,7 +104,7 @@
     <file>./SQL/PostgreSQL/version/21/upgrade_000_add_function_backlog_lastmsgid_update.sql</file>
     <file>./SQL/PostgreSQL/version/21/upgrade_001_add_trigger_backlog_lastmsgid_update.sql</file>
     <file>./SQL/PostgreSQL/version/22/upgrade_000_alter_quasseluser_add_authenticator.sql</file>
     <file>./SQL/PostgreSQL/version/21/upgrade_000_add_function_backlog_lastmsgid_update.sql</file>
     <file>./SQL/PostgreSQL/version/21/upgrade_001_add_trigger_backlog_lastmsgid_update.sql</file>
     <file>./SQL/PostgreSQL/version/22/upgrade_000_alter_quasseluser_add_authenticator.sql</file>

-    <file>./SQL/PostgreSQL/version/23/upgrade_000_create_mode.sql</file>
+    <file>./SQL/PostgreSQL/version/23/upgrade_000_create_senderprefixes.sql</file>

     <file>./SQL/SQLite/delete_backlog_by_uid.sql</file>
     <file>./SQL/SQLite/delete_backlog_for_buffer.sql</file>
     <file>./SQL/SQLite/delete_backlog_for_network.sql</file>
     <file>./SQL/SQLite/delete_backlog_by_uid.sql</file>
     <file>./SQL/SQLite/delete_backlog_for_buffer.sql</file>
     <file>./SQL/SQLite/delete_backlog_for_network.sql</file>


@@ -282,6 +282,6 @@
     <file>./SQL/SQLite/version/22/upgrade_000_add_trigger_backlog_lastmsgid_update_direct_insert.sql</file>
     <file>./SQL/SQLite/version/22/upgrade_001_add_trigger_backlog_lastmsgid_update_direct_update.sql</file>
     <file>./SQL/SQLite/version/23/upgrade_000_alter_quasseluser_add_authenticator.sql</file>
     <file>./SQL/SQLite/version/22/upgrade_000_add_trigger_backlog_lastmsgid_update_direct_insert.sql</file>
     <file>./SQL/SQLite/version/22/upgrade_001_add_trigger_backlog_lastmsgid_update_direct_update.sql</file>
     <file>./SQL/SQLite/version/23/upgrade_000_alter_quasseluser_add_authenticator.sql</file>

-    <file>./SQL/SQLite/version/24/upgrade_000_create_mode.sql</file>
+    <file>./SQL/SQLite/version/24/upgrade_000_create_senderprefixes.sql</file>

 </qresource>
 </RCC>
 </qresource>
 </RCC>