modernize: Use '= default' instead of empty ctor/dtor bodies

Also remove lots of unnecessary, empty ctors and dtors.

diff --git a/src/client/abstractui.h b/src/client/abstractui.h
index 2231f55..0a89121 100644 (file)
--- a/src/client/abstractui.h
+++ b/src/client/abstractui.h
@@ -39,7 +39,6 @@ class CLIENT_EXPORT AbstractUi : public QObject
 
 public:
     AbstractUi(QObject *parent = nullptr) : QObject(parent) {}
 
 public:
     AbstractUi(QObject *parent = nullptr) : QObject(parent) {}

-    ~AbstractUi() override {}

     virtual void init() = 0; // called after the client is initialized
     virtual MessageModel *createMessageModel(QObject *parent) = 0;
     virtual AbstractMessageProcessor *createMessageProcessor(QObject *parent) = 0;
     virtual void init() = 0; // called after the client is initialized
     virtual MessageModel *createMessageModel(QObject *parent) = 0;
     virtual AbstractMessageProcessor *createMessageProcessor(QObject *parent) = 0;

diff --git a/src/client/backlogrequester.h b/src/client/backlogrequester.h
index 3fb4680..420ef5d 100644 (file)
--- a/src/client/backlogrequester.h
+++ b/src/client/backlogrequester.h
@@ -41,7 +41,7 @@ public:
     };
 
     BacklogRequester(bool buffering, RequesterType requesterType, ClientBacklogManager *backlogManger);
     };
 
     BacklogRequester(bool buffering, RequesterType requesterType, ClientBacklogManager *backlogManger);

-    virtual inline ~BacklogRequester() {}
+    virtual ~BacklogRequester() = default;

 
     inline bool isBuffering() { return _isBuffering; }
     inline RequesterType type() { return _requesterType; }
 
     inline bool isBuffering() { return _isBuffering; }
     inline RequesterType type() { return _requesterType; }

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index cf0cb8d..47a8981 100644 (file)
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -37,11 +37,6 @@ ClientSettings::ClientSettings(QString g) : Settings(g, Quassel::buildInfo().cli
 }
 
 
 }
 
 

-ClientSettings::~ClientSettings()
-{
-}
-
-

 /***********************************************************************************************/
 
 CoreAccountSettings::CoreAccountSettings(QString subgroup)
 /***********************************************************************************************/
 
 CoreAccountSettings::CoreAccountSettings(QString subgroup)

diff --git a/src/client/clientsettings.h b/src/client/clientsettings.h
index a8980ef..c22eef8 100644 (file)
--- a/src/client/clientsettings.h
+++ b/src/client/clientsettings.h
@@ -31,8 +31,6 @@ class QSslSocket;
 
 class CLIENT_EXPORT ClientSettings : public Settings
 {
 
 class CLIENT_EXPORT ClientSettings : public Settings
 {

-public:
-    ~ClientSettings() override;

 
 protected:
     ClientSettings(QString group = "General");
 
 protected:
     ClientSettings(QString group = "General");

diff --git a/src/client/coreaccount.h b/src/client/coreaccount.h
index d4aed0f..b69552c 100644 (file)
--- a/src/client/coreaccount.h
+++ b/src/client/coreaccount.h
@@ -36,7 +36,7 @@ class CLIENT_EXPORT CoreAccount
 
 public:
     CoreAccount(AccountId accountId = 0);
 
 public:
     CoreAccount(AccountId accountId = 0);

-    virtual ~CoreAccount() {};
+    virtual ~CoreAccount() = default;

 
     inline bool isValid() const { return accountId().isValid(); }
     inline AccountId accountId() const { return _accountId; }
 
     inline bool isValid() const { return accountId().isValid(); }
     inline AccountId accountId() const { return _accountId; }

diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h
index 75259da..f27379c 100644 (file)
--- a/src/client/messagemodel.h
+++ b/src/client/messagemodel.h
@@ -135,16 +135,15 @@ QModelIndex MessageModel::index(int row, int column, const QModelIndex &parent)
 // **************************************************
 //  MessageModelItem
 // **************************************************
 // **************************************************
 //  MessageModelItem
 // **************************************************

+//! Creates a MessageModelItem from a Message object.
+/** This baseclass implementation takes care of all Message data *except* the stylable strings.
+ *  Subclasses need to provide Qt::DisplayRole at least, which should describe the plaintext
+ *  strings without formattings (e.g. for searching purposes).
+ */

 class CLIENT_EXPORT MessageModelItem
 {
 public:
 class CLIENT_EXPORT MessageModelItem
 {
 public:

-    //! Creates a MessageModelItem from a Message object.
-    /** This baseclass implementation takes care of all Message data *except* the stylable strings.
-     *  Subclasses need to provide Qt::DisplayRole at least, which should describe the plaintext
-     *  strings without formattings (e.g. for searching purposes).
-     */
-    MessageModelItem() {}
-    inline virtual ~MessageModelItem() {}
+    inline virtual ~MessageModelItem() = default;

 
     virtual QVariant data(int column, int role) const;
     virtual bool setData(int column, const QVariant &value, int role);
 
     virtual QVariant data(int column, int role) const;
     virtual bool setData(int column, const QVariant &value, int role);

diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp
index e456f6f..768a295 100644 (file)
--- a/src/client/treemodel.cpp
+++ b/src/client/treemodel.cpp
@@ -238,11 +238,6 @@ SimpleTreeItem::SimpleTreeItem(QList<QVariant> data, AbstractTreeItem *parent)
 }
 
 
 }
 
 

-SimpleTreeItem::~SimpleTreeItem()
-{
-}
-
-

 QVariant SimpleTreeItem::data(int column, int role) const
 {
     if (column >= columnCount() || role != Qt::DisplayRole)
 QVariant SimpleTreeItem::data(int column, int role) const
 {
     if (column >= columnCount() || role != Qt::DisplayRole)

diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index db7e5ab..fcb6bd2 100644 (file)
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -107,7 +107,6 @@ class CLIENT_EXPORT SimpleTreeItem : public AbstractTreeItem
 
 public:
     SimpleTreeItem(QList<QVariant> data, AbstractTreeItem *parent = nullptr);
 
 public:
     SimpleTreeItem(QList<QVariant> data, AbstractTreeItem *parent = nullptr);

-    ~SimpleTreeItem() override;

 
     QVariant data(int column, int role) const override;
     bool setData(int column, const QVariant &value, int role) override;
 
     QVariant data(int column, int role) const override;
     bool setData(int column, const QVariant &value, int role) override;

diff --git a/src/common/event.h b/src/common/event.h
index 02caa83..b652587 100644 (file)
--- a/src/common/event.h
+++ b/src/common/event.h
@@ -33,7 +33,7 @@ class COMMON_EXPORT Event
 {
 public:
     explicit Event(EventManager::EventType type = EventManager::Invalid);
 {
 public:
     explicit Event(EventManager::EventType type = EventManager::Invalid);

-    virtual ~Event() {}
+    virtual ~Event() = default;

 
     inline EventManager::EventType type() const { return _type; }
 
 
     inline EventManager::EventType type() const { return _type; }
 

diff --git a/src/common/expressionmatch.h b/src/common/expressionmatch.h
index a22b34b..689d14f 100644 (file)
--- a/src/common/expressionmatch.h
+++ b/src/common/expressionmatch.h
@@ -45,7 +45,7 @@ public:
     /**
      * Construct an empty ExpressionMatch
      */
     /**
      * Construct an empty ExpressionMatch
      */

-    ExpressionMatch() {}
+    ExpressionMatch() = default;

 
     /**
      * Construct an Expression match with the given parameters
 
     /**
      * Construct an Expression match with the given parameters

diff --git a/src/common/highlightrulemanager.h b/src/common/highlightrulemanager.h
index 5a2d4a8..0db44fc 100644 (file)
--- a/src/common/highlightrulemanager.h
+++ b/src/common/highlightrulemanager.h
@@ -61,7 +61,7 @@ public:
         /**
          * Construct an empty highlight rule
          */
         /**
          * Construct an empty highlight rule
          */

-        HighlightRule() {}
+        HighlightRule() = default;

 
         /**
          * Construct a highlight rule with the given parameters
 
         /**
          * Construct a highlight rule with the given parameters

diff --git a/src/common/ignorelistmanager.h b/src/common/ignorelistmanager.h
index bd09608..79acff6 100644 (file)
--- a/src/common/ignorelistmanager.h
+++ b/src/common/ignorelistmanager.h
@@ -66,7 +66,7 @@ public:
         /**
          * Construct an empty ignore rule
          */
         /**
          * Construct an empty ignore rule
          */

-        IgnoreListItem() {}
+        IgnoreListItem() = default;

 
         /**
          * Construct an ignore rule with the given parameters
 
         /**
          * Construct an ignore rule with the given parameters

diff --git a/src/common/ircchannel.cpp b/src/common/ircchannel.cpp
index dd47f85..c4e45d5 100644 (file)
--- a/src/common/ircchannel.cpp
+++ b/src/common/ircchannel.cpp
@@ -44,11 +44,6 @@ IrcChannel::IrcChannel(const QString &channelname, Network *network)
 }
 
 
 }
 
 

-IrcChannel::~IrcChannel()
-{
-}
-
-

 // ====================
 //  PUBLIC:
 // ====================
 // ====================
 //  PUBLIC:
 // ====================

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index 906d52f..4c50700 100644 (file)
--- a/src/common/ircchannel.h
+++ b/src/common/ircchannel.h
@@ -45,7 +45,6 @@ class COMMON_EXPORT IrcChannel : public SyncableObject
 
 public :
     IrcChannel(const QString &channelname, Network *network);
 
 public :
     IrcChannel(const QString &channelname, Network *network);

-    ~IrcChannel() override;

 
     bool isKnownUser(IrcUser *ircuser) const;
     bool isValidChannelUserMode(const QString &mode) const;
 
     bool isKnownUser(IrcUser *ircuser) const;
     bool isValidChannelUserMode(const QString &mode) const;

diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index 1683700..52023ef 100644 (file)
--- a/src/common/ircuser.cpp
+++ b/src/common/ircuser.cpp
@@ -52,11 +52,6 @@ IrcUser::IrcUser(const QString &hostmask, Network *network) : SyncableObject(net
 }
 
 
 }
 
 

-IrcUser::~IrcUser()
-{
-}
-
-

 // ====================
 //  PUBLIC:
 // ====================
 // ====================
 //  PUBLIC:
 // ====================

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index 968ca7a..a880d4b 100644 (file)
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -60,8 +60,7 @@ class COMMON_EXPORT IrcUser : public SyncableObject
     Q_PROPERTY(QString userModes READ userModes WRITE setUserModes)
 
 public :
     Q_PROPERTY(QString userModes READ userModes WRITE setUserModes)
 
 public :

-        IrcUser(const QString &hostmask, Network *network);
-    ~IrcUser() override;
+    IrcUser(const QString &hostmask, Network *network);

 
     inline QString user() const { return _user; }
     inline QString host() const { return _host; }
 
     inline QString user() const { return _user; }
     inline QString host() const { return _host; }

diff --git a/src/common/nickhighlightmatcher.h b/src/common/nickhighlightmatcher.h
index 78a8e8f..ec4df0d 100644 (file)
--- a/src/common/nickhighlightmatcher.h
+++ b/src/common/nickhighlightmatcher.h
@@ -47,7 +47,7 @@ public:
     /**
      * Construct an empty NicknameMatcher
      */
     /**
      * Construct an empty NicknameMatcher
      */

-    NickHighlightMatcher() {}
+    NickHighlightMatcher() = default;

 
     /**
      * Construct a configured NicknameMatcher
 
     /**
      * Construct a configured NicknameMatcher

diff --git a/src/common/protocol.h b/src/common/protocol.h
index 47dabd9..dcb7fa6 100644 (file)
--- a/src/common/protocol.h
+++ b/src/common/protocol.h
@@ -139,7 +139,6 @@ struct SetupFailed : public HandshakeMessage
 
 struct SetupDone : public HandshakeMessage
 {
 
 struct SetupDone : public HandshakeMessage
 {

-    inline SetupDone() {}

 };
 
 
 };
 
 


@@ -164,14 +163,13 @@ struct LoginFailed : public HandshakeMessage
 
 struct LoginSuccess : public HandshakeMessage
 {
 
 struct LoginSuccess : public HandshakeMessage
 {

-    inline LoginSuccess() {}

 };
 
 
 // TODO: more generic format
 struct SessionState : public HandshakeMessage
 {
 };
 
 
 // TODO: more generic format
 struct SessionState : public HandshakeMessage
 {

-    inline SessionState() {} // needed for QMetaType (for the mono client)
+    inline SessionState() = default; // needed for QMetaType (for the mono client)

     inline SessionState(QVariantList identities, QVariantList bufferInfos, QVariantList networkIds)
     : identities(std::move(identities)), bufferInfos(std::move(bufferInfos)), networkIds(std::move(networkIds)) {}
 
     inline SessionState(QVariantList identities, QVariantList bufferInfos, QVariantList networkIds)
     : identities(std::move(identities)), bufferInfos(std::move(bufferInfos)), networkIds(std::move(networkIds)) {}
 

diff --git a/src/common/settings.h b/src/common/settings.h
index 5a2a6b7..1a0fa6d 100644 (file)
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -101,7 +101,7 @@ public:
 
 protected:
     inline Settings(QString group_, QString appName_) : group(std::move(group_)), appName(std::move(appName_)) {}
 
 protected:
     inline Settings(QString group_, QString appName_) : group(std::move(group_)), appName(std::move(appName_)) {}

-    inline virtual ~Settings() {}
+    inline virtual ~Settings() = default;

 
     inline void setGroup(const QString &group_) { group = group_; }
 
 
     inline void setGroup(const QString &group_) { group = group_; }
 

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 0cc7994..9a290fc 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -72,7 +72,7 @@ private:
         int signalId{-1};
         QByteArray signature;
         Signal(QObject *sender, int sigId, QByteArray signature) : sender(sender), signalId(sigId), signature(std::move(signature)) {}
         int signalId{-1};
         QByteArray signature;
         Signal(QObject *sender, int sigId, QByteArray signature) : sender(sender), signalId(sigId), signature(std::move(signature)) {}

-        Signal()  {}
+        Signal() = default;

     };
 
     SignalProxy *_proxy;
     };
 
     SignalProxy *_proxy;

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index a948617..6cab74a 100644 (file)
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -232,7 +232,7 @@ class SignalProxy::ExtendedMetaObject
     {
     public:
         MethodDescriptor(const QMetaMethod &method);
     {
     public:
         MethodDescriptor(const QMetaMethod &method);

-        MethodDescriptor()  {}
+        MethodDescriptor() = default;

 
         inline const QByteArray &methodName() const { return _methodName; }
         inline const QList<int> &argTypes() const { return _argTypes; }
 
         inline const QByteArray &methodName() const { return _methodName; }
         inline const QList<int> &argTypes() const { return _argTypes; }

diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp
index 10c0f50..ca1fa99 100644 (file)
--- a/src/core/abstractsqlstorage.cpp
+++ b/src/core/abstractsqlstorage.cpp
@@ -400,10 +400,6 @@ AbstractSqlStorage::Connection::~Connection()
 // ========================================
 //  AbstractSqlMigrator
 // ========================================
 // ========================================
 //  AbstractSqlMigrator
 // ========================================

-AbstractSqlMigrator::AbstractSqlMigrator()
-{
-}
-

 
 void AbstractSqlMigrator::newQuery(const QString &query, QSqlDatabase db)
 {
 
 void AbstractSqlMigrator::newQuery(const QString &query, QSqlDatabase db)
 {

diff --git a/src/core/abstractsqlstorage.h b/src/core/abstractsqlstorage.h
index 2224d5c..efd1ce3 100644 (file)
--- a/src/core/abstractsqlstorage.h
+++ b/src/core/abstractsqlstorage.h
@@ -171,7 +171,6 @@ public:
         QString sender;
         QString realname;
         QString avatarurl;
         QString sender;
         QString realname;
         QString avatarurl;

-        SenderMO()  {}

     };
 
     struct IdentityMO {
     };
 
     struct IdentityMO {


@@ -307,8 +306,7 @@ public:
         CoreState
     };
 
         CoreState
     };
 

-    AbstractSqlMigrator();
-    virtual ~AbstractSqlMigrator() {}
+    virtual ~AbstractSqlMigrator() = default;

 
     static QString migrationObject(MigrationObject moType);
 
 
     static QString migrationObject(MigrationObject moType);
 

diff --git a/src/core/cipher.cpp b/src/core/cipher.cpp
index 88a4c50..c5a40c2 100644 (file)
--- a/src/core/cipher.cpp
+++ b/src/core/cipher.cpp
@@ -30,9 +30,6 @@ Cipher::Cipher(QByteArray key, QString cipherType)
 }
 
 
 }
 
 

-Cipher::~Cipher()
-{}
-

 bool Cipher::setKey(QByteArray key)
 {
     if (key.isEmpty()) {
 bool Cipher::setKey(QByteArray key)
 {
     if (key.isEmpty()) {

diff --git a/src/core/cipher.h b/src/core/cipher.h
index 2cd8086..e873ff7 100644 (file)
--- a/src/core/cipher.h
+++ b/src/core/cipher.h
@@ -22,7 +22,6 @@ class Cipher
 public:
     Cipher();
     explicit Cipher(QByteArray key, QString cipherType = QString("blowfish"));
 public:
     Cipher();
     explicit Cipher(QByteArray key, QString cipherType = QString("blowfish"));

-    ~Cipher();

     QByteArray decrypt(QByteArray cipher);
     QByteArray decryptTopic(QByteArray cipher);
     bool encrypt(QByteArray &cipher);
     QByteArray decrypt(QByteArray cipher);
     QByteArray decryptTopic(QByteArray cipher);
     bool encrypt(QByteArray &cipher);

diff --git a/src/core/coresettings.cpp b/src/core/coresettings.cpp
index 27b0c7c..a914856 100644 (file)
--- a/src/core/coresettings.cpp
+++ b/src/core/coresettings.cpp
@@ -27,11 +27,6 @@ CoreSettings::CoreSettings(const QString group) : Settings(group, Quassel::build
 }
 
 
 }
 
 

-CoreSettings::~CoreSettings()
-{
-}
-
-

 void CoreSettings::setStorageSettings(const QVariant &data)
 {
     setLocalValue("StorageSettings", data);
 void CoreSettings::setStorageSettings(const QVariant &data)
 {
     setLocalValue("StorageSettings", data);

diff --git a/src/core/coresettings.h b/src/core/coresettings.h
index 8132cfb..ac70a36 100644 (file)
--- a/src/core/coresettings.h
+++ b/src/core/coresettings.h
@@ -26,7 +26,6 @@
 class CoreSettings : public Settings
 {
 public:
 class CoreSettings : public Settings
 {
 public:

-    ~CoreSettings() override;

     CoreSettings(const QString group = "Core");
 
     void setStorageSettings(const QVariant &data);
     CoreSettings(const QString group = "Core");
 
     void setStorageSettings(const QVariant &data);

diff --git a/src/core/coreuserinputhandler.h b/src/core/coreuserinputhandler.h
index 94d8464..a45fcae 100644 (file)
--- a/src/core/coreuserinputhandler.h
+++ b/src/core/coreuserinputhandler.h
@@ -124,7 +124,7 @@ private:
         BufferInfo bufferInfo;
         QString command;
         Command(BufferInfo info, QString command) : bufferInfo(std::move(info)), command(std::move(command)) {}
         BufferInfo bufferInfo;
         QString command;
         Command(BufferInfo info, QString command) : bufferInfo(std::move(info)), command(std::move(command)) {}

-        Command() {}
+        Command() = default;

     };
 
     QHash<int, Command> _delayedCommands;
     };
 
     QHash<int, Command> _delayedCommands;

diff --git a/src/core/ctcpparser.h b/src/core/ctcpparser.h
index 7fd2a83..0118be2 100644 (file)
--- a/src/core/ctcpparser.h
+++ b/src/core/ctcpparser.h
@@ -89,7 +89,7 @@ private:
         QString bufferName;
         QList<QByteArray> replies;
 
         QString bufferName;
         QList<QByteArray> replies;
 

-        CtcpReply()  {}
+        CtcpReply() = default;

         CtcpReply(CoreNetwork *net, QString buf) : network(net), bufferName(std::move(buf)) {}
     };
 
         CtcpReply(CoreNetwork *net, QString buf) : network(net), bufferName(std::move(buf)) {}
     };
 

diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp
index 6b2642b..6b97104 100644 (file)
--- a/src/core/postgresqlstorage.cpp
+++ b/src/core/postgresqlstorage.cpp
@@ -32,11 +32,6 @@ PostgreSqlStorage::PostgreSqlStorage(QObject *parent)
 }
 
 
 }
 
 

-PostgreSqlStorage::~PostgreSqlStorage()
-{
-}
-
-

 std::unique_ptr<AbstractSqlMigrationWriter> PostgreSqlStorage::createMigrationWriter()
 {
     auto writer = new PostgreSqlMigrationWriter();
 std::unique_ptr<AbstractSqlMigrationWriter> PostgreSqlStorage::createMigrationWriter()
 {
     auto writer = new PostgreSqlMigrationWriter();

diff --git a/src/core/postgresqlstorage.h b/src/core/postgresqlstorage.h
index 599bb54..2ea1e28 100644 (file)
--- a/src/core/postgresqlstorage.h
+++ b/src/core/postgresqlstorage.h
@@ -31,7 +31,6 @@ class PostgreSqlStorage : public AbstractSqlStorage
 
 public:
     PostgreSqlStorage(QObject *parent = nullptr);
 
 public:
     PostgreSqlStorage(QObject *parent = nullptr);

-    ~PostgreSqlStorage() override;

 
     std::unique_ptr<AbstractSqlMigrationWriter> createMigrationWriter() override;
 
 
     std::unique_ptr<AbstractSqlMigrationWriter> createMigrationWriter() override;
 

diff --git a/src/core/sqlauthenticator.cpp b/src/core/sqlauthenticator.cpp
index 201fd95..969f2d0 100644 (file)
--- a/src/core/sqlauthenticator.cpp
+++ b/src/core/sqlauthenticator.cpp
@@ -32,11 +32,6 @@ SqlAuthenticator::SqlAuthenticator(QObject *parent)
 }
 
 
 }
 
 

-SqlAuthenticator::~SqlAuthenticator()
-{
-}
-
-

 bool SqlAuthenticator::isAvailable() const
 {
     // FIXME: probably this should query the current storage (see the ::init routine too).
 bool SqlAuthenticator::isAvailable() const
 {
     // FIXME: probably this should query the current storage (see the ::init routine too).

diff --git a/src/core/sqlauthenticator.h b/src/core/sqlauthenticator.h
index 3f24705..8336151 100644 (file)
--- a/src/core/sqlauthenticator.h
+++ b/src/core/sqlauthenticator.h
@@ -28,7 +28,6 @@ class SqlAuthenticator : public Authenticator
 
 public:
     SqlAuthenticator(QObject *parent = nullptr);
 
 public:
     SqlAuthenticator(QObject *parent = nullptr);

-    ~SqlAuthenticator() override;

 
 public slots:
     /* General */
 
 public slots:
     /* General */

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index b555173..b39c187 100644 (file)
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -34,11 +34,6 @@ SqliteStorage::SqliteStorage(QObject *parent)
 }
 
 
 }
 
 

-SqliteStorage::~SqliteStorage()
-{
-}
-
-

 bool SqliteStorage::isAvailable() const
 {
     if (!QSqlDatabase::isDriverAvailable("QSQLITE")) return false;
 bool SqliteStorage::isAvailable() const
 {
     if (!QSqlDatabase::isDriverAvailable("QSQLITE")) return false;

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index c88a3c6..58ae08c 100644 (file)
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -32,7 +32,6 @@ class SqliteStorage : public AbstractSqlStorage
 
 public:
     SqliteStorage(QObject *parent = nullptr);
 
 public:
     SqliteStorage(QObject *parent = nullptr);

-    ~SqliteStorage() override;

 
     std::unique_ptr<AbstractSqlMigrationReader> createMigrationReader() override;
 
 
     std::unique_ptr<AbstractSqlMigrationReader> createMigrationReader() override;
 

diff --git a/src/core/storage.h b/src/core/storage.h
index da09a2a..85d2cad 100644 (file)
--- a/src/core/storage.h
+++ b/src/core/storage.h
@@ -34,7 +34,6 @@ class Storage : public QObject
 
 public:
     Storage(QObject *parent = nullptr);
 
 public:
     Storage(QObject *parent = nullptr);

-    ~Storage() override {};

 
     enum State {
         IsReady,    // ready to go
 
     enum State {
         IsReady,    // ready to go

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index 79ee339..b88ac27 100644 (file)
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -949,11 +949,6 @@ ContentsChatItem::WrapColumnFinder::WrapColumnFinder(const ChatItem *_item)
 }
 
 
 }
 
 

-ContentsChatItem::WrapColumnFinder::~WrapColumnFinder()
-{
-}
-
-

 qint16 ContentsChatItem::WrapColumnFinder::nextWrapColumn(qreal width)
 {
     if (wordidx >= wrapList.count())
 qint16 ContentsChatItem::WrapColumnFinder::nextWrapColumn(qreal width)
 {
     if (wordidx >= wrapList.count())

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index a945795..5a23146 100644 (file)
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -257,7 +257,6 @@ class ContentsChatItem::WrapColumnFinder
 {
 public:
     WrapColumnFinder(const ChatItem *parent);
 {
 public:
     WrapColumnFinder(const ChatItem *parent);

-    ~WrapColumnFinder();

 
     qint16 nextWrapColumn(qreal width);
 
 
     qint16 nextWrapColumn(qreal width);
 

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 78c33c8..1544284 100644 (file)
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -147,11 +147,6 @@ ChatScene::ChatScene(QAbstractItemModel *model, QString idString, qreal width, C
 }
 
 
 }
 
 

-ChatScene::~ChatScene()
-{
-}
-
-

 ChatView *ChatScene::chatView() const
 {
     return _chatView;
 ChatView *ChatScene::chatView() const
 {
     return _chatView;

diff --git a/src/qtui/chatscene.h b/src/qtui/chatscene.h
index 29e3d9e..5258071 100644 (file)
--- a/src/qtui/chatscene.h
+++ b/src/qtui/chatscene.h
@@ -73,7 +73,6 @@ public:
     };
 
     ChatScene(QAbstractItemModel *model, QString idString, qreal width, ChatView *parent);
     };
 
     ChatScene(QAbstractItemModel *model, QString idString, qreal width, ChatView *parent);

-    ~ChatScene() override;

 
     inline QAbstractItemModel *model() const { return _model; }
     inline MessageFilter *filter() const { return qobject_cast<MessageFilter *>(_model); }
 
     inline QAbstractItemModel *model() const { return _model; }
     inline MessageFilter *filter() const { return qobject_cast<MessageFilter *>(_model); }


@@ -292,7 +291,6 @@ private:
         QRectF urlRect;
         PreviewState previewState{NoPreview};
         QTimer timer;
         QRectF urlRect;
         PreviewState previewState{NoPreview};
         QTimer timer;

-        WebPreview()  {}

     };
     WebPreview webPreview;
 #endif // HAVE_WEBKIT || HAVE_WEBENGINE
     };
     WebPreview webPreview;
 #endif // HAVE_WEBKIT || HAVE_WEBENGINE

diff --git a/src/qtui/debugconsole.cpp b/src/qtui/debugconsole.cpp
index 3a64b05..a5a6eee 100644 (file)
--- a/src/qtui/debugconsole.cpp
+++ b/src/qtui/debugconsole.cpp
@@ -32,11 +32,6 @@ DebugConsole::DebugConsole(QWidget *parent)
 }
 
 
 }
 
 

-DebugConsole::~DebugConsole()
-{
-}
-
-

 void DebugConsole::on_evalButton_clicked()
 {
     if (ui.selectCore->isChecked()) {
 void DebugConsole::on_evalButton_clicked()
 {
     if (ui.selectCore->isChecked()) {

diff --git a/src/qtui/debugconsole.h b/src/qtui/debugconsole.h
index a2904e8..0033b41 100644 (file)
--- a/src/qtui/debugconsole.h
+++ b/src/qtui/debugconsole.h
@@ -29,7 +29,6 @@ class DebugConsole : public QDialog
 
 public:
     DebugConsole(QWidget *parent = nullptr);
 
 public:
     DebugConsole(QWidget *parent = nullptr);

-    ~DebugConsole() override;

 
 public slots:
     void scriptResult(QString result);
 
 public slots:
     void scriptResult(QString result);

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 3233f04..a832207 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -154,11 +154,6 @@ InputWidget::InputWidget(QWidget *parent)
 }
 
 
 }
 
 

-InputWidget::~InputWidget()
-{
-}
-
-

 void InputWidget::setUseCustomFont(const QVariant &v)
 {
     if (v.toBool()) {
 void InputWidget::setUseCustomFont(const QVariant &v)
 {
     if (v.toBool()) {

diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h
index 7ac1d4b..47b876f 100644 (file)
--- a/src/qtui/inputwidget.h
+++ b/src/qtui/inputwidget.h
@@ -42,7 +42,6 @@ class InputWidget : public AbstractItemView
 
 public:
     InputWidget(QWidget *parent = nullptr);
 
 public:
     InputWidget(QWidget *parent = nullptr);

-    ~InputWidget() override;

 
     const Network *currentNetwork() const;
 
 
     const Network *currentNetwork() const;
 


@@ -185,7 +184,6 @@ private:
         QHash<int, QString> tempHistory;
         qint32 idx{0};
         QString inputLine;
         QHash<int, QString> tempHistory;
         qint32 idx{0};
         QString inputLine;

-        inline HistoryState()  {};

     };
 
     QMap<BufferId, HistoryState> historyMap;
     };
 
     QMap<BufferId, HistoryState> historyMap;

diff --git a/src/qtui/qtuimessageprocessor.h b/src/qtui/qtuimessageprocessor.h
index bf43766..3b33132 100644 (file)
--- a/src/qtui/qtuimessageprocessor.h
+++ b/src/qtui/qtuimessageprocessor.h
@@ -77,7 +77,7 @@ private:
         /**
          * Construct an empty highlight rule
          */
         /**
          * Construct an empty highlight rule
          */

-        LegacyHighlightRule() {}
+        LegacyHighlightRule() = default;

 
         /**
          * Construct a highlight rule with the given parameters
 
         /**
          * Construct a highlight rule with the given parameters

diff --git a/src/qtui/qtuistyle.cpp b/src/qtui/qtuistyle.cpp
index 7516c22..fd10e24 100644 (file)
--- a/src/qtui/qtuistyle.cpp
+++ b/src/qtui/qtuistyle.cpp
@@ -42,8 +42,6 @@ QtUiStyle::QtUiStyle(QObject *parent) : UiStyle(parent)
 }
 
 
 }
 
 

-QtUiStyle::~QtUiStyle() {}
-

 void QtUiStyle::updateUseCustomTimestampFormat()
 {
     ChatViewSettings s;
 void QtUiStyle::updateUseCustomTimestampFormat()
 {
     ChatViewSettings s;

diff --git a/src/qtui/qtuistyle.h b/src/qtui/qtuistyle.h
index 903c78e..f15ed1d 100644 (file)
--- a/src/qtui/qtuistyle.h
+++ b/src/qtui/qtuistyle.h
@@ -30,7 +30,6 @@ class QtUiStyle : public UiStyle
 
 public:
     QtUiStyle(QObject *parent = nullptr);
 
 public:
     QtUiStyle(QObject *parent = nullptr);

-    ~QtUiStyle() override;

 
     virtual inline qreal firstColumnSeparator() const { return 6; }
     virtual inline qreal secondColumnSeparator() const { return 6; }
 
     virtual inline qreal firstColumnSeparator() const { return 6; }
     virtual inline qreal secondColumnSeparator() const { return 6; }


@@ -59,7 +58,7 @@ private slots:
      * Updates knowledge of the current timestamp format
      */
     void updateTimestampFormatString();
      * Updates knowledge of the current timestamp format
      */
     void updateTimestampFormatString();

-    
+

     /**
      * Updates knowledge of how to display sender prefix modes
      */
     /**
      * Updates knowledge of how to display sender prefix modes
      */

diff --git a/src/uisupport/abstractbuffercontainer.cpp b/src/uisupport/abstractbuffercontainer.cpp
index ac5e463..f6e8de7 100644 (file)
--- a/src/uisupport/abstractbuffercontainer.cpp
+++ b/src/uisupport/abstractbuffercontainer.cpp
@@ -30,11 +30,6 @@ AbstractBufferContainer::AbstractBufferContainer(QWidget *parent)
 }
 
 
 }
 
 

-AbstractBufferContainer::~AbstractBufferContainer()
-{
-}
-
-

 void AbstractBufferContainer::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
 {
     Q_ASSERT(model());
 void AbstractBufferContainer::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
 {
     Q_ASSERT(model());

diff --git a/src/uisupport/abstractbuffercontainer.h b/src/uisupport/abstractbuffercontainer.h
index d0d9c8b..9c02f26 100644 (file)
--- a/src/uisupport/abstractbuffercontainer.h
+++ b/src/uisupport/abstractbuffercontainer.h
@@ -35,7 +35,6 @@ class UISUPPORT_EXPORT AbstractBufferContainer : public AbstractItemView
 
 public:
     AbstractBufferContainer(QWidget *parent);
 
 public:
     AbstractBufferContainer(QWidget *parent);

-    ~AbstractBufferContainer() override;

 
     inline BufferId currentBuffer() const { return _currentBuffer; }
 
 
     inline BufferId currentBuffer() const { return _currentBuffer; }
 


@@ -83,6 +82,6 @@ private:
 class AbstractChatView
 {
 public:
 class AbstractChatView
 {
 public:

-    virtual ~AbstractChatView() {};
+    virtual ~AbstractChatView() = default;

     virtual MsgId lastMsgId() const = 0;
 };
     virtual MsgId lastMsgId() const = 0;
 };

diff --git a/src/uisupport/abstractnotificationbackend.h b/src/uisupport/abstractnotificationbackend.h
index 86d0973..5f00daa 100644 (file)
--- a/src/uisupport/abstractnotificationbackend.h
+++ b/src/uisupport/abstractnotificationbackend.h
@@ -54,7 +54,6 @@ public:
     };
 
     inline AbstractNotificationBackend(QObject *parent) : QObject(parent) {};
     };
 
     inline AbstractNotificationBackend(QObject *parent) : QObject(parent) {};

-    ~AbstractNotificationBackend() override {};

 
     virtual void notify(const Notification &) = 0;
     virtual void close(uint notificationId) { Q_UNUSED(notificationId); }
 
     virtual void notify(const Notification &) = 0;
     virtual void close(uint notificationId) { Q_UNUSED(notificationId); }

diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp
index a3aa6d6..2cc03e1 100644 (file)
--- a/src/uisupport/actioncollection.cpp
+++ b/src/uisupport/actioncollection.cpp
@@ -37,11 +37,6 @@ ActionCollection::ActionCollection(QObject *parent) : QObject(parent)
 }
 
 
 }
 
 

-ActionCollection::~ActionCollection()
-{
-}
-
-

 void ActionCollection::clear()
 {
     _actionByName.clear();
 void ActionCollection::clear()
 {
     _actionByName.clear();

diff --git a/src/uisupport/actioncollection.h b/src/uisupport/actioncollection.h
index 10f7d93..d26c357 100644 (file)
--- a/src/uisupport/actioncollection.h
+++ b/src/uisupport/actioncollection.h
@@ -43,7 +43,6 @@ class UISUPPORT_EXPORT ActionCollection : public QObject
 
 public:
     explicit ActionCollection(QObject *parent);
 
 public:
     explicit ActionCollection(QObject *parent);

-    ~ActionCollection() override;

 
     /// Clears the entire action collection, deleting all actions.
     void clear();
 
     /// Clears the entire action collection, deleting all actions.
     void clear();

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 876f0b9..e60d069 100644 (file)
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -73,10 +73,6 @@ MultiLineEdit::MultiLineEdit(QWidget *parent)
 }
 
 
 }
 
 

-MultiLineEdit::~MultiLineEdit()
-{
-}
-

 #if defined HAVE_SONNET && !defined HAVE_KDE
 Sonnet::Highlighter *MultiLineEdit::highlighter() const
 {
 #if defined HAVE_SONNET && !defined HAVE_KDE
 Sonnet::Highlighter *MultiLineEdit::highlighter() const
 {

diff --git a/src/uisupport/multilineedit.h b/src/uisupport/multilineedit.h
index a8d2d13..bd06172 100644 (file)
--- a/src/uisupport/multilineedit.h
+++ b/src/uisupport/multilineedit.h
@@ -50,7 +50,6 @@ public:
     };
 
     MultiLineEdit(QWidget *parent = nullptr);
     };
 
     MultiLineEdit(QWidget *parent = nullptr);

-    ~MultiLineEdit() override;

 
     void setCustomFont(const QFont &); // should be used instead setFont(), so we can set our size correctly
 
 
     void setCustomFont(const QFont &); // should be used instead setFont(), so we can set our size correctly
 

diff --git a/src/uisupport/networkmodelcontroller.cpp b/src/uisupport/networkmodelcontroller.cpp
index d7dc64e..3b29c93 100644 (file)
--- a/src/uisupport/networkmodelcontroller.cpp
+++ b/src/uisupport/networkmodelcontroller.cpp
@@ -47,11 +47,6 @@ NetworkModelController::NetworkModelController(QObject *parent)
 }
 
 
 }
 
 

-NetworkModelController::~NetworkModelController()
-{
-}
-
-

 Action *NetworkModelController::registerAction(ActionType type, const QString &text, bool checkable)
 {
     return registerAction(type, QPixmap(), text, checkable);
 Action *NetworkModelController::registerAction(ActionType type, const QString &text, bool checkable)
 {
     return registerAction(type, QPixmap(), text, checkable);

diff --git a/src/uisupport/networkmodelcontroller.h b/src/uisupport/networkmodelcontroller.h
index 0511780..05d4ee3 100644 (file)
--- a/src/uisupport/networkmodelcontroller.h
+++ b/src/uisupport/networkmodelcontroller.h
@@ -38,7 +38,6 @@ class UISUPPORT_EXPORT NetworkModelController : public QObject
 
 public:
     NetworkModelController(QObject *parent = nullptr);
 
 public:
     NetworkModelController(QObject *parent = nullptr);

-    ~NetworkModelController() override;

 
     // don't change enums without doublechecking masks etc. in code
     enum ActionType {
 
     // don't change enums without doublechecking masks etc. in code
     enum ActionType {

diff --git a/src/uisupport/settingspage.h b/src/uisupport/settingspage.h
index fe71d73..730418e 100644 (file)
--- a/src/uisupport/settingspage.h
+++ b/src/uisupport/settingspage.h
@@ -62,7 +62,6 @@ class UISUPPORT_EXPORT SettingsPage : public QWidget
 
 public:
     SettingsPage(QString category, QString name, QWidget *parent = nullptr);
 
 public:
     SettingsPage(QString category, QString name, QWidget *parent = nullptr);

-    ~SettingsPage() override {};

 
     //! The category of this settings page.
     inline virtual QString category() const { return _category; }
 
     //! The category of this settings page.
     inline virtual QString category() const { return _category; }

diff --git a/src/uisupport/toolbaractionprovider.cpp b/src/uisupport/toolbaractionprovider.cpp
index 0ae1078..9342628 100644 (file)
--- a/src/uisupport/toolbaractionprovider.cpp
+++ b/src/uisupport/toolbaractionprovider.cpp
@@ -68,11 +68,6 @@ ToolBarActionProvider::ToolBarActionProvider(QObject *parent)
 }
 
 
 }
 
 

-ToolBarActionProvider::~ToolBarActionProvider()
-{
-}
-
-

 void ToolBarActionProvider::disconnectedFromCore()
 {
     _currentBuffer = QModelIndex();
 void ToolBarActionProvider::disconnectedFromCore()
 {
     _currentBuffer = QModelIndex();

diff --git a/src/uisupport/toolbaractionprovider.h b/src/uisupport/toolbaractionprovider.h
index 3a1f2d8..9d80d37 100644 (file)
--- a/src/uisupport/toolbaractionprovider.h
+++ b/src/uisupport/toolbaractionprovider.h
@@ -32,7 +32,6 @@ class UISUPPORT_EXPORT ToolBarActionProvider : public NetworkModelController
 
 public:
     ToolBarActionProvider(QObject *parent = nullptr);
 
 public:
     ToolBarActionProvider(QObject *parent = nullptr);

-    ~ToolBarActionProvider() override;

 
     enum ToolBarType {
         MainToolBar,
 
     enum ToolBarType {
         MainToolBar,