modernize: Use override instead of virtual

Let clang-tidy fix all occurrences where override should be used
instead of virtual. Also, let it annotate member functions where
virtual was missing in the first place.

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

-    virtual ~AbstractUi() {}
+    ~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 2c1485d..3fb4680 100644 (file)
--- a/src/client/backlogrequester.h
+++ b/src/client/backlogrequester.h
@@ -81,7 +81,7 @@ class FixedBacklogRequester : public BacklogRequester
 {
 public:
     FixedBacklogRequester(ClientBacklogManager *backlogManager);
 {
 public:
     FixedBacklogRequester(ClientBacklogManager *backlogManager);

-    virtual void requestBacklog(const BufferIdList &bufferIds);
+    void requestBacklog(const BufferIdList &bufferIds) override;

 
 private:
     int _backlogCount;
 
 private:
     int _backlogCount;


@@ -95,8 +95,8 @@ class GlobalUnreadBacklogRequester : public BacklogRequester
 {
 public:
     GlobalUnreadBacklogRequester(ClientBacklogManager *backlogManager);
 {
 public:
     GlobalUnreadBacklogRequester(ClientBacklogManager *backlogManager);

-    virtual void requestInitialBacklog();
-    virtual void requestBacklog(const BufferIdList &) {}
+    void requestInitialBacklog() override;
+    void requestBacklog(const BufferIdList &) override {}

 
 private:
     int _limit;
 
 private:
     int _limit;


@@ -111,7 +111,7 @@ class PerBufferUnreadBacklogRequester : public BacklogRequester
 {
 public:
     PerBufferUnreadBacklogRequester(ClientBacklogManager *backlogManager);
 {
 public:
     PerBufferUnreadBacklogRequester(ClientBacklogManager *backlogManager);

-    virtual void requestBacklog(const BufferIdList &bufferIds);
+    void requestBacklog(const BufferIdList &bufferIds) override;

 
 private:
     int _limit;
 
 private:
     int _limit;

diff --git a/src/client/buffermodel.h b/src/client/buffermodel.h
index 4201f3d..cbfabaa 100644 (file)
--- a/src/client/buffermodel.h
+++ b/src/client/buffermodel.h
@@ -40,7 +40,7 @@ class CLIENT_EXPORT BufferModel : public QSortFilterProxyModel
 public:
     BufferModel(NetworkModel *parent = nullptr);
 
 public:
     BufferModel(NetworkModel *parent = nullptr);
 

-    bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const override;

 
     inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
     inline QItemSelectionModel *standardSelectionModel() const { return _selectionModelSynchronizer.selectionModel(); }
 
     inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
     inline QItemSelectionModel *standardSelectionModel() const { return _selectionModelSynchronizer.selectionModel(); }

diff --git a/src/client/bufferviewoverlay.h b/src/client/bufferviewoverlay.h
index 85b60c4..a476434 100644 (file)
--- a/src/client/bufferviewoverlay.h
+++ b/src/client/bufferviewoverlay.h
@@ -65,7 +65,7 @@ signals:
     void initDone();
 
 protected:
     void initDone();
 
 protected:

-    virtual void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;

 
 private slots:
     void viewInitialized();
 
 private slots:
     void viewInitialized();

diff --git a/src/client/clientaliasmanager.h b/src/client/clientaliasmanager.h
index fe9a782..45bb6f2 100644 (file)
--- a/src/client/clientaliasmanager.h
+++ b/src/client/clientaliasmanager.h
@@ -32,5 +32,5 @@ public:
     explicit ClientAliasManager(QObject *parent = nullptr);
 
 protected:
     explicit ClientAliasManager(QObject *parent = nullptr);
 
 protected:

-    const Network *network(NetworkId) const;
+    const Network *network(NetworkId) const override;

 };
 };

diff --git a/src/client/clientauthhandler.h b/src/client/clientauthhandler.h
index 47b42a7..8cc07d1 100644 (file)
--- a/src/client/clientauthhandler.h
+++ b/src/client/clientauthhandler.h
@@ -78,13 +78,13 @@ signals:
 private:
     using AuthHandler::handle;
 
 private:
     using AuthHandler::handle;
 

-    void handle(const Protocol::ClientDenied &msg);
-    void handle(const Protocol::ClientRegistered &msg);
-    void handle(const Protocol::SetupFailed &msg);
-    void handle(const Protocol::SetupDone &msg);
-    void handle(const Protocol::LoginFailed &msg);
-    void handle(const Protocol::LoginSuccess &msg);
-    void handle(const Protocol::SessionState &msg);
+    void handle(const Protocol::ClientDenied &msg) override;
+    void handle(const Protocol::ClientRegistered &msg) override;
+    void handle(const Protocol::SetupFailed &msg) override;
+    void handle(const Protocol::SetupDone &msg) override;
+    void handle(const Protocol::LoginFailed &msg) override;
+    void handle(const Protocol::LoginSuccess &msg) override;
+    void handle(const Protocol::SessionState &msg) override;

 
     void setPeer(RemotePeer *peer);
     void checkAndEnableSsl(bool coreSupportsSsl);
 
     void setPeer(RemotePeer *peer);
     void checkAndEnableSsl(bool coreSupportsSsl);


@@ -93,8 +93,8 @@ private:
 private slots:
     void onSocketConnected();
     void onSocketStateChanged(QAbstractSocket::SocketState state);
 private slots:
     void onSocketConnected();
     void onSocketStateChanged(QAbstractSocket::SocketState state);

-    void onSocketError(QAbstractSocket::SocketError);
-    void onSocketDisconnected();
+    void onSocketError(QAbstractSocket::SocketError) override;
+    void onSocketDisconnected() override;

     void onReadyRead();
 
 #ifdef HAVE_SSL
     void onReadyRead();
 
 #ifdef HAVE_SSL

diff --git a/src/client/clientbacklogmanager.h b/src/client/clientbacklogmanager.h
index 3f4814b..1f71027 100644 (file)
--- a/src/client/clientbacklogmanager.h
+++ b/src/client/clientbacklogmanager.h
@@ -40,9 +40,9 @@ public:
     void reset();
 
 public slots:
     void reset();
 
 public slots:

-    virtual QVariantList requestBacklog(BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1, int additional = 0);
-    virtual void receiveBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional, QVariantList msgs);
-    virtual void receiveBacklogAll(MsgId first, MsgId last, int limit, int additional, QVariantList msgs);
+    QVariantList requestBacklog(BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1, int additional = 0) override;
+    void receiveBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional, QVariantList msgs) override;
+    void receiveBacklogAll(MsgId first, MsgId last, int limit, int additional, QVariantList msgs) override;

 
     void requestInitialBacklog();
 
 
     void requestInitialBacklog();
 

diff --git a/src/client/clientbufferviewmanager.h b/src/client/clientbufferviewmanager.h
index f619dfc..62123a1 100644 (file)
--- a/src/client/clientbufferviewmanager.h
+++ b/src/client/clientbufferviewmanager.h
@@ -38,8 +38,8 @@ public:
     ClientBufferViewConfig *clientBufferViewConfig(int bufferViewId) const;
 
 public slots:
     ClientBufferViewConfig *clientBufferViewConfig(int bufferViewId) const;
 
 public slots:

-    virtual void setInitialized();
+    void setInitialized() override;

 
 protected:
 
 protected:

-    virtual BufferViewConfig *bufferViewConfigFactory(int bufferViewConfigId);
+    BufferViewConfig *bufferViewConfigFactory(int bufferViewConfigId) override;

 };
 };

diff --git a/src/client/clientidentity.h b/src/client/clientidentity.h
index 5e58917..4aa81c8 100644 (file)
--- a/src/client/clientidentity.h
+++ b/src/client/clientidentity.h
@@ -79,12 +79,12 @@ class ClientCertManager : public CertManager
 public:
     ClientCertManager(IdentityId id, CertIdentity *parent) : CertManager(id, parent), _certIdentity(parent) {}
 
 public:
     ClientCertManager(IdentityId id, CertIdentity *parent) : CertManager(id, parent), _certIdentity(parent) {}
 

-    virtual inline const QSslKey &sslKey() const { return _certIdentity->sslKey(); }
-    virtual inline const QSslCertificate &sslCert() const { return _certIdentity->sslCert(); }
+    inline const QSslKey &sslKey() const override { return _certIdentity->sslKey(); }
+    inline const QSslCertificate &sslCert() const override { return _certIdentity->sslCert(); }

 
 public slots:
 
 public slots:

-    virtual void setSslKey(const QByteArray &encoded);
-    virtual void setSslCert(const QByteArray &encoded);
+    void setSslKey(const QByteArray &encoded) override;
+    void setSslCert(const QByteArray &encoded) override;

 
 private:
     CertIdentity *_certIdentity;
 
 private:
     CertIdentity *_certIdentity;

diff --git a/src/client/clientirclisthelper.h b/src/client/clientirclisthelper.h
index 385a910..f852c07 100644 (file)
--- a/src/client/clientirclisthelper.h
+++ b/src/client/clientirclisthelper.h
@@ -30,10 +30,10 @@ public:
     inline ClientIrcListHelper(QObject *object = nullptr) : IrcListHelper(object) {};
 
 public slots:
     inline ClientIrcListHelper(QObject *object = nullptr) : IrcListHelper(object) {};
 
 public slots:

-    virtual QVariantList requestChannelList(const NetworkId &netId, const QStringList &channelFilters);
-    virtual void receiveChannelList(const NetworkId &netId, const QStringList &channelFilters, const QVariantList &channels);
-    virtual void reportFinishedList(const NetworkId &netId);
-    inline virtual void reportError(const QString &error) { emit errorReported(error); }
+    QVariantList requestChannelList(const NetworkId &netId, const QStringList &channelFilters) override;
+    void receiveChannelList(const NetworkId &netId, const QStringList &channelFilters, const QVariantList &channels) override;
+    void reportFinishedList(const NetworkId &netId) override;
+    inline void reportError(const QString &error) override { emit errorReported(error); }

 
 signals:
     void channelListReceived(const NetworkId &netId, const QStringList &channelFilters, const QList<IrcListHelper::ChannelDescription> &channelList);
 
 signals:
     void channelListReceived(const NetworkId &netId, const QStringList &channelFilters, const QList<IrcListHelper::ChannelDescription> &channelList);

diff --git a/src/client/clientsettings.h b/src/client/clientsettings.h
index 54df34b..ce2a71e 100644 (file)
--- a/src/client/clientsettings.h
+++ b/src/client/clientsettings.h
@@ -32,7 +32,7 @@ class QSslSocket;
 class CLIENT_EXPORT ClientSettings : public Settings
 {
 public:
 class CLIENT_EXPORT ClientSettings : public Settings
 {
 public:

-    virtual ~ClientSettings();
+    ~ClientSettings() override;

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


@@ -56,7 +56,7 @@ public:
     // stores account-specific data in CoreAccounts/$ACCID/$SUBGROUP/$KEY)
     CoreAccountSettings(const QString &subgroup = "General");
 
     // stores account-specific data in CoreAccounts/$ACCID/$SUBGROUP/$KEY)
     CoreAccountSettings(const QString &subgroup = "General");
 

-    virtual void notify(const QString &key, QObject *receiver, const char *slot);
+    void notify(const QString &key, QObject *receiver, const char *slot) override;

 
     QList<AccountId> knownAccounts();
     AccountId lastAccount();
 
     QList<AccountId> knownAccounts();
     AccountId lastAccount();

diff --git a/src/client/coreaccountmodel.h b/src/client/coreaccountmodel.h
index 91082b2..88bc341 100644 (file)
--- a/src/client/coreaccountmodel.h
+++ b/src/client/coreaccountmodel.h
@@ -40,8 +40,8 @@ public:
     CoreAccountModel(QObject *parent = nullptr);
     CoreAccountModel(const CoreAccountModel *other, QObject *parent = nullptr);
 
     CoreAccountModel(QObject *parent = nullptr);
     CoreAccountModel(const CoreAccountModel *other, QObject *parent = nullptr);
 

-    inline int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    inline int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

 
     CoreAccount account(const QModelIndex &) const;
     CoreAccount account(AccountId) const;
 
     CoreAccount account(const QModelIndex &) const;
     CoreAccount account(AccountId) const;

diff --git a/src/client/irclistmodel.h b/src/client/irclistmodel.h
index 5cce869..8700d1c 100644 (file)
--- a/src/client/irclistmodel.h
+++ b/src/client/irclistmodel.h
@@ -33,17 +33,17 @@ class CLIENT_EXPORT IrcListModel : public QAbstractItemModel
 public:
     IrcListModel(QObject *parent = nullptr);
 
 public:
     IrcListModel(QObject *parent = nullptr);
 

-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    QVariant data(const QModelIndex &index, int role) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;

 
 

-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;

 
 

-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;

 
 

-    inline QModelIndex parent(const QModelIndex &) const { return QModelIndex(); }
+    inline QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); }

 
 

-    inline int rowCount(const QModelIndex &parent = QModelIndex()) const { Q_UNUSED(parent) return _channelList.count(); }
-    inline int columnCount(const QModelIndex &parent = QModelIndex()) const { Q_UNUSED(parent) return 3; }
+    inline int rowCount(const QModelIndex &parent = QModelIndex()) const override { Q_UNUSED(parent) return _channelList.count(); }
+    inline int columnCount(const QModelIndex &parent = QModelIndex()) const override { Q_UNUSED(parent) return 3; }

 
 public slots:
     void setChannelList(const QList<IrcListHelper::ChannelDescription> &channelList = QList<IrcListHelper::ChannelDescription>());
 
 public slots:
     void setChannelList(const QList<IrcListHelper::ChannelDescription> &channelList = QList<IrcListHelper::ChannelDescription>());

diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h
index 9fd7ea6..75259da 100644 (file)
--- a/src/client/messagemodel.h
+++ b/src/client/messagemodel.h
@@ -59,13 +59,13 @@ public:
 
     MessageModel(QObject *parent);
 
 
     MessageModel(QObject *parent);
 

-    inline QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
-    inline QModelIndex parent(const QModelIndex &) const { return QModelIndex(); }
-    inline int rowCount(const QModelIndex &parent = QModelIndex()) const { return parent.isValid() ? 0 : messageCount(); }
-    inline int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const { return 3; }
+    inline QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    inline QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); }
+    inline int rowCount(const QModelIndex &parent = QModelIndex()) const override { return parent.isValid() ? 0 : messageCount(); }
+    inline int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override { return 3; }

 
 

-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual bool setData(const QModelIndex &index, const QVariant &value, int role);
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;

 
     //virtual Qt::ItemFlags flags(const QModelIndex &index) const;
 
 
     //virtual Qt::ItemFlags flags(const QModelIndex &index) const;
 


@@ -100,7 +100,7 @@ protected:
     virtual void removeAllMessages() = 0;
     virtual Message takeMessageAt(int i) = 0;
 
     virtual void removeAllMessages() = 0;
     virtual Message takeMessageAt(int i) = 0;
 

-    virtual void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;

 
 private slots:
     void changeOfDay();
 
 private slots:
     void changeOfDay();

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index a52c1b9..4f1e26e 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -44,9 +44,9 @@ class NetworkItem : public PropertyMapItem
 public :
     NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = nullptr);
 
 public :
     NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = nullptr);
 

-    virtual QStringList propertyOrder() const;
+    QStringList propertyOrder() const override;

 
 

-    virtual QVariant data(int column, int row) const;
+    QVariant data(int column, int row) const override;

 
     /**
      * Escapes a string as HTML, ready for Qt markup.
 
     /**
      * Escapes a string as HTML, ready for Qt markup.


@@ -68,7 +68,7 @@ public :
     inline QString currentServer() const { return (bool)_network ? _network->currentServer() : QString(); }
     inline int nickCount() const { return (bool)_network ? _network->ircUsers().count() : 0; }
 
     inline QString currentServer() const { return (bool)_network ? _network->currentServer() : QString(); }
     inline int nickCount() const { return (bool)_network ? _network->ircUsers().count() : 0; }
 

-    virtual QString toolTip(int column) const;
+    QString toolTip(int column) const override;

 
     BufferItem *findBufferItem(BufferId bufferId);
     inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }
 
     BufferItem *findBufferItem(BufferId bufferId);
     inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }


@@ -111,11 +111,11 @@ class BufferItem : public PropertyMapItem
 public :
     BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent = nullptr);
 
 public :
     BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent = nullptr);
 

-    virtual QStringList propertyOrder() const;
+    QStringList propertyOrder() const override;

 
     inline const BufferInfo &bufferInfo() const { return _bufferInfo; }
 
     inline const BufferInfo &bufferInfo() const { return _bufferInfo; }

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

 
     inline BufferId bufferId() const { return _bufferInfo.bufferId(); }
     inline BufferInfo::Type bufferType() const { return _bufferInfo.type(); }
 
     inline BufferId bufferId() const { return _bufferInfo.bufferId(); }
     inline BufferInfo::Type bufferType() const { return _bufferInfo.type(); }


@@ -142,7 +142,7 @@ public :
     inline const MsgId &firstUnreadMsgId() const { return _firstUnreadMsgId; }
 
     bool isCurrentBuffer() const;
     inline const MsgId &firstUnreadMsgId() const { return _firstUnreadMsgId; }
 
     bool isCurrentBuffer() const;

-    virtual QString toolTip(int column) const;
+    QString toolTip(int column) const override;

 
 public slots:
     virtual inline void setTopic(const QString &) { emit dataChanged(1); }
 
 public slots:
     virtual inline void setTopic(const QString &) { emit dataChanged(1); }


@@ -167,8 +167,8 @@ class StatusBufferItem : public BufferItem
 public:
     StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 
 public:
     StatusBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 

-    virtual QString toolTip(int column) const;
-    virtual inline QString bufferName() const { return tr("Status Buffer"); }
+    QString toolTip(int column) const override;
+    inline QString bufferName() const override { return tr("Status Buffer"); }

 };
 
 
 };
 
 


@@ -182,13 +182,13 @@ class QueryBufferItem : public BufferItem
 public:
     QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 
 public:
     QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 

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

 
 

-    virtual inline bool isActive() const { return (bool)_ircUser; }
-    virtual QString toolTip(int column) const;
+    inline bool isActive() const override { return (bool)_ircUser; }
+    QString toolTip(int column) const override;

 
 

-    virtual void setBufferName(const QString &name);
+    void setBufferName(const QString &name) override;

 
 public slots:
     void setIrcUser(IrcUser *ircUser);
 
 public slots:
     void setIrcUser(IrcUser *ircUser);


@@ -211,12 +211,12 @@ class ChannelBufferItem : public BufferItem
 public:
     ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent);
 
 public:
     ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent);
 

-    virtual QVariant data(int column, int role) const;
-    virtual inline bool isActive() const { return (bool)_ircChannel; }
-    virtual QString toolTip(int column) const;
+    QVariant data(int column, int role) const override;
+    inline bool isActive() const override { return (bool)_ircChannel; }
+    QString toolTip(int column) const override;

 
 

-    virtual inline QString topic() const { return (bool)_ircChannel ? _ircChannel->topic() : QString(); }
-    virtual inline int nickCount() const { return (bool)_ircChannel ? _ircChannel->ircUsers().count() : 0; }
+    inline QString topic() const override { return (bool)_ircChannel ? _ircChannel->topic() : QString(); }
+    inline int nickCount() const override { return (bool)_ircChannel ? _ircChannel->ircUsers().count() : 0; }

 
     void attachIrcChannel(IrcChannel *ircChannel);
 
 
     void attachIrcChannel(IrcChannel *ircChannel);
 


@@ -260,11 +260,11 @@ class CLIENT_EXPORT UserCategoryItem : public PropertyMapItem
 public :
     UserCategoryItem(int category, AbstractTreeItem *parent);
 
 public :
     UserCategoryItem(int category, AbstractTreeItem *parent);
 

-    virtual QStringList propertyOrder() const;
+    QStringList propertyOrder() const override;

 
     QString categoryName() const;
     inline int categoryId() const { return _category; }
 
     QString categoryName() const;
     inline int categoryId() const { return _category; }

-    virtual QVariant data(int column, int role) const;
+    QVariant data(int column, int role) const override;

 
     IrcUserItem *findIrcUser(IrcUser *ircUser);
     void addUsers(const QList<IrcUser *> &ircUser);
 
     IrcUserItem *findIrcUser(IrcUser *ircUser);
     void addUsers(const QList<IrcUser *> &ircUser);


@@ -290,14 +290,14 @@ class IrcUserItem : public PropertyMapItem
 public :
     IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
 public :
     IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 

-    virtual QStringList propertyOrder() const;
+    QStringList propertyOrder() const override;

 
     inline QString nickName() const { return _ircUser ? _ircUser->nick() : QString(); }
     inline bool isActive() const { return _ircUser ? !_ircUser->isAway() : false; }
 
     inline IrcUser *ircUser() { return _ircUser; }
 
     inline QString nickName() const { return _ircUser ? _ircUser->nick() : QString(); }
     inline bool isActive() const { return _ircUser ? !_ircUser->isAway() : false; }
 
     inline IrcUser *ircUser() { return _ircUser; }

-    virtual QVariant data(int column, int role) const;
-    virtual QString toolTip(int column) const;
+    QVariant data(int column, int role) const override;
+    QString toolTip(int column) const override;

 
     /**
      * Gets the list of channel modes for this nick if parented to channel.
 
     /**
      * Gets the list of channel modes for this nick if parented to channel.


@@ -351,8 +351,8 @@ public:
     static bool mimeContainsBufferList(const QMimeData *mimeData);
     static QList<QPair<NetworkId, BufferId> > mimeDataToBufferList(const QMimeData *mimeData);
 
     static bool mimeContainsBufferList(const QMimeData *mimeData);
     static QList<QPair<NetworkId, BufferId> > mimeDataToBufferList(const QMimeData *mimeData);
 

-    virtual QStringList mimeTypes() const;
-    virtual QMimeData *mimeData(const QModelIndexList &) const;
+    QStringList mimeTypes() const override;
+    QMimeData *mimeData(const QModelIndexList &) const override;

 
     void attachNetwork(Network *network);
 
 
     void attachNetwork(Network *network);
 

diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index 7e097ec..5d3fbf3 100644 (file)
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -83,7 +83,7 @@ signals:
     void endRemoveChilds();
 
 protected:
     void endRemoveChilds();
 
 protected:

-    void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;

 
 private:
     QList<AbstractTreeItem *> _childItems;
 
 private:
     QList<AbstractTreeItem *> _childItems;


@@ -107,12 +107,12 @@ class CLIENT_EXPORT SimpleTreeItem : public AbstractTreeItem
 
 public:
     SimpleTreeItem(const QList<QVariant> &data, AbstractTreeItem *parent = nullptr);
 
 public:
     SimpleTreeItem(const QList<QVariant> &data, AbstractTreeItem *parent = nullptr);

-    virtual ~SimpleTreeItem();
+    ~SimpleTreeItem() override;

 
 

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

 
 

-    virtual int columnCount() const;
+    int columnCount() const override;

 
 private:
     QList<QVariant> _itemData;
 
 private:
     QList<QVariant> _itemData;


@@ -131,11 +131,11 @@ public:
 
     virtual QStringList propertyOrder() const = 0;
 
 
     virtual QStringList propertyOrder() const = 0;
 

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

 
     virtual QString toolTip(int column) const { Q_UNUSED(column) return QString(); }
 
     virtual QString toolTip(int column) const { Q_UNUSED(column) return QString(); }

-    virtual int columnCount() const;
+    int columnCount() const override;

 };
 
 
 };
 
 


@@ -153,23 +153,23 @@ public:
     };
 
     TreeModel(const QList<QVariant> &, QObject *parent = nullptr);
     };
 
     TreeModel(const QList<QVariant> &, QObject *parent = nullptr);

-    virtual ~TreeModel();
+    ~TreeModel() override;

 
     AbstractTreeItem *root() const;
 
 
     AbstractTreeItem *root() const;
 

-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;

 
 

-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;

 
 

-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;

     QModelIndex indexByItem(AbstractTreeItem *item) const;
 
     QModelIndex indexByItem(AbstractTreeItem *item) const;
 

-    QModelIndex parent(const QModelIndex &index) const;
+    QModelIndex parent(const QModelIndex &index) const override;

 
 

-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;

 
     virtual void clear();
 
 
     virtual void clear();
 

diff --git a/src/common/compressor.h b/src/common/compressor.h
index 1360b67..37d951d 100644 (file)
--- a/src/common/compressor.h
+++ b/src/common/compressor.h
@@ -50,7 +50,7 @@ public:
     };
 
     Compressor(QTcpSocket *socket, CompressionLevel level, QObject *parent = nullptr);
     };
 
     Compressor(QTcpSocket *socket, CompressionLevel level, QObject *parent = nullptr);

-    ~Compressor();
+    ~Compressor() override;

 
     CompressionLevel compressionLevel() const { return _level; }
 
 
     CompressionLevel compressionLevel() const { return _level; }
 

diff --git a/src/common/ctcpevent.h b/src/common/ctcpevent.h
index 1f0635b..0a31077 100644 (file)
--- a/src/common/ctcpevent.h
+++ b/src/common/ctcpevent.h
@@ -70,10 +70,10 @@ public:
 
 protected:
     explicit CtcpEvent(EventManager::EventType type, QVariantMap &map, Network *network);
 
 protected:
     explicit CtcpEvent(EventManager::EventType type, QVariantMap &map, Network *network);

-    void toVariantMap(QVariantMap &map) const;
+    void toVariantMap(QVariantMap &map) const override;

 
 

-    virtual inline QString className() const { return "CtcpEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "CtcpEvent"; }
+    inline void debugInfo(QDebug &dbg) const override

     {
         NetworkEvent::debugInfo(dbg);
         dbg << ", prefix = " << qPrintable(prefix())
     {
         NetworkEvent::debugInfo(dbg);
         dbg << ", prefix = " << qPrintable(prefix())

diff --git a/src/common/eventmanager.h b/src/common/eventmanager.h
index d4bd14a..6eab19d 100644 (file)
--- a/src/common/eventmanager.h
+++ b/src/common/eventmanager.h
@@ -152,7 +152,7 @@ public slots:
 
 protected:
     virtual Network *networkById(NetworkId id) const = 0;
 
 protected:
     virtual Network *networkById(NetworkId id) const = 0;

-    virtual void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;

 
 private:
     struct Handler {
 
 private:
     struct Handler {

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

-    ~IrcChannel();
+    ~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/ircevent.h b/src/common/ircevent.h
index e5a2313..c3611e4 100644 (file)
--- a/src/common/ircevent.h
+++ b/src/common/ircevent.h
@@ -46,10 +46,10 @@ public:
 
 protected:
     explicit IrcEvent(EventManager::EventType type, QVariantMap &map, Network *network);
 
 protected:
     explicit IrcEvent(EventManager::EventType type, QVariantMap &map, Network *network);

-    void toVariantMap(QVariantMap &map) const;
+    void toVariantMap(QVariantMap &map) const override;

 
 

-    virtual inline QString className() const { return "IrcEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "IrcEvent"; }
+    inline void debugInfo(QDebug &dbg) const override

     {
         NetworkEvent::debugInfo(dbg);
         dbg << ", prefix = " << qPrintable(prefix())
     {
         NetworkEvent::debugInfo(dbg);
         dbg << ", prefix = " << qPrintable(prefix())


@@ -79,10 +79,10 @@ public:
 
 protected:
     explicit IrcEventNumeric(EventManager::EventType type, QVariantMap &map, Network *network);
 
 protected:
     explicit IrcEventNumeric(EventManager::EventType type, QVariantMap &map, Network *network);

-    void toVariantMap(QVariantMap &map) const;
+    void toVariantMap(QVariantMap &map) const override;

 
 

-    virtual inline QString className() const { return "IrcEventNumeric"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "IrcEventNumeric"; }
+    inline void debugInfo(QDebug &dbg) const override

     {
         dbg << ", num = " << number();
         NetworkEvent::debugInfo(dbg);
     {
         dbg << ", num = " << number();
         NetworkEvent::debugInfo(dbg);


@@ -121,10 +121,10 @@ public:
 
 protected:
     explicit IrcEventRawMessage(EventManager::EventType type, QVariantMap &map, Network *network);
 
 protected:
     explicit IrcEventRawMessage(EventManager::EventType type, QVariantMap &map, Network *network);

-    void toVariantMap(QVariantMap &map) const;
+    void toVariantMap(QVariantMap &map) const override;

 
 

-    virtual inline QString className() const { return "IrcEventRawMessage"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "IrcEventRawMessage"; }
+    inline void debugInfo(QDebug &dbg) const override

     {
         NetworkEvent::debugInfo(dbg);
         dbg << ", target = " << qPrintable(target())
     {
         NetworkEvent::debugInfo(dbg);
         dbg << ", target = " << qPrintable(target())

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index 0b230eb..968ca7a 100644 (file)
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -61,7 +61,7 @@ class COMMON_EXPORT IrcUser : public SyncableObject
 
 public :
         IrcUser(const QString &hostmask, Network *network);
 
 public :
         IrcUser(const QString &hostmask, Network *network);

-    virtual ~IrcUser();
+    ~IrcUser() override;

 
     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/messageevent.h b/src/common/messageevent.h
index dfe81d0..9702e46 100644 (file)
--- a/src/common/messageevent.h
+++ b/src/common/messageevent.h
@@ -58,10 +58,10 @@ public:
 
 protected:
     explicit MessageEvent(EventManager::EventType type, QVariantMap &map, Network *network);
 
 protected:
     explicit MessageEvent(EventManager::EventType type, QVariantMap &map, Network *network);

-    void toVariantMap(QVariantMap &map) const;
+    void toVariantMap(QVariantMap &map) const override;

 
 

-    virtual inline QString className() const { return "MessageEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "MessageEvent"; }
+    inline void debugInfo(QDebug &dbg) const override

     {
         NetworkEvent::debugInfo(dbg);
         dbg.nospace() << ", sender = " << qPrintable(sender())
     {
         NetworkEvent::debugInfo(dbg);
         dbg.nospace() << ", sender = " << qPrintable(sender())

diff --git a/src/common/network.h b/src/common/network.h
index 104abe7..e237ef3 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -146,7 +146,7 @@ public :
     typedef QList<Server> ServerList;
 
     Network(const NetworkId &networkid, QObject *parent = nullptr);
     typedef QList<Server> ServerList;
 
     Network(const NetworkId &networkid, QObject *parent = nullptr);

-    ~Network();
+    ~Network() override;

 
     inline NetworkId networkId() const { return _networkId; }
 
 
     inline NetworkId networkId() const { return _networkId; }
 

diff --git a/src/common/networkevent.h b/src/common/networkevent.h
index fcae0b4..878b064 100644 (file)
--- a/src/common/networkevent.h
+++ b/src/common/networkevent.h
@@ -41,10 +41,10 @@ public:
 
 protected:
     explicit NetworkEvent(EventManager::EventType type, QVariantMap &map, Network *network);
 
 protected:
     explicit NetworkEvent(EventManager::EventType type, QVariantMap &map, Network *network);

-    void toVariantMap(QVariantMap &map) const;
+    void toVariantMap(QVariantMap &map) const override;

 
 

-    virtual inline QString className() const { return "NetworkEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const { dbg.nospace() << ", net = " << qPrintable(_network->networkName()); }
+    inline QString className() const override { return "NetworkEvent"; }
+    inline void debugInfo(QDebug &dbg) const override { dbg.nospace() << ", net = " << qPrintable(_network->networkName()); }

 
 private:
     Network *_network;
 
 private:
     Network *_network;


@@ -66,10 +66,10 @@ public:
 
 protected:
     explicit NetworkConnectionEvent(EventManager::EventType type, QVariantMap &map, Network *network);
 
 protected:
     explicit NetworkConnectionEvent(EventManager::EventType type, QVariantMap &map, Network *network);

-    void toVariantMap(QVariantMap &map) const;
+    void toVariantMap(QVariantMap &map) const override;

 
 

-    virtual inline QString className() const { return "NetworkConnectionEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "NetworkConnectionEvent"; }
+    inline void debugInfo(QDebug &dbg) const override

     {
         NetworkEvent::debugInfo(dbg);
         dbg.nospace() << ", state = " << qPrintable(QString::number(_state));
     {
         NetworkEvent::debugInfo(dbg);
         dbg.nospace() << ", state = " << qPrintable(QString::number(_state));


@@ -96,10 +96,10 @@ public:
 
 protected:
     explicit NetworkDataEvent(EventManager::EventType type, QVariantMap &map, Network *network);
 
 protected:
     explicit NetworkDataEvent(EventManager::EventType type, QVariantMap &map, Network *network);

-    void toVariantMap(QVariantMap &map) const;
+    void toVariantMap(QVariantMap &map) const override;

 
 

-    virtual inline QString className() const { return "NetworkDataEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "NetworkDataEvent"; }
+    inline void debugInfo(QDebug &dbg) const override

     {
         NetworkEvent::debugInfo(dbg);
         dbg.nospace() << ", data = " << data();
     {
         NetworkEvent::debugInfo(dbg);
         dbg.nospace() << ", data = " << data();


@@ -133,10 +133,10 @@ public:
 
 protected:
     explicit NetworkSplitEvent(EventManager::EventType type, QVariantMap &map, Network *network);
 
 protected:
     explicit NetworkSplitEvent(EventManager::EventType type, QVariantMap &map, Network *network);

-    void toVariantMap(QVariantMap &map) const;
+    void toVariantMap(QVariantMap &map) const override;

 
 

-    virtual inline QString className() const { return "NetworkSplitEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "NetworkSplitEvent"; }
+    inline void debugInfo(QDebug &dbg) const override

     {
         NetworkEvent::debugInfo(dbg);
         dbg.nospace() << ", channel = " << qPrintable(channel())
     {
         NetworkEvent::debugInfo(dbg);
         dbg.nospace() << ", channel = " << qPrintable(channel())

diff --git a/src/common/protocols/datastream/datastreampeer.h b/src/common/protocols/datastream/datastreampeer.h
index 7e5f5d8..5c1a442 100644 (file)
--- a/src/common/protocols/datastream/datastreampeer.h
+++ b/src/common/protocols/datastream/datastreampeer.h
@@ -41,31 +41,31 @@ public:
 
     DataStreamPeer(AuthHandler *authHandler, QTcpSocket *socket, quint16 features, Compressor::CompressionLevel level, QObject *parent = nullptr);
 
 
     DataStreamPeer(AuthHandler *authHandler, QTcpSocket *socket, quint16 features, Compressor::CompressionLevel level, QObject *parent = nullptr);
 

-    Protocol::Type protocol() const { return Protocol::DataStreamProtocol; }
-    QString protocolName() const { return "the DataStream protocol"; }
+    Protocol::Type protocol() const override { return Protocol::DataStreamProtocol; }
+    QString protocolName() const override { return "the DataStream protocol"; }

 
     static quint16 supportedFeatures();
     static bool acceptsFeatures(quint16 peerFeatures);
 
     static quint16 supportedFeatures();
     static bool acceptsFeatures(quint16 peerFeatures);

-    quint16 enabledFeatures() const;
+    quint16 enabledFeatures() const override;

 
 

-    void dispatch(const Protocol::RegisterClient &msg);
-    void dispatch(const Protocol::ClientDenied &msg);
-    void dispatch(const Protocol::ClientRegistered &msg);
-    void dispatch(const Protocol::SetupData &msg);
-    void dispatch(const Protocol::SetupFailed &msg);
-    void dispatch(const Protocol::SetupDone &msg);
-    void dispatch(const Protocol::Login &msg);
-    void dispatch(const Protocol::LoginFailed &msg);
-    void dispatch(const Protocol::LoginSuccess &msg);
-    void dispatch(const Protocol::SessionState &msg);
+    void dispatch(const Protocol::RegisterClient &msg) override;
+    void dispatch(const Protocol::ClientDenied &msg) override;
+    void dispatch(const Protocol::ClientRegistered &msg) override;
+    void dispatch(const Protocol::SetupData &msg) override;
+    void dispatch(const Protocol::SetupFailed &msg) override;
+    void dispatch(const Protocol::SetupDone &msg) override;
+    void dispatch(const Protocol::Login &msg) override;
+    void dispatch(const Protocol::LoginFailed &msg) override;
+    void dispatch(const Protocol::LoginSuccess &msg) override;
+    void dispatch(const Protocol::SessionState &msg) override;

 
 

-    void dispatch(const Protocol::SyncMessage &msg);
-    void dispatch(const Protocol::RpcCall &msg);
-    void dispatch(const Protocol::InitRequest &msg);
-    void dispatch(const Protocol::InitData &msg);
+    void dispatch(const Protocol::SyncMessage &msg) override;
+    void dispatch(const Protocol::RpcCall &msg) override;
+    void dispatch(const Protocol::InitRequest &msg) override;
+    void dispatch(const Protocol::InitData &msg) override;

 
 

-    void dispatch(const Protocol::HeartBeat &msg);
-    void dispatch(const Protocol::HeartBeatReply &msg);
+    void dispatch(const Protocol::HeartBeat &msg) override;
+    void dispatch(const Protocol::HeartBeatReply &msg) override;

 
 signals:
     void protocolError(const QString &errorString);
 
 signals:
     void protocolError(const QString &errorString);


@@ -74,7 +74,7 @@ private:
     using RemotePeer::writeMessage;
     void writeMessage(const QVariantMap &handshakeMsg);
     void writeMessage(const QVariantList &sigProxyMsg);
     using RemotePeer::writeMessage;
     void writeMessage(const QVariantMap &handshakeMsg);
     void writeMessage(const QVariantList &sigProxyMsg);

-    void processMessage(const QByteArray &msg);
+    void processMessage(const QByteArray &msg) override;

 
     void handleHandshakeMessage(const QVariantList &mapData);
     void handlePackedFunc(const QVariantList &packedFunc);
 
     void handleHandshakeMessage(const QVariantList &mapData);
     void handlePackedFunc(const QVariantList &packedFunc);

diff --git a/src/common/protocols/legacy/legacypeer.h b/src/common/protocols/legacy/legacypeer.h
index f9e0954..e2a2317 100644 (file)
--- a/src/common/protocols/legacy/legacypeer.h
+++ b/src/common/protocols/legacy/legacypeer.h
@@ -39,29 +39,29 @@ public:
 
     LegacyPeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = nullptr);
 
 
     LegacyPeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = nullptr);
 

-    Protocol::Type protocol() const { return Protocol::LegacyProtocol; }
-    QString protocolName() const { return "the legacy protocol"; }
-
-    void setSignalProxy(SignalProxy *proxy);
-
-    void dispatch(const Protocol::RegisterClient &msg);
-    void dispatch(const Protocol::ClientDenied &msg);
-    void dispatch(const Protocol::ClientRegistered &msg);
-    void dispatch(const Protocol::SetupData &msg);
-    void dispatch(const Protocol::SetupFailed &msg);
-    void dispatch(const Protocol::SetupDone &msg);
-    void dispatch(const Protocol::Login &msg);
-    void dispatch(const Protocol::LoginFailed &msg);
-    void dispatch(const Protocol::LoginSuccess &msg);
-    void dispatch(const Protocol::SessionState &msg);
-
-    void dispatch(const Protocol::SyncMessage &msg);
-    void dispatch(const Protocol::RpcCall &msg);
-    void dispatch(const Protocol::InitRequest &msg);
-    void dispatch(const Protocol::InitData &msg);
-
-    void dispatch(const Protocol::HeartBeat &msg);
-    void dispatch(const Protocol::HeartBeatReply &msg);
+    Protocol::Type protocol() const override { return Protocol::LegacyProtocol; }
+    QString protocolName() const override { return "the legacy protocol"; }
+
+    void setSignalProxy(SignalProxy *proxy) override;
+
+    void dispatch(const Protocol::RegisterClient &msg) override;
+    void dispatch(const Protocol::ClientDenied &msg) override;
+    void dispatch(const Protocol::ClientRegistered &msg) override;
+    void dispatch(const Protocol::SetupData &msg) override;
+    void dispatch(const Protocol::SetupFailed &msg) override;
+    void dispatch(const Protocol::SetupDone &msg) override;
+    void dispatch(const Protocol::Login &msg) override;
+    void dispatch(const Protocol::LoginFailed &msg) override;
+    void dispatch(const Protocol::LoginSuccess &msg) override;
+    void dispatch(const Protocol::SessionState &msg) override;
+
+    void dispatch(const Protocol::SyncMessage &msg) override;
+    void dispatch(const Protocol::RpcCall &msg) override;
+    void dispatch(const Protocol::InitRequest &msg) override;
+    void dispatch(const Protocol::InitData &msg) override;
+
+    void dispatch(const Protocol::HeartBeat &msg) override;
+    void dispatch(const Protocol::HeartBeatReply &msg) override;

 
 signals:
     void protocolError(const QString &errorString);
 
 signals:
     void protocolError(const QString &errorString);


@@ -72,7 +72,7 @@ signals:
 private:
     using RemotePeer::writeMessage;
     void writeMessage(const QVariant &item);
 private:
     using RemotePeer::writeMessage;
     void writeMessage(const QVariant &item);

-    void processMessage(const QByteArray &msg);
+    void processMessage(const QByteArray &msg) override;

 
     void handleHandshakeMessage(const QVariant &msg);
     void handlePackedFunc(const QVariant &packedFunc);
 
     void handleHandshakeMessage(const QVariant &msg);
     void handlePackedFunc(const QVariant &packedFunc);

diff --git a/src/common/remotepeer.h b/src/common/remotepeer.h
index e9d85f5..8a47b0a 100644 (file)
--- a/src/common/remotepeer.h
+++ b/src/common/remotepeer.h
@@ -44,20 +44,20 @@ public:
 
     RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = nullptr);
 
 
     RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = nullptr);
 

-    void setSignalProxy(SignalProxy *proxy);
+    void setSignalProxy(SignalProxy *proxy) override;

 
     virtual QString protocolName() const = 0;
 
     virtual QString protocolName() const = 0;

-    virtual QString description() const;
+    QString description() const override;

     virtual quint16 enabledFeatures() const { return 0; }
 
     virtual quint16 enabledFeatures() const { return 0; }
 

-    virtual QString address() const;
-    virtual quint16 port() const;
+    QString address() const override;
+    quint16 port() const override;

 
 

-    bool isOpen() const;
-    bool isSecure() const;
-    bool isLocal() const;
+    bool isOpen() const override;
+    bool isSecure() const override;
+    bool isLocal() const override;

 
 

-    int lag() const;
+    int lag() const override;

 
     bool compressionEnabled() const;
     void setCompressionEnabled(bool enabled);
 
     bool compressionEnabled() const;
     void setCompressionEnabled(bool enabled);


@@ -65,7 +65,7 @@ public:
     QTcpSocket *socket() const;
 
 public slots:
     QTcpSocket *socket() const;
 
 public slots:

-    void close(const QString &reason = QString());
+    void close(const QString &reason = QString()) override;

 
 signals:
     void transferProgress(int current, int max);
 
 signals:
     void transferProgress(int current, int max);


@@ -73,7 +73,7 @@ signals:
     void statusMessage(const QString &msg);
 
 protected:
     void statusMessage(const QString &msg);
 
 protected:

-    SignalProxy *signalProxy() const;
+    SignalProxy *signalProxy() const override;

 
     void writeMessage(const QByteArray &msg);
     virtual void processMessage(const QByteArray &msg) = 0;
 
     void writeMessage(const QByteArray &msg);
     virtual void processMessage(const QByteArray &msg) = 0;

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 52432eb..f0711f1 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -59,7 +59,7 @@ public:
     SignalRelay(SignalProxy *parent) : QObject(parent), _proxy(parent) {}
     inline SignalProxy *proxy() const { return _proxy; }
 
     SignalRelay(SignalProxy *parent) : QObject(parent), _proxy(parent) {}
     inline SignalProxy *proxy() const { return _proxy; }
 

-    int qt_metacall(QMetaObject::Call _c, int _id, void **_a);
+    int qt_metacall(QMetaObject::Call _c, int _id, void **_a) override;

 
     void attachSignal(QObject *sender, int signalId, const QByteArray &funcName);
     void detachSignal(QObject *sender, int signalId = -1);
 
     void attachSignal(QObject *sender, int signalId, const QByteArray &funcName);
     void detachSignal(QObject *sender, int signalId = -1);

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 38bc00f..935df5e 100644 (file)
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -54,7 +54,7 @@ public:
 
     SignalProxy(QObject *parent);
     SignalProxy(ProxyMode mode, QObject *parent);
 
     SignalProxy(QObject *parent);
     SignalProxy(ProxyMode mode, QObject *parent);

-    virtual ~SignalProxy();
+    ~SignalProxy() override;

 
     void setProxyMode(ProxyMode mode);
     inline ProxyMode proxyMode() const { return _proxyMode; }
 
     void setProxyMode(ProxyMode mode);
     inline ProxyMode proxyMode() const { return _proxyMode; }


@@ -128,7 +128,7 @@ public slots:
     void detachSlots(QObject *receiver);
 
 protected:
     void detachSlots(QObject *receiver);
 
 protected:

-    void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;

     void sync_call__(const SyncableObject *obj, ProxyMode modeType, const char *funcname, va_list ap);
     void renameObject(const SyncableObject *obj, const QString &newname, const QString &oldname);
 
     void sync_call__(const SyncableObject *obj, ProxyMode modeType, const char *funcname, va_list ap);
     void renameObject(const SyncableObject *obj, const QString &newname, const QString &oldname);
 

diff --git a/src/core/abstractsqlstorage.h b/src/core/abstractsqlstorage.h
index 9c371ff..d4670e7 100644 (file)
--- a/src/core/abstractsqlstorage.h
+++ b/src/core/abstractsqlstorage.h
@@ -37,21 +37,21 @@ class AbstractSqlStorage : public Storage
 
 public:
     AbstractSqlStorage(QObject *parent = nullptr);
 
 public:
     AbstractSqlStorage(QObject *parent = nullptr);

-    virtual ~AbstractSqlStorage();
+    ~AbstractSqlStorage() override;

 
     virtual std::unique_ptr<AbstractSqlMigrationReader> createMigrationReader() { return {}; }
     virtual std::unique_ptr<AbstractSqlMigrationWriter> createMigrationWriter() { return {}; }
 
 public slots:
 
     virtual std::unique_ptr<AbstractSqlMigrationReader> createMigrationReader() { return {}; }
     virtual std::unique_ptr<AbstractSqlMigrationWriter> createMigrationWriter() { return {}; }
 
 public slots:

-    virtual State init(const QVariantMap &settings = QVariantMap(),
+    State init(const QVariantMap &settings = QVariantMap(),

                        const QProcessEnvironment &environment = {},
                        const QProcessEnvironment &environment = {},

-                       bool loadFromEnvironment = false);
-    virtual bool setup(const QVariantMap &settings = QVariantMap(),
+                       bool loadFromEnvironment = false) override;
+    bool setup(const QVariantMap &settings = QVariantMap(),

                        const QProcessEnvironment &environment = {},
                        const QProcessEnvironment &environment = {},

-                       bool loadFromEnvironment = false);
+                       bool loadFromEnvironment = false) override;

 
 protected:
 
 protected:

-    inline virtual void sync() {};
+    inline void sync() override {};

 
     QSqlDatabase logDb();
 
 
     QSqlDatabase logDb();
 


@@ -142,7 +142,7 @@ class AbstractSqlStorage::Connection : public QObject
 
 public:
     Connection(const QString &name, QObject *parent = nullptr);
 
 public:
     Connection(const QString &name, QObject *parent = nullptr);

-    ~Connection();
+    ~Connection() override;

 
     inline QLatin1String name() const { return QLatin1String(_name); }
 
 
     inline QLatin1String name() const { return QLatin1String(_name); }
 

diff --git a/src/core/corealiasmanager.h b/src/core/corealiasmanager.h
index ceeee07..68a0b96 100644 (file)
--- a/src/core/corealiasmanager.h
+++ b/src/core/corealiasmanager.h
@@ -32,7 +32,7 @@ public:
     explicit CoreAliasManager(CoreSession *parent);
 
 protected:
     explicit CoreAliasManager(CoreSession *parent);
 
 protected:

-    const Network *network(NetworkId) const;
+    const Network *network(NetworkId) const override;

 
 private slots:
     void save() const;
 
 private slots:
     void save() const;

diff --git a/src/core/coreauthhandler.h b/src/core/coreauthhandler.h
index 1b4e6b9..e26e94c 100644 (file)
--- a/src/core/coreauthhandler.h
+++ b/src/core/coreauthhandler.h
@@ -39,9 +39,9 @@ signals:
 private:
     using AuthHandler::handle;
 
 private:
     using AuthHandler::handle;
 

-    void handle(const Protocol::RegisterClient &msg);
-    void handle(const Protocol::SetupData &msg);
-    void handle(const Protocol::Login &msg);
+    void handle(const Protocol::RegisterClient &msg) override;
+    void handle(const Protocol::SetupData &msg) override;
+    void handle(const Protocol::Login &msg) override;

 
     void setPeer(RemotePeer *peer);
     void startSsl();
 
     void setPeer(RemotePeer *peer);
     void startSsl();

diff --git a/src/core/corebufferviewconfig.h b/src/core/corebufferviewconfig.h
index d41205a..3cb0b10 100644 (file)
--- a/src/core/corebufferviewconfig.h
+++ b/src/core/corebufferviewconfig.h
@@ -31,9 +31,9 @@ public:
     CoreBufferViewConfig(int bufferViewId, const QVariantMap &properties, QObject *parent = nullptr);
 
 public slots:
     CoreBufferViewConfig(int bufferViewId, const QVariantMap &properties, QObject *parent = nullptr);
 
 public slots:

-    virtual inline void requestSetBufferViewName(const QString &bufferViewName) { setBufferViewName(bufferViewName); }
-    virtual inline void requestRemoveBuffer(const BufferId &bufferId) { removeBuffer(bufferId); }
-    virtual inline void requestRemoveBufferPermanently(const BufferId &bufferId) { removeBufferPermanently(bufferId); }
-    virtual inline void requestAddBuffer(const BufferId &bufferId, int pos) { addBuffer(bufferId, pos); }
-    virtual inline void requestMoveBuffer(const BufferId &bufferId, int pos) { moveBuffer(bufferId, pos); }
+    inline void requestSetBufferViewName(const QString &bufferViewName) override { setBufferViewName(bufferViewName); }
+    inline void requestRemoveBuffer(const BufferId &bufferId) override { removeBuffer(bufferId); }
+    inline void requestRemoveBufferPermanently(const BufferId &bufferId) override { removeBufferPermanently(bufferId); }
+    inline void requestAddBuffer(const BufferId &bufferId, int pos) override { addBuffer(bufferId, pos); }
+    inline void requestMoveBuffer(const BufferId &bufferId, int pos) override { moveBuffer(bufferId, pos); }

 };
 };

diff --git a/src/core/corebufferviewmanager.h b/src/core/corebufferviewmanager.h
index 782a753..e24f2e6 100644 (file)
--- a/src/core/corebufferviewmanager.h
+++ b/src/core/corebufferviewmanager.h
@@ -32,10 +32,10 @@ public:
     CoreBufferViewManager(SignalProxy *proxy, CoreSession *parent);
 
 public slots:
     CoreBufferViewManager(SignalProxy *proxy, CoreSession *parent);
 
 public slots:

-    virtual void requestCreateBufferView(const QVariantMap &properties);
-    virtual void requestCreateBufferViews(const QVariantList &properties);
-    virtual void requestDeleteBufferView(int bufferViewId);
-    virtual void requestDeleteBufferViews(const QVariantList &bufferViews);
+    void requestCreateBufferView(const QVariantMap &properties) override;
+    void requestCreateBufferViews(const QVariantList &properties) override;
+    void requestDeleteBufferView(int bufferViewId) override;
+    void requestDeleteBufferViews(const QVariantList &bufferViews) override;

 
     void saveBufferViews();
 
 
     void saveBufferViews();
 

diff --git a/src/core/coreeventmanager.h b/src/core/coreeventmanager.h
index eb6d912..90c3838 100644 (file)
--- a/src/core/coreeventmanager.h
+++ b/src/core/coreeventmanager.h
@@ -36,7 +36,7 @@ public:
     {}
 
 protected:
     {}
 
 protected:

-    inline Network *networkById(NetworkId id) const { return _coreSession->network(id); }
+    inline Network *networkById(NetworkId id) const override { return _coreSession->network(id); }

 
 private:
     CoreSession *_coreSession;
 
 private:
     CoreSession *_coreSession;

diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h
index 9fbc24e..8c65146 100644 (file)
--- a/src/core/coreidentity.h
+++ b/src/core/coreidentity.h
@@ -42,12 +42,12 @@ public:
     CoreCertManager(CoreIdentity &identity);
 
 #ifdef HAVE_SSL
     CoreCertManager(CoreIdentity &identity);
 
 #ifdef HAVE_SSL

-    virtual const QSslKey &sslKey() const;
-    virtual const QSslCertificate &sslCert() const;
+    const QSslKey &sslKey() const override;
+    const QSslCertificate &sslCert() const override;

 
 public slots:
 
 public slots:

-    virtual void setSslKey(const QByteArray &encoded);
-    virtual void setSslCert(const QByteArray &encoded);
+    void setSslKey(const QByteArray &encoded) override;
+    void setSslCert(const QByteArray &encoded) override;

 #endif
 
     void setId(IdentityId id);
 #endif
 
     void setId(IdentityId id);

diff --git a/src/core/coreignorelistmanager.h b/src/core/coreignorelistmanager.h
index 5469574..e7665ca 100644 (file)
--- a/src/core/coreignorelistmanager.h
+++ b/src/core/coreignorelistmanager.h
@@ -35,10 +35,10 @@ public:
     StrictnessType match(const RawMessage &rawMsg, const QString &networkName);
 
 public slots:
     StrictnessType match(const RawMessage &rawMsg, const QString &networkName);
 
 public slots:

-    virtual inline void requestToggleIgnoreRule(const QString &ignoreRule) { toggleIgnoreRule(ignoreRule); }
-    virtual inline void requestRemoveIgnoreListItem(const QString &ignoreRule) { removeIgnoreListItem(ignoreRule); }
-    virtual inline void requestAddIgnoreListItem(int type, const QString &ignoreRule, bool isRegEx, int strictness,
-        int scope, const QString &scopeRule, bool isActive)
+    inline void requestToggleIgnoreRule(const QString &ignoreRule) override { toggleIgnoreRule(ignoreRule); }
+    inline void requestRemoveIgnoreListItem(const QString &ignoreRule) override { removeIgnoreListItem(ignoreRule); }
+    inline void requestAddIgnoreListItem(int type, const QString &ignoreRule, bool isRegEx, int strictness,
+        int scope, const QString &scopeRule, bool isActive) override

     {
         addIgnoreListItem(type, ignoreRule, isRegEx, strictness, scope, scopeRule, isActive);
     }
     {
         addIgnoreListItem(type, ignoreRule, isRegEx, strictness, scope, scopeRule, isActive);
     }

diff --git a/src/core/coreircchannel.h b/src/core/coreircchannel.h
index 249aca0..b1b586b 100644 (file)
--- a/src/core/coreircchannel.h
+++ b/src/core/coreircchannel.h
@@ -32,7 +32,7 @@ class CoreIrcChannel : public IrcChannel
 
 public:
     CoreIrcChannel(const QString &channelname, Network *network);
 
 public:
     CoreIrcChannel(const QString &channelname, Network *network);

-    virtual ~CoreIrcChannel();
+    ~CoreIrcChannel() override;

 
 #ifdef HAVE_QCA2
     Cipher *cipher() const;
 
 #ifdef HAVE_QCA2
     Cipher *cipher() const;

diff --git a/src/core/coreirclisthelper.h b/src/core/coreirclisthelper.h
index 637b367..8cb7c62 100644 (file)
--- a/src/core/coreirclisthelper.h
+++ b/src/core/coreirclisthelper.h
@@ -41,12 +41,12 @@ public:
     inline bool requestInProgress(const NetworkId &netId) const { return _channelLists.contains(netId); }
 
 public slots:
     inline bool requestInProgress(const NetworkId &netId) const { return _channelLists.contains(netId); }
 
 public slots:

-    virtual QVariantList requestChannelList(const NetworkId &netId, const QStringList &channelFilters);
+    QVariantList requestChannelList(const NetworkId &netId, const QStringList &channelFilters) override;

     bool addChannel(const NetworkId &netId, const QString &channelName, quint32 userCount, const QString &topic);
     bool endOfChannelList(const NetworkId &netId);
 
 protected:
     bool addChannel(const NetworkId &netId, const QString &channelName, quint32 userCount, const QString &topic);
     bool endOfChannelList(const NetworkId &netId);
 
 protected:

-    void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent *event) override;

 
 private:
     bool dispatchQuery(const NetworkId &netId, const QString &query);
 
 private:
     bool dispatchQuery(const NetworkId &netId, const QString &query);

diff --git a/src/core/coreircuser.h b/src/core/coreircuser.h
index e0806d3..5acb930 100644 (file)
--- a/src/core/coreircuser.h
+++ b/src/core/coreircuser.h
@@ -32,7 +32,7 @@ class CoreIrcUser : public IrcUser
 
 public:
     CoreIrcUser(const QString &hostmask, Network *network);
 
 public:
     CoreIrcUser(const QString &hostmask, Network *network);

-    virtual ~CoreIrcUser();
+    ~CoreIrcUser() override;

 
 #ifdef HAVE_QCA2
     Cipher *cipher() const;
 
 #ifdef HAVE_QCA2
     Cipher *cipher() const;

diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h
index 4082268..a774912 100644 (file)
--- a/src/core/corenetwork.h
+++ b/src/core/corenetwork.h
@@ -55,8 +55,7 @@ class CoreNetwork : public Network
 
 public:
     CoreNetwork(const NetworkId &networkid, CoreSession *session);
 
 public:
     CoreNetwork(const NetworkId &networkid, CoreSession *session);

-    virtual ~CoreNetwork();
-
+    ~CoreNetwork() override;

 
     inline CoreIdentity *identityPtr() const { return coreSession()->identity(identity()); }
     inline CoreSession *coreSession() const { return _coreSession; }
 
     inline CoreIdentity *identityPtr() const { return coreSession()->identity(identity()); }
     inline CoreSession *coreSession() const { return _coreSession; }


@@ -204,15 +203,15 @@ public:
     };
 
 public slots:
     };
 
 public slots:

-    virtual void setMyNick(const QString &mynick);
+    void setMyNick(const QString &mynick) override;

 
 

-    virtual void requestConnect() const;
-    virtual void requestDisconnect() const;
-    virtual void requestSetNetworkInfo(const NetworkInfo &info);
+    void requestConnect() const override;
+    void requestDisconnect() const override;
+    void requestSetNetworkInfo(const NetworkInfo &info) override;

 
 

-    virtual void setUseAutoReconnect(bool);
-    virtual void setAutoReconnectInterval(quint32);
-    virtual void setAutoReconnectRetries(quint16);
+    void setUseAutoReconnect(bool) override;
+    void setAutoReconnectInterval(quint32) override;
+    void setAutoReconnectRetries(quint16) override;

 
     void setPingInterval(int interval);
 
 
     void setPingInterval(int interval);
 


@@ -446,8 +445,8 @@ signals:
     void socketDisconnected(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort, qint64 socketId);
 
 protected:
     void socketDisconnected(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort, qint64 socketId);
 
 protected:

-    inline virtual IrcChannel *ircChannelFactory(const QString &channelname) { return new CoreIrcChannel(channelname, this); }
-    inline virtual IrcUser *ircUserFactory(const QString &hostmask) { return new CoreIrcUser(hostmask, this); }
+    inline IrcChannel *ircChannelFactory(const QString &channelname) override { return new CoreIrcChannel(channelname, this); }
+    inline IrcUser *ircUserFactory(const QString &hostmask) override { return new CoreIrcUser(hostmask, this); }

 
 protected slots:
     // TODO: remove cached cipher keys, when appropriate
 
 protected slots:
     // TODO: remove cached cipher keys, when appropriate

diff --git a/src/core/corenetworkconfig.h b/src/core/corenetworkconfig.h
index 4b08a58..bed9e1e 100644 (file)
--- a/src/core/corenetworkconfig.h
+++ b/src/core/corenetworkconfig.h
@@ -34,12 +34,12 @@ public:
     void save();
 
 public slots:
     void save();
 
 public slots:

-    virtual inline void requestSetPingTimeoutEnabled(bool enabled) { setPingTimeoutEnabled(enabled); }
-    virtual inline void requestSetPingInterval(int interval) { setPingInterval(interval); }
-    virtual inline void requestSetMaxPingCount(int count) { setMaxPingCount(count); }
-    virtual inline void requestSetAutoWhoEnabled(bool enabled) { setAutoWhoEnabled(enabled); }
-    virtual inline void requestSetAutoWhoInterval(int interval) { setAutoWhoInterval(interval); }
-    virtual inline void requestSetAutoWhoNickLimit(int nickLimit) { setAutoWhoNickLimit(nickLimit); }
-    virtual inline void requestSetAutoWhoDelay(int delay) { setAutoWhoDelay(delay); }
-    virtual inline void requestSetStandardCtcp(bool enabled) { setStandardCtcp(enabled); }
+    inline void requestSetPingTimeoutEnabled(bool enabled) override { setPingTimeoutEnabled(enabled); }
+    inline void requestSetPingInterval(int interval) override { setPingInterval(interval); }
+    inline void requestSetMaxPingCount(int count) override { setMaxPingCount(count); }
+    inline void requestSetAutoWhoEnabled(bool enabled) override { setAutoWhoEnabled(enabled); }
+    inline void requestSetAutoWhoInterval(int interval) override { setAutoWhoInterval(interval); }
+    inline void requestSetAutoWhoNickLimit(int nickLimit) override { setAutoWhoNickLimit(nickLimit); }
+    inline void requestSetAutoWhoDelay(int delay) override { setAutoWhoDelay(delay); }
+    inline void requestSetStandardCtcp(bool enabled) override { setStandardCtcp(enabled); }

 };
 };

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 176a23c..2cbba0c 100644 (file)
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -195,7 +195,7 @@ signals:
     void disconnectFromCore();
 
 protected:
     void disconnectFromCore();
 
 protected:

-    virtual void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;

 
 private slots:
     void removeClient(Peer *peer);
 
 private slots:
     void removeClient(Peer *peer);

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

-    virtual ~CoreSettings();
+    ~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 55539e6..6a9766a 100644 (file)
--- a/src/core/coreuserinputhandler.h
+++ b/src/core/coreuserinputhandler.h
@@ -107,7 +107,7 @@ public slots:
     void issueAway(const QString &msg, bool autoCheck = true, const bool skipFormatting = false);
 
 protected:
     void issueAway(const QString &msg, bool autoCheck = true, const bool skipFormatting = false);
 
 protected:

-    void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent *event) override;

 
 private:
     void doMode(const BufferInfo& bufferInfo, const QChar &addOrRemove, const QChar &mode, const QString &nickList);
 
 private:
     void doMode(const BufferInfo& bufferInfo, const QChar &addOrRemove, const QChar &mode, const QString &nickList);

diff --git a/src/core/keyevent.h b/src/core/keyevent.h
index 9c24fbb..b3f4d48 100644 (file)
--- a/src/core/keyevent.h
+++ b/src/core/keyevent.h
@@ -56,10 +56,10 @@ public:
 
 protected:
     explicit KeyEvent(EventManager::EventType type, QVariantMap &map, Network *network);
 
 protected:
     explicit KeyEvent(EventManager::EventType type, QVariantMap &map, Network *network);

-    void toVariantMap(QVariantMap &map) const;
+    void toVariantMap(QVariantMap &map) const override;

 
 

-    virtual inline QString className() const { return "KeyEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "KeyEvent"; }
+    inline void debugInfo(QDebug &dbg) const override

     {
         NetworkEvent::debugInfo(dbg);
         dbg << ", prefix = " << qPrintable(prefix())
     {
         NetworkEvent::debugInfo(dbg);
         dbg << ", prefix = " << qPrintable(prefix())

diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h
index c0d375b..fc022fe 100644 (file)
--- a/src/core/oidentdconfiggenerator.h
+++ b/src/core/oidentdconfiggenerator.h
@@ -55,7 +55,7 @@ class OidentdConfigGenerator : public QObject
     Q_OBJECT
 public:
     explicit OidentdConfigGenerator(QObject *parent = nullptr);
     Q_OBJECT
 public:
     explicit OidentdConfigGenerator(QObject *parent = nullptr);

-    ~OidentdConfigGenerator();
+    ~OidentdConfigGenerator() override;

 
 public slots:
     bool addSocket(const CoreIdentity *identity, const QHostAddress &localAddress,
 
 public slots:
     bool addSocket(const CoreIdentity *identity, const QHostAddress &localAddress,

diff --git a/src/core/sessionthread.h b/src/core/sessionthread.h
index 5a9a8bc..e360754 100644 (file)
--- a/src/core/sessionthread.h
+++ b/src/core/sessionthread.h
@@ -37,7 +37,7 @@ class SessionThread : public QObject
 
 public:
     SessionThread(UserId user, bool restoreState, bool strictIdentEnabled, QObject *parent = nullptr);
 
 public:
     SessionThread(UserId user, bool restoreState, bool strictIdentEnabled, QObject *parent = nullptr);

-    ~SessionThread();
+    ~SessionThread() override;

 
 public slots:
     void addClient(Peer *peer);
 
 public slots:
     void addClient(Peer *peer);

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

-    virtual ~SqlAuthenticator();
+    ~SqlAuthenticator() override;

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

-    bool isAvailable() const;
-    QString backendId() const;
-    QString displayName() const;
-    QString description() const;
-    virtual inline QVariantList setupData() const { return {}; }
+    bool isAvailable() const override;
+    QString backendId() const override;
+    QString displayName() const override;
+    QString description() const override;
+    inline QVariantList setupData() const override { return {}; }

 
 

-    virtual inline bool canChangePassword() const { return true; }
+    inline bool canChangePassword() const override { return true; }

 
     bool setup(const QVariantMap &settings, const QProcessEnvironment &environment,
 
     bool setup(const QVariantMap &settings, const QProcessEnvironment &environment,

-               bool loadFromEnvironment);
+               bool loadFromEnvironment) override;

     State init(const QVariantMap &settings, const QProcessEnvironment &environment,
     State init(const QVariantMap &settings, const QProcessEnvironment &environment,

-               bool loadFromEnvironment);
-    UserId validateUser(const QString &user, const QString &password);
+               bool loadFromEnvironment) override;
+    UserId validateUser(const QString &user, const QString &password) override;

 
     /* User handling */
     //virtual UserId getUserId(const QString &username);
 
     /* User handling */
     //virtual UserId getUserId(const QString &username);

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

-    virtual ~Storage() {};
+    ~Storage() override {};

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

diff --git a/src/qtui/awaylogfilter.h b/src/qtui/awaylogfilter.h
index 3b96c44..5ade7f0 100644 (file)
--- a/src/qtui/awaylogfilter.h
+++ b/src/qtui/awaylogfilter.h
@@ -30,9 +30,9 @@ class AwayLogFilter : public ChatMonitorFilter
 public:
     AwayLogFilter(MessageModel *model, QObject *parent = nullptr);
 
 public:
     AwayLogFilter(MessageModel *model, QObject *parent = nullptr);
 

-    virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
-    virtual QString idString() const { return "AwayLog"; }
-    virtual QVariant data(const QModelIndex &index, int role) const;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    QString idString() const override { return "AwayLog"; }
+    QVariant data(const QModelIndex &index, int role) const override;

 };
 
 
 };
 
 

diff --git a/src/qtui/awaylogview.h b/src/qtui/awaylogview.h
index ed7dba5..d634690 100644 (file)
--- a/src/qtui/awaylogview.h
+++ b/src/qtui/awaylogview.h
@@ -31,7 +31,7 @@ class AwayLogView : public ChatMonitorView
 
 public:
     AwayLogView(AwayLogFilter *filter, QWidget *parent = nullptr);
 
 public:
     AwayLogView(AwayLogFilter *filter, QWidget *parent = nullptr);

-    virtual void addActionsToMenu(QMenu *menu, const QPointF &pos);
+    void addActionsToMenu(QMenu *menu, const QPointF &pos) override;

 };
 
 
 };
 
 

diff --git a/src/qtui/bufferwidget.h b/src/qtui/bufferwidget.h
index e467ecc..3549495 100644 (file)
--- a/src/qtui/bufferwidget.h
+++ b/src/qtui/bufferwidget.h
@@ -35,9 +35,9 @@ class BufferWidget : public AbstractBufferContainer
 
 public:
     BufferWidget(QWidget *parent);
 
 public:
     BufferWidget(QWidget *parent);

-    ~BufferWidget();
+    ~BufferWidget() override;

 
 

-    virtual bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) override;

 
     inline ChatViewSearchBar *searchBar() const { return ui.searchBar; }
     void addActionsToMenu(QMenu *, const QPointF &pos);
 
     inline ChatViewSearchBar *searchBar() const { return ui.searchBar; }
     void addActionsToMenu(QMenu *, const QPointF &pos);


@@ -48,13 +48,13 @@ public slots:
     virtual void jumpToMarkerLine(ChatView *view = nullptr, bool requestBacklog = true);
 
 protected:
     virtual void jumpToMarkerLine(ChatView *view = nullptr, bool requestBacklog = true);
 
 protected:

-    virtual AbstractChatView *createChatView(BufferId);
-    virtual void removeChatView(BufferId);
-    virtual inline bool autoMarkerLine() const { return _autoMarkerLine; }
+    AbstractChatView *createChatView(BufferId) override;
+    void removeChatView(BufferId) override;
+    inline bool autoMarkerLine() const override { return _autoMarkerLine; }

 
 protected slots:
 
 protected slots:

-    virtual void currentChanged(const QModelIndex &current, const QModelIndex &previous);
-    virtual void showChatView(BufferId);
+    void currentChanged(const QModelIndex &current, const QModelIndex &previous) override;
+    void showChatView(BufferId) override;

 
 private slots:
     void scrollToHighlight(QGraphicsItem *highlightItem);
 
 private slots:
     void scrollToHighlight(QGraphicsItem *highlightItem);

diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h
index 52f5c36..41937fc 100644 (file)
--- a/src/qtui/chatitem.h
+++ b/src/qtui/chatitem.h
@@ -158,8 +158,8 @@ class TimestampChatItem : public ChatItem
 {
 public:
     TimestampChatItem(const QRectF &boundingRect, ChatLine *parent) : ChatItem(boundingRect, parent) {}
 {
 public:
     TimestampChatItem(const QRectF &boundingRect, ChatLine *parent) : ChatItem(boundingRect, parent) {}

-    virtual inline int type() const { return ChatScene::TimestampChatItemType; }
-    virtual inline ChatLineModel::ColumnType column() const { return ChatLineModel::TimestampColumn; }
+    inline int type() const override { return ChatScene::TimestampChatItemType; }
+    inline ChatLineModel::ColumnType column() const override { return ChatLineModel::TimestampColumn; }

 };
 
 
 };
 
 


@@ -171,13 +171,13 @@ class SenderChatItem : public ChatItem
 {
 public:
     SenderChatItem(const QRectF &boundingRect, ChatLine *parent) : ChatItem(boundingRect, parent) {}
 {
 public:
     SenderChatItem(const QRectF &boundingRect, ChatLine *parent) : ChatItem(boundingRect, parent) {}

-    virtual inline ChatLineModel::ColumnType column() const { return ChatLineModel::SenderColumn; }
-    virtual void handleClick(const QPointF &pos, ChatScene::ClickMode clickMode);
+    inline ChatLineModel::ColumnType column() const override { return ChatLineModel::SenderColumn; }
+    void handleClick(const QPointF &pos, ChatScene::ClickMode clickMode) override;

 
 protected:
 
 protected:

-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr);
-    virtual inline int type() const { return ChatScene::SenderChatItemType; }
-    virtual void initLayout(QTextLayout *layout) const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;
+    inline int type() const override { return ChatScene::SenderChatItemType; }
+    void initLayout(QTextLayout *layout) const override;

 };
 
 
 };
 
 


@@ -193,30 +193,30 @@ class ContentsChatItem : public ChatItem
 
 public:
     ContentsChatItem(const QPointF &pos, const qreal &width, ChatLine *parent);
 
 public:
     ContentsChatItem(const QPointF &pos, const qreal &width, ChatLine *parent);

-    ~ContentsChatItem();
+    ~ContentsChatItem() override;

 
 

-    virtual inline int type() const { return ChatScene::ContentsChatItemType; }
+    inline int type() const override { return ChatScene::ContentsChatItemType; }

 
 

-    inline ChatLineModel::ColumnType column() const { return ChatLineModel::ContentsColumn; }
+    inline ChatLineModel::ColumnType column() const override { return ChatLineModel::ContentsColumn; }

     QFontMetricsF *fontMetrics() const;
 
     QFontMetricsF *fontMetrics() const;
 

-    virtual void clearCache();
+    void clearCache() override;

 
 protected:
 
 protected:

-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
-    virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
-    virtual void handleClick(const QPointF &pos, ChatScene::ClickMode clickMode);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
+    void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override;
+    void handleClick(const QPointF &pos, ChatScene::ClickMode clickMode) override;

 
 

-    virtual bool hasActiveClickable() const;
-    virtual std::pair<quint16, quint16> activeClickableRange() const;
+    bool hasActiveClickable() const override;
+    std::pair<quint16, quint16> activeClickableRange() const override;

 
 

-    virtual void addActionsToMenu(QMenu *menu, const QPointF &itemPos);
+    void addActionsToMenu(QMenu *menu, const QPointF &itemPos) override;

     virtual void copyLinkToClipboard();
 
     virtual void copyLinkToClipboard();
 

-    virtual void initLayout(QTextLayout *layout) const;
-    virtual void doLayout(QTextLayout *layout) const;
-    virtual UiStyle::FormatList formatList() const;
+    void initLayout(QTextLayout *layout) const override;
+    void doLayout(QTextLayout *layout) const override;
+    UiStyle::FormatList formatList() const override;

 
 private:
     class ActionProxy;
 
 private:
     class ActionProxy;

diff --git a/src/qtui/chatline.h b/src/qtui/chatline.h
index ed2de36..1fdedd5 100644 (file)
--- a/src/qtui/chatline.h
+++ b/src/qtui/chatline.h
@@ -36,9 +36,9 @@ public:
         const QPointF &senderPos, const QPointF &contentsPos,
         QGraphicsItem *parent = nullptr);
 
         const QPointF &senderPos, const QPointF &contentsPos,
         QGraphicsItem *parent = nullptr);
 

-    virtual ~ChatLine();
+    ~ChatLine() override;

 
 

-    virtual inline QRectF boundingRect() const { return QRectF(0, 0, _width, _height); }
+    inline QRectF boundingRect() const override { return QRectF(0, 0, _width, _height); }

 
     inline QModelIndex index() const { return model()->index(row(), 0); }
     inline MsgId msgId() const { return index().data(MessageModel::MsgIdRole).value<MsgId>(); }
 
     inline QModelIndex index() const { return model()->index(row(), 0); }
     inline MsgId msgId() const { return index().data(MessageModel::MsgIdRole).value<MsgId>(); }


@@ -60,9 +60,9 @@ public:
     inline ChatItem *senderItem() { return &_senderItem; }
     inline ContentsChatItem *contentsItem() { return &_contentsItem; }
 
     inline ChatItem *senderItem() { return &_senderItem; }
     inline ContentsChatItem *contentsItem() { return &_contentsItem; }
 

-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;

     enum { Type = ChatScene::ChatLineType };
     enum { Type = ChatScene::ChatLineType };

-    virtual inline int type() const { return Type; }
+    inline int type() const override { return Type; }

 
     // pos is relative to the parent ChatLine
     void setFirstColumn(const qreal &timestampWidth, const qreal &senderWidth, const QPointF &senderPos);
 
     // pos is relative to the parent ChatLine
     void setFirstColumn(const qreal &timestampWidth, const qreal &senderWidth, const QPointF &senderPos);


@@ -77,15 +77,15 @@ public:
     void clearCache();
 
 protected:
     void clearCache();
 
 protected:

-    virtual bool sceneEvent(QEvent *event);
+    bool sceneEvent(QEvent *event) override;

 
     // These need to be relayed to the appropriate ChatItem
 
     // These need to be relayed to the appropriate ChatItem

-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
-    virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+    void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
+    void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override;

 
     ChatItem *mouseEventTargetItem(const QPointF &pos);
 
 
     ChatItem *mouseEventTargetItem(const QPointF &pos);
 

diff --git a/src/qtui/chatlinemodel.h b/src/qtui/chatlinemodel.h
index d2e976c..84d77e9 100644 (file)
--- a/src/qtui/chatlinemodel.h
+++ b/src/qtui/chatlinemodel.h
@@ -41,22 +41,22 @@ public:
 
     typedef ChatLineModelItem::Word Word;
     typedef ChatLineModelItem::WrapList WrapList;
 
     typedef ChatLineModelItem::Word Word;
     typedef ChatLineModelItem::WrapList WrapList;

-    virtual inline const MessageModelItem *messageItemAt(int i) const { return &_messageList[i]; }
+    inline const MessageModelItem *messageItemAt(int i) const override { return &_messageList[i]; }

 protected:
 //   virtual MessageModelItem *createMessageModelItem(const Message &);
 
 protected:
 //   virtual MessageModelItem *createMessageModelItem(const Message &);
 

-    virtual inline int messageCount() const { return _messageList.count(); }
-    virtual inline bool messagesIsEmpty() const { return _messageList.isEmpty(); }
-    virtual inline MessageModelItem *messageItemAt(int i) { return &_messageList[i]; }
-    virtual inline const MessageModelItem *firstMessageItem() const { return &_messageList.first(); }
-    virtual inline MessageModelItem *firstMessageItem() { return &_messageList.first(); }
-    virtual inline const MessageModelItem *lastMessageItem() const { return &_messageList.last(); }
-    virtual inline MessageModelItem *lastMessageItem() { return &_messageList.last(); }
-    virtual inline void insertMessage__(int pos, const Message &msg) { _messageList.insert(pos, ChatLineModelItem(msg)); }
-    virtual void insertMessages__(int pos, const QList<Message> &);
-    virtual inline void removeMessageAt(int i) { _messageList.removeAt(i); }
-    virtual inline void removeAllMessages() { _messageList.clear(); }
-    virtual Message takeMessageAt(int i);
+    inline int messageCount() const override { return _messageList.count(); }
+    inline bool messagesIsEmpty() const override { return _messageList.isEmpty(); }
+    inline MessageModelItem *messageItemAt(int i) override { return &_messageList[i]; }
+    inline const MessageModelItem *firstMessageItem() const override { return &_messageList.first(); }
+    inline MessageModelItem *firstMessageItem() override { return &_messageList.first(); }
+    inline const MessageModelItem *lastMessageItem() const override { return &_messageList.last(); }
+    inline MessageModelItem *lastMessageItem() override { return &_messageList.last(); }
+    inline void insertMessage__(int pos, const Message &msg) override { _messageList.insert(pos, ChatLineModelItem(msg)); }
+    void insertMessages__(int pos, const QList<Message> &) override;
+    inline void removeMessageAt(int i) override { _messageList.removeAt(i); }
+    inline void removeAllMessages() override { _messageList.clear(); }
+    Message takeMessageAt(int i) override;

 
 protected slots:
     virtual void styleChanged();
 
 protected slots:
     virtual void styleChanged();

diff --git a/src/qtui/chatlinemodelitem.h b/src/qtui/chatlinemodelitem.h
index 24f237e..5713d0d 100644 (file)
--- a/src/qtui/chatlinemodelitem.h
+++ b/src/qtui/chatlinemodelitem.h
@@ -29,16 +29,16 @@ class ChatLineModelItem : public MessageModelItem
 public:
     ChatLineModelItem(const Message &);
 
 public:
     ChatLineModelItem(const Message &);
 

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

 
 

-    virtual inline const Message &message() const { return _styledMsg; }
-    virtual inline const QDateTime &timestamp() const { return _styledMsg.timestamp(); }
-    virtual inline const MsgId &msgId() const { return _styledMsg.msgId(); }
-    virtual inline const BufferId &bufferId() const { return _styledMsg.bufferId(); }
-    virtual inline void setBufferId(BufferId bufferId) { _styledMsg.setBufferId(bufferId); }
-    virtual inline Message::Type msgType() const { return _styledMsg.type(); }
-    virtual inline Message::Flags msgFlags() const { return _styledMsg.flags(); }
+    inline const Message &message() const override { return _styledMsg; }
+    inline const QDateTime &timestamp() const override { return _styledMsg.timestamp(); }
+    inline const MsgId &msgId() const override { return _styledMsg.msgId(); }
+    inline const BufferId &bufferId() const override { return _styledMsg.bufferId(); }
+    inline void setBufferId(BufferId bufferId) override { _styledMsg.setBufferId(bufferId); }
+    inline Message::Type msgType() const override { return _styledMsg.type(); }
+    inline Message::Flags msgFlags() const override { return _styledMsg.flags(); }

 
     virtual inline void invalidateWrapList() { _wrapList.clear(); }
 
 
     virtual inline void invalidateWrapList() { _wrapList.clear(); }
 

diff --git a/src/qtui/chatmonitorfilter.h b/src/qtui/chatmonitorfilter.h
index c9ceb97..7140213 100644 (file)
--- a/src/qtui/chatmonitorfilter.h
+++ b/src/qtui/chatmonitorfilter.h
@@ -39,9 +39,9 @@ public:
 
     ChatMonitorFilter(MessageModel *model, QObject *parent = nullptr);
 
 
     ChatMonitorFilter(MessageModel *model, QObject *parent = nullptr);
 

-    virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
-    virtual QString idString() const { return "ChatMonitor"; }
-    virtual QVariant data(const QModelIndex &index, int role) const;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    QString idString() const override { return "ChatMonitor"; }
+    QVariant data(const QModelIndex &index, int role) const override;

 
     int showFields() const { return _showFields; }
     bool showOwnMessages() const { return _showOwnMessages; }
 
     int showFields() const { return _showFields; }
     bool showOwnMessages() const { return _showOwnMessages; }

diff --git a/src/qtui/chatmonitorview.h b/src/qtui/chatmonitorview.h
index d9e33a3..21f8448 100644 (file)
--- a/src/qtui/chatmonitorview.h
+++ b/src/qtui/chatmonitorview.h
@@ -33,8 +33,8 @@ public:
     ChatMonitorView(ChatMonitorFilter *filter, QWidget *parent);
 
 protected:
     ChatMonitorView(ChatMonitorFilter *filter, QWidget *parent);
 
 protected:

-    virtual void addActionsToMenu(QMenu *menu, const QPointF &pos);
-    virtual void mouseDoubleClickEvent(QMouseEvent *event);
+    void addActionsToMenu(QMenu *menu, const QPointF &pos) override;
+    void mouseDoubleClickEvent(QMouseEvent *event) override;

 
 private slots:
     void showFieldsChanged(bool checked);
 
 private slots:
     void showFieldsChanged(bool checked);

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

-    virtual ~ChatScene();
+    ~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); }


@@ -177,11 +177,11 @@ signals:
     void mouseMoveWhileSelecting(const QPointF &scenePos);
 
 protected:
     void mouseMoveWhileSelecting(const QPointF &scenePos);
 
 protected:

-    virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMenuEvent);
-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent);
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent);
-    virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *mouseEvent);
+    void contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMenuEvent) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent) override;
+    void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) override;
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *mouseEvent) override;

     virtual void handleClick(Qt::MouseButton button, const QPointF &scenePos);
 
 protected slots:
     virtual void handleClick(Qt::MouseButton button, const QPointF &scenePos);
 
 protected slots:

diff --git a/src/qtui/chatview.h b/src/qtui/chatview.h
index cb34ede..1aeffc7 100644 (file)
--- a/src/qtui/chatview.h
+++ b/src/qtui/chatview.h
@@ -42,7 +42,7 @@ public:
     ChatView(MessageFilter *, QWidget *parent = nullptr);
     ChatView(BufferId bufferId, QWidget *parent = nullptr);
 
     ChatView(MessageFilter *, QWidget *parent = nullptr);
     ChatView(BufferId bufferId, QWidget *parent = nullptr);
 

-    virtual MsgId lastMsgId() const;
+    MsgId lastMsgId() const override;

     virtual MsgId lastVisibleMsgId() const;
     inline AbstractBufferContainer *bufferContainer() const { return _bufferContainer; }
     inline void setBufferContainer(AbstractBufferContainer *c) { _bufferContainer = c; }
     virtual MsgId lastVisibleMsgId() const;
     inline AbstractBufferContainer *bufferContainer() const { return _bufferContainer; }
     inline void setBufferContainer(AbstractBufferContainer *c) { _bufferContainer = c; }


@@ -90,9 +90,9 @@ public slots:
     void jumpToMarkerLine(bool requestBacklog);
 
 protected:
     void jumpToMarkerLine(bool requestBacklog);
 
 protected:

-    virtual bool event(QEvent *event);
-    virtual void resizeEvent(QResizeEvent *event);
-    virtual void scrollContentsBy(int dx, int dy);
+    bool event(QEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
+    void scrollContentsBy(int dx, int dy) override;

 
 protected slots:
     virtual void verticalScrollbarChanged(int);
 
 protected slots:
     virtual void verticalScrollbarChanged(int);

diff --git a/src/qtui/chatviewsearchbar.h b/src/qtui/chatviewsearchbar.h
index f3c92b1..35ebfd1 100644 (file)
--- a/src/qtui/chatviewsearchbar.h
+++ b/src/qtui/chatviewsearchbar.h
@@ -44,7 +44,7 @@ public:
     inline QToolButton *searchDownButton() const { return ui.searchDownButton; }
 
 public slots:
     inline QToolButton *searchDownButton() const { return ui.searchDownButton; }
 
 public slots:

-    void setVisible(bool);
+    void setVisible(bool) override;

 
 signals:
     void searchChanged(const QString &);
 
 signals:
     void searchChanged(const QString &);

diff --git a/src/qtui/chatviewsearchcontroller.h b/src/qtui/chatviewsearchcontroller.h
index 8c0aa5c..ce2c49f 100644 (file)
--- a/src/qtui/chatviewsearchcontroller.h
+++ b/src/qtui/chatviewsearchcontroller.h
@@ -94,11 +94,11 @@ class SearchHighlightItem : public QObject, public QGraphicsItem
 
 public:
     SearchHighlightItem(QRectF wordRect, QGraphicsItem *parent = nullptr);
 
 public:
     SearchHighlightItem(QRectF wordRect, QGraphicsItem *parent = nullptr);

-    virtual inline QRectF boundingRect() const { return _boundingRect; }
+    inline QRectF boundingRect() const override { return _boundingRect; }

     void updateGeometry(qreal width, qreal height);
     void updateGeometry(qreal width, qreal height);

-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;

     enum { Type = ChatScene::SearchHighlightType };
     enum { Type = ChatScene::SearchHighlightType };

-    virtual inline int type() const { return Type; }
+    inline int type() const override { return Type; }

 
     void setHighlighted(bool highlighted);
 
 
     void setHighlighted(bool highlighted);
 

diff --git a/src/qtui/columnhandleitem.h b/src/qtui/columnhandleitem.h
index ef2636c..c8fee6e 100644 (file)
--- a/src/qtui/columnhandleitem.h
+++ b/src/qtui/columnhandleitem.h
@@ -34,10 +34,10 @@ class ColumnHandleItem : public QGraphicsObject
 
 public :
         ColumnHandleItem(qreal width, QGraphicsItem *parent = nullptr);
 
 public :
         ColumnHandleItem(qreal width, QGraphicsItem *parent = nullptr);

-    virtual inline int type() const { return ChatScene::ColumnHandleType; }
+    inline int type() const override { return ChatScene::ColumnHandleType; }

 
     inline qreal width() const { return _width; }
 
     inline qreal width() const { return _width; }

-    inline QRectF boundingRect() const { return _boundingRect; }
+    inline QRectF boundingRect() const override { return _boundingRect; }

     inline qreal sceneLeft() const { return _sceneLeft; }
     inline qreal sceneRight() const { return _sceneRight; }
 
     inline qreal sceneLeft() const { return _sceneLeft; }
     inline qreal sceneRight() const { return _sceneRight; }
 


@@ -46,18 +46,18 @@ public :
     void setXPos(qreal xpos);
     void setXLimits(qreal min, qreal max);
 
     void setXPos(qreal xpos);
     void setXLimits(qreal min, qreal max);
 

-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;

 
 public slots:
     void sceneRectChanged(const QRectF &);
     void setOpacity(qreal opacity);
 
 protected:
 
 public slots:
     void sceneRectChanged(const QRectF &);
     void setOpacity(qreal opacity);
 
 protected:

-    void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;

 
 signals:
     void positionChanged(qreal x);
 
 signals:
     void positionChanged(qreal x);

diff --git a/src/qtui/coreconfigwizard.h b/src/qtui/coreconfigwizard.h
index da4a30c..8f7f809 100644 (file)
--- a/src/qtui/coreconfigwizard.h
+++ b/src/qtui/coreconfigwizard.h
@@ -90,7 +90,7 @@ class IntroPage : public QWizardPage
 
 public:
     IntroPage(QWidget *parent = nullptr);
 
 public:
     IntroPage(QWidget *parent = nullptr);

-    int nextId() const;
+    int nextId() const override;

 private:
     Ui::CoreConfigWizardIntroPage ui;
 };
 private:
     Ui::CoreConfigWizardIntroPage ui;
 };


@@ -102,8 +102,8 @@ class AdminUserPage : public QWizardPage
 
 public:
     AdminUserPage(QWidget *parent = nullptr);
 
 public:
     AdminUserPage(QWidget *parent = nullptr);

-    int nextId() const;
-    bool isComplete() const;
+    int nextId() const override;
+    bool isComplete() const override;

 private:
     Ui::CoreConfigWizardAdminUserPage ui;
 };
 private:
     Ui::CoreConfigWizardAdminUserPage ui;
 };


@@ -116,7 +116,7 @@ class AuthenticationSelectionPage : public QWizardPage
 
 public:
     AuthenticationSelectionPage(const QVariantList &authInfos, QWidget *parent = nullptr);
 
 public:
     AuthenticationSelectionPage(const QVariantList &authInfos, QWidget *parent = nullptr);

-    int nextId() const;
+    int nextId() const override;

     QString displayName() const;
     QString authenticator() const;
     QVariantMap authProperties() const;
     QString displayName() const;
     QString authenticator() const;
     QVariantMap authProperties() const;


@@ -138,7 +138,7 @@ class StorageSelectionPage : public QWizardPage
 
 public:
     StorageSelectionPage(const QVariantList &backendInfos, QWidget *parent = nullptr);
 
 public:
     StorageSelectionPage(const QVariantList &backendInfos, QWidget *parent = nullptr);

-    int nextId() const;
+    int nextId() const override;

     QString displayName() const;
     QString backend() const;
     QVariantMap backendProperties() const;
     QString displayName() const;
     QString backend() const;
     QVariantMap backendProperties() const;


@@ -159,9 +159,9 @@ class SyncPage : public QWizardPage
 
 public:
     SyncPage(QWidget *parent = nullptr);
 
 public:
     SyncPage(QWidget *parent = nullptr);

-    void initializePage();
-    int nextId() const;
-    bool isComplete() const;
+    void initializePage() override;
+    int nextId() const override;
+    bool isComplete() const override;

 
 public slots:
     void setStatus(const QString &status);
 
 public slots:
     void setStatus(const QString &status);


@@ -184,7 +184,7 @@ class SyncRelayPage : public QWizardPage
 
 public:
     SyncRelayPage(QWidget *parent = nullptr);
 
 public:
     SyncRelayPage(QWidget *parent = nullptr);

-    int nextId() const;
+    int nextId() const override;

     enum Mode { Success, Error };
 
 public slots:
     enum Mode { Success, Error };
 
 public slots:

diff --git a/src/qtui/coreconnectdlg.h b/src/qtui/coreconnectdlg.h
index b882c6e..6471ae9 100644 (file)
--- a/src/qtui/coreconnectdlg.h
+++ b/src/qtui/coreconnectdlg.h
@@ -37,7 +37,7 @@ public:
     CoreConnectDlg(QWidget *parent = nullptr);
     AccountId selectedAccount() const;
 
     CoreConnectDlg(QWidget *parent = nullptr);
     AccountId selectedAccount() const;
 

-    void accept();
+    void accept() override;

 
 private:
     CoreAccountSettingsPage *_settingsPage;
 
 private:
     CoreAccountSettingsPage *_settingsPage;


@@ -51,7 +51,7 @@ class CoreConnectAuthDlg : public QDialog
 public:
     CoreConnectAuthDlg(CoreAccount *account, QWidget *parent = nullptr);
 
 public:
     CoreConnectAuthDlg(CoreAccount *account, QWidget *parent = nullptr);
 

-    void accept();
+    void accept() override;

 
 private slots:
     void setButtonStates();
 
 private slots:
     void setButtonStates();

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

-    virtual ~DebugConsole();
+    ~DebugConsole() override;

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

diff --git a/src/qtui/debugmessagemodelfilter.h b/src/qtui/debugmessagemodelfilter.h
index ef441b2..25f3208 100644 (file)
--- a/src/qtui/debugmessagemodelfilter.h
+++ b/src/qtui/debugmessagemodelfilter.h
@@ -29,8 +29,8 @@ class DebugMessageModelFilter : public QSortFilterProxyModel
 
 public:
     DebugMessageModelFilter(QObject *parent = nullptr);
 
 public:
     DebugMessageModelFilter(QObject *parent = nullptr);

-    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-    virtual QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+    QVariant data(const QModelIndex &index, int role) const override;

 };
 
 
 };
 
 

diff --git a/src/qtui/dockmanagernotificationbackend.h b/src/qtui/dockmanagernotificationbackend.h
index 37ebd47..e3a2ca0 100644 (file)
--- a/src/qtui/dockmanagernotificationbackend.h
+++ b/src/qtui/dockmanagernotificationbackend.h
@@ -36,9 +36,9 @@ class DockManagerNotificationBackend : public AbstractNotificationBackend
 public:
     DockManagerNotificationBackend(QObject *parent = nullptr);
 
 public:
     DockManagerNotificationBackend(QObject *parent = nullptr);
 

-    void notify(const Notification &);
-    void close(uint notificationId);
-    virtual SettingsPage *createConfigWidget() const;
+    void notify(const Notification &) override;
+    void close(uint notificationId) override;
+    SettingsPage *createConfigWidget() const override;

 
 private slots:
     void enabledChanged(const QVariant &);
 
 private slots:
     void enabledChanged(const QVariant &);


@@ -65,10 +65,10 @@ class DockManagerNotificationBackend::ConfigWidget : public SettingsPage
 public:
     ConfigWidget(bool enabled, QWidget *parent = nullptr);
 
 public:
     ConfigWidget(bool enabled, QWidget *parent = nullptr);
 

-    void save();
-    void load();
-    bool hasDefaults() const;
-    void defaults();
+    void save() override;
+    void load() override;
+    bool hasDefaults() const override;
+    void defaults() override;

 
 private slots:
     void widgetChanged();
 
 private slots:
     void widgetChanged();

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

-    virtual ~InputWidget();
+    ~InputWidget() override;

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


@@ -92,12 +92,12 @@ public slots:
     void clearFormat();
 
 protected:
     void clearFormat();
 
 protected:

-    virtual bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) override;

 
 protected slots:
 
 protected slots:

-    virtual void currentChanged(const QModelIndex &current, const QModelIndex &previous);
-    virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
-    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+    void currentChanged(const QModelIndex &current, const QModelIndex &previous) override;
+    void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override;
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;

 
 private slots:
     void setCustomFont(const QVariant &font);
 
 private slots:
     void setCustomFont(const QVariant &font);


@@ -198,5 +198,5 @@ class MouseWheelFilter : public QObject
 
 public:
     MouseWheelFilter(QObject *parent = nullptr);
 
 public:
     MouseWheelFilter(QObject *parent = nullptr);

-    virtual bool eventFilter(QObject *obj, QEvent *event);
+    bool eventFilter(QObject *obj, QEvent *event) override;

 };
 };

diff --git a/src/qtui/knotificationbackend.h b/src/qtui/knotificationbackend.h
index 8932283..3b0a4af 100644 (file)
--- a/src/qtui/knotificationbackend.h
+++ b/src/qtui/knotificationbackend.h
@@ -36,9 +36,9 @@ class KNotificationBackend : public AbstractNotificationBackend
 public:
     KNotificationBackend(QObject *parent = nullptr);
 
 public:
     KNotificationBackend(QObject *parent = nullptr);
 

-    void notify(const Notification &);
-    void close(uint notificationId);
-    virtual SettingsPage *createConfigWidget() const;
+    void notify(const Notification &) override;
+    void close(uint notificationId) override;
+    SettingsPage *createConfigWidget() const override;

 
 private slots:
     void notificationActivated();
 
 private slots:
     void notificationActivated();


@@ -62,8 +62,8 @@ class KNotificationBackend::ConfigWidget : public SettingsPage
 public:
     ConfigWidget(QWidget *parent = nullptr);
 
 public:
     ConfigWidget(QWidget *parent = nullptr);
 

-    void save();
-    void load();
+    void save() override;
+    void load() override;

 
 private slots:
     void widgetChanged(bool);
 
 private slots:
     void widgetChanged(bool);

diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 9dacca6..94a2d4b 100644 (file)
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -76,7 +76,7 @@ public:
     inline BufferWidget *bufferWidget() const { return _bufferWidget; }
     inline SystemTray *systemTray() const { return _systemTray; }
 
     inline BufferWidget *bufferWidget() const { return _bufferWidget; }
     inline SystemTray *systemTray() const { return _systemTray; }
 

-    bool event(QEvent *event);
+    bool event(QEvent *event) override;

 
     static void flagRemoteCoreOnly(QObject *object) { object->setProperty("REMOTE_CORE_ONLY", true); }
     static bool isRemoteCoreOnly(QObject *object) { return object->property("REMOTE_CORE_ONLY").toBool(); }
 
     static void flagRemoteCoreOnly(QObject *object) { object->setProperty("REMOTE_CORE_ONLY", true); }
     static bool isRemoteCoreOnly(QObject *object) { return object->property("REMOTE_CORE_ONLY").toBool(); }


@@ -85,7 +85,7 @@ public:
     void restoreStateFromSettings(UiSettings &);
 
     // We need to override this to add the show/hide menu bar option
     void restoreStateFromSettings(UiSettings &);
 
     // We need to override this to add the show/hide menu bar option

-    virtual QMenu *createPopupMenu();
+    QMenu *createPopupMenu() override;

 
 public slots:
     void showStatusBarMessage(const QString &message);
 
 public slots:
     void showStatusBarMessage(const QString &message);


@@ -100,9 +100,9 @@ public slots:
     void onExitRequested(const QString &reason);
 
 protected:
     void onExitRequested(const QString &reason);
 
 protected:

-    void closeEvent(QCloseEvent *event);
-    void moveEvent(QMoveEvent *event);
-    void resizeEvent(QResizeEvent *event);
+    void closeEvent(QCloseEvent *event) override;
+    void moveEvent(QMoveEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;

 
 protected slots:
     void connectedToCore();
 
 protected slots:
     void connectedToCore();

diff --git a/src/qtui/markerlineitem.h b/src/qtui/markerlineitem.h
index 516c0d2..c77f82c 100644 (file)
--- a/src/qtui/markerlineitem.h
+++ b/src/qtui/markerlineitem.h
@@ -33,10 +33,10 @@ class MarkerLineItem : public QGraphicsObject
 
 public:
     MarkerLineItem(qreal sceneWidth, QGraphicsItem *parent = nullptr);
 
 public:
     MarkerLineItem(qreal sceneWidth, QGraphicsItem *parent = nullptr);

-    virtual inline int type() const { return ChatScene::MarkerLineType; }
+    inline int type() const override { return ChatScene::MarkerLineType; }

 
 

-    inline QRectF boundingRect() const { return _boundingRect; }
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr);
+    inline QRectF boundingRect() const override { return _boundingRect; }
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;

 
     inline ChatLine *chatLine() const { return _chatLine; }
 
 
     inline ChatLine *chatLine() const { return _chatLine; }
 

diff --git a/src/qtui/qtmultimedianotificationbackend.h b/src/qtui/qtmultimedianotificationbackend.h
index 909791f..417cc96 100644 (file)
--- a/src/qtui/qtmultimedianotificationbackend.h
+++ b/src/qtui/qtmultimedianotificationbackend.h
@@ -38,7 +38,7 @@ public:
 
     void notify(const Notification &) override;
     void close(uint notificationId) override;
 
     void notify(const Notification &) override;
     void close(uint notificationId) override;

-    virtual SettingsPage *createConfigWidget() const override;
+    SettingsPage *createConfigWidget() const override;

 
 private slots:
     void enabledChanged(const QVariant &);
 
 private slots:
     void enabledChanged(const QVariant &);

diff --git a/src/qtui/qtuimessageprocessor.h b/src/qtui/qtuimessageprocessor.h
index 6a9684f..d6d39f3 100644 (file)
--- a/src/qtui/qtuimessageprocessor.h
+++ b/src/qtui/qtuimessageprocessor.h
@@ -42,11 +42,11 @@ public:
     inline bool isProcessing() const { return _processing; }
     inline Mode processMode() const { return _processMode; }
 
     inline bool isProcessing() const { return _processing; }
     inline Mode processMode() const { return _processMode; }
 

-    void reset();
+    void reset() override;

 
 public slots:
 
 public slots:

-    void process(Message &msg);
-    void process(QList<Message> &msgs);
+    void process(Message &msg) override;
+    void process(QList<Message> &msgs) override;

 
     /**
      * Network removed from system
 
     /**
      * Network removed from system

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

-    virtual ~QtUiStyle();
+    ~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; }

diff --git a/src/qtui/settingspages/aliasesmodel.h b/src/qtui/settingspages/aliasesmodel.h
index 61e6821..c46ff13 100644 (file)
--- a/src/qtui/settingspages/aliasesmodel.h
+++ b/src/qtui/settingspages/aliasesmodel.h
@@ -33,19 +33,19 @@ class AliasesModel : public QAbstractItemModel
 public:
     AliasesModel(QObject *parent = nullptr);
 
 public:
     AliasesModel(QObject *parent = nullptr);
 

-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;

 
 

-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;

 
 

-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;

 
 

-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;

 
 

-    inline QModelIndex parent(const QModelIndex &) const { return QModelIndex(); }
+    inline QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); }

 
 

-    inline int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    inline int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    inline int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    inline int columnCount(const QModelIndex &parent = QModelIndex()) const override;

 
     inline bool configChanged() const { return _configChanged; }
     inline bool isReady() const { return _modelReady; }
 
     inline bool configChanged() const { return _configChanged; }
     inline bool isReady() const { return _modelReady; }


@@ -54,7 +54,7 @@ public slots:
     void newAlias();
     void loadDefaults();
     void removeAlias(int index);
     void newAlias();
     void loadDefaults();
     void removeAlias(int index);

-    void revert();
+    void revert() override;

     void commit();
 
 signals:
     void commit();
 
 signals:

diff --git a/src/qtui/settingspages/aliasessettingspage.h b/src/qtui/settingspages/aliasessettingspage.h
index 0062134..424a961 100644 (file)
--- a/src/qtui/settingspages/aliasessettingspage.h
+++ b/src/qtui/settingspages/aliasessettingspage.h
@@ -33,13 +33,13 @@ class AliasesSettingsPage : public SettingsPage
 public:
     AliasesSettingsPage(QWidget *parent = nullptr);
 
 public:
     AliasesSettingsPage(QWidget *parent = nullptr);
 

-    virtual inline bool hasDefaults() const { return true; }
-    virtual inline bool needsCoreConnection() const { return true; }
+    inline bool hasDefaults() const override { return true; }
+    inline bool needsCoreConnection() const override { return true; }

 
 public slots:
 
 public slots:

-    void save();
-    void load();
-    void defaults();
+    void save() override;
+    void load() override;
+    void defaults() override;

 
 private slots:
     void enableDialog(bool);
 
 private slots:
     void enableDialog(bool);

diff --git a/src/qtui/settingspages/appearancesettingspage.h b/src/qtui/settingspages/appearancesettingspage.h
index b2af522..9cb2b18 100644 (file)
--- a/src/qtui/settingspages/appearancesettingspage.h
+++ b/src/qtui/settingspages/appearancesettingspage.h
@@ -37,12 +37,12 @@ class AppearanceSettingsPage : public SettingsPage
 public:
     AppearanceSettingsPage(QWidget *parent = nullptr);
 
 public:
     AppearanceSettingsPage(QWidget *parent = nullptr);
 

-    inline bool hasDefaults() const { return true; }
+    inline bool hasDefaults() const override { return true; }

 
 public slots:
 
 public slots:

-    void save();
-    void load();
-    void defaults();
+    void save() override;
+    void load() override;
+    void defaults() override;

 
 private slots:
     void widgetHasChanged();
 
 private slots:
     void widgetHasChanged();


@@ -61,7 +61,7 @@ private:
     QHash<QString, QVariant> settings;
     QMap<QString, QLocale> _locales;
 
     QHash<QString, QVariant> settings;
     QMap<QString, QLocale> _locales;
 

-    inline QString settingsKey() const { return QString("QtUi"); }
+    inline QString settingsKey() const override { return QString("QtUi"); }

 };
 
 
 };
 
 

diff --git a/src/qtui/settingspages/backlogsettingspage.h b/src/qtui/settingspages/backlogsettingspage.h
index 17c98f0..e492453 100644 (file)
--- a/src/qtui/settingspages/backlogsettingspage.h
+++ b/src/qtui/settingspages/backlogsettingspage.h
@@ -33,13 +33,13 @@ class BacklogSettingsPage : public SettingsPage
 public:
     BacklogSettingsPage(QWidget *parent = nullptr);
 
 public:
     BacklogSettingsPage(QWidget *parent = nullptr);
 

-    inline QString settingsKey() const { return "Backlog"; }
-    bool hasDefaults() const;
+    inline QString settingsKey() const override { return "Backlog"; }
+    bool hasDefaults() const override;

 
 public slots:
 
 public slots:

-    void save();
-    void load();
-    void defaults();
+    void save() override;
+    void load() override;
+    void defaults() override;

 
 private slots:
     void widgetHasChanged();
 
 private slots:
     void widgetHasChanged();

diff --git a/src/qtui/settingspages/bufferviewsettingspage.h b/src/qtui/settingspages/bufferviewsettingspage.h
index aa1ad5f..f78288b 100644 (file)
--- a/src/qtui/settingspages/bufferviewsettingspage.h
+++ b/src/qtui/settingspages/bufferviewsettingspage.h
@@ -34,7 +34,7 @@ class BufferViewSettingsPage : public SettingsPage
 
 public:
     BufferViewSettingsPage(QWidget *parent = nullptr);
 
 public:
     BufferViewSettingsPage(QWidget *parent = nullptr);

-    ~BufferViewSettingsPage();
+    ~BufferViewSettingsPage() override;

 
 public slots:
     void save() final override;
 
 public slots:
     void save() final override;

diff --git a/src/qtui/settingspages/chatmonitorsettingspage.h b/src/qtui/settingspages/chatmonitorsettingspage.h
index 8324e32..1d32b60 100644 (file)
--- a/src/qtui/settingspages/chatmonitorsettingspage.h
+++ b/src/qtui/settingspages/chatmonitorsettingspage.h
@@ -34,13 +34,13 @@ class ChatMonitorSettingsPage : public SettingsPage
 
 public:
     ChatMonitorSettingsPage(QWidget *parent = nullptr);
 
 public:
     ChatMonitorSettingsPage(QWidget *parent = nullptr);

-    bool hasDefaults() const;
+    bool hasDefaults() const override;

 
 public slots:
 
 public slots:

-    void save();
-    void load();
+    void save() override;
+    void load() override;

     void loadSettings();
     void loadSettings();

-    void defaults();
+    void defaults() override;

 
 private slots:
     void widgetHasChanged();
 
 private slots:
     void widgetHasChanged();

diff --git a/src/qtui/settingspages/chatviewcolorsettingspage.h b/src/qtui/settingspages/chatviewcolorsettingspage.h
index f9e2993..d959843 100644 (file)
--- a/src/qtui/settingspages/chatviewcolorsettingspage.h
+++ b/src/qtui/settingspages/chatviewcolorsettingspage.h
@@ -42,13 +42,13 @@ public:
      *
      * @return True if defaults available, otherwise false
      */
      *
      * @return True if defaults available, otherwise false
      */

-    inline bool hasDefaults() const { return true; }
+    inline bool hasDefaults() const override { return true; }

 
 public slots:
     /**
      * Save and apply current settings
      */
 
 public slots:
     /**
      * Save and apply current settings
      */

-    void save();
+    void save() override;

 
 private:
     Ui::ChatViewColorSettingsPage ui;  /// Reference to the Qt settings page UI
 
 private:
     Ui::ChatViewColorSettingsPage ui;  /// Reference to the Qt settings page UI


@@ -58,5 +58,5 @@ private:
      *
      * @return QString pointing to settings group and key for configuration values
      */
      *
      * @return QString pointing to settings group and key for configuration values
      */

-    inline QString settingsKey() const { return QString("QtUi/ChatView/__default__"); }
+    inline QString settingsKey() const override { return QString("QtUi/ChatView/__default__"); }

 };
 };

diff --git a/src/qtui/settingspages/chatviewsettingspage.h b/src/qtui/settingspages/chatviewsettingspage.h
index 6a1b7af..7a9db96 100644 (file)
--- a/src/qtui/settingspages/chatviewsettingspage.h
+++ b/src/qtui/settingspages/chatviewsettingspage.h
@@ -33,10 +33,10 @@ class ChatViewSettingsPage : public SettingsPage
 public:
     ChatViewSettingsPage(QWidget *parent = nullptr);
 
 public:
     ChatViewSettingsPage(QWidget *parent = nullptr);
 

-    inline bool hasDefaults() const { return true; }
+    inline bool hasDefaults() const override { return true; }

 
 public slots:
 
 public slots:

-    void save();
+    void save() override;

 
 private:
     Ui::ChatViewSettingsPage ui;
 
 private:
     Ui::ChatViewSettingsPage ui;


@@ -46,7 +46,7 @@ private:
      */
     void initSenderPrefixComboBox();
 
      */
     void initSenderPrefixComboBox();
 

-    inline QString settingsKey() const { return QString("QtUi/ChatView/__default__"); }
+    inline QString settingsKey() const override { return QString("QtUi/ChatView/__default__"); }

 };
 
 
 };
 
 

diff --git a/src/qtui/settingspages/connectionsettingspage.h b/src/qtui/settingspages/connectionsettingspage.h
index 4582f3f..0743850 100644 (file)
--- a/src/qtui/settingspages/connectionsettingspage.h
+++ b/src/qtui/settingspages/connectionsettingspage.h
@@ -33,8 +33,8 @@ class ConnectionSettingsPage : public SettingsPage
 public:
     ConnectionSettingsPage(QWidget *parent = nullptr);
 
 public:
     ConnectionSettingsPage(QWidget *parent = nullptr);
 

-    bool hasDefaults() const;
-    bool needsCoreConnection() const { return true; }
+    bool hasDefaults() const override;
+    bool needsCoreConnection() const override { return true; }

 
 public slots:
 
 
 public slots:
 


@@ -44,8 +44,8 @@ private slots:
     void initDone();
 
 private:
     void initDone();
 
 private:

-    QVariant loadAutoWidgetValue(const QString &widgetName);
-    void saveAutoWidgetValue(const QString &widgetName, const QVariant &value);
+    QVariant loadAutoWidgetValue(const QString &widgetName) override;
+    void saveAutoWidgetValue(const QString &widgetName, const QVariant &value) override;

 
     Ui::ConnectionSettingsPage ui;
 };
 
     Ui::ConnectionSettingsPage ui;
 };

diff --git a/src/qtui/settingspages/coreaccountsettingspage.h b/src/qtui/settingspages/coreaccountsettingspage.h
index 7570df3..ed47e47 100644 (file)
--- a/src/qtui/settingspages/coreaccountsettingspage.h
+++ b/src/qtui/settingspages/coreaccountsettingspage.h
@@ -41,14 +41,14 @@ class CoreAccountSettingsPage : public SettingsPage
 public:
     CoreAccountSettingsPage(QWidget *parent = nullptr);
 
 public:
     CoreAccountSettingsPage(QWidget *parent = nullptr);
 

-    inline bool hasDefaults() const { return false; }
+    inline bool hasDefaults() const override { return false; }

     inline bool isStandAlone() const { return _standalone; }
 
     AccountId selectedAccount() const;
 
 public slots:
     inline bool isStandAlone() const { return _standalone; }
 
     AccountId selectedAccount() const;
 
 public slots:

-    void save();
-    void load();
+    void save() override;
+    void load() override;

 
     void setSelectedAccount(AccountId accId);
     void setStandAlone(bool);
 
     void setSelectedAccount(AccountId accId);
     void setStandAlone(bool);


@@ -83,7 +83,7 @@ private:
 
     bool testHasChanged();
 
 
     bool testHasChanged();
 

-    inline QString settingsKey() const { return QString("CoreAccounts"); }
+    inline QString settingsKey() const override { return QString("CoreAccounts"); }

 };
 
 
 };
 
 


@@ -127,7 +127,7 @@ public:
     FilteredCoreAccountModel(CoreAccountModel *model, QObject *parent = nullptr);
 
 protected:
     FilteredCoreAccountModel(CoreAccountModel *model, QObject *parent = nullptr);
 
 protected:

-    virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;

 
 private:
     AccountId _internalAccount;
 
 private:
     AccountId _internalAccount;

diff --git a/src/qtui/settingspages/coreconnectionsettingspage.h b/src/qtui/settingspages/coreconnectionsettingspage.h
index f9df696..fafc461 100644 (file)
--- a/src/qtui/settingspages/coreconnectionsettingspage.h
+++ b/src/qtui/settingspages/coreconnectionsettingspage.h
@@ -33,12 +33,12 @@ class CoreConnectionSettingsPage : public SettingsPage
 public:
     CoreConnectionSettingsPage(QWidget *parent = nullptr);
 
 public:
     CoreConnectionSettingsPage(QWidget *parent = nullptr);
 

-    inline bool hasDefaults() const { return true; }
+    inline bool hasDefaults() const override { return true; }

 
 public slots:
 
 public slots:

-    void save();
-    void load();
-    void defaults();
+    void save() override;
+    void load() override;
+    void defaults() override;

 
 signals:
 
 
 signals:
 


@@ -52,7 +52,7 @@ private:
     void setRadioButtons(CoreConnectionSettings::NetworkDetectionMode mode);
     CoreConnectionSettings::NetworkDetectionMode modeFromRadioButtons() const;
 
     void setRadioButtons(CoreConnectionSettings::NetworkDetectionMode mode);
     CoreConnectionSettings::NetworkDetectionMode modeFromRadioButtons() const;
 

-    inline QString settingsKey() const { return QString("CoreConnection"); }
+    inline QString settingsKey() const override { return QString("CoreConnection"); }

 };
 
 
 };
 
 

diff --git a/src/qtui/settingspages/highlightsettingspage.h b/src/qtui/settingspages/highlightsettingspage.h
index 6899c36..06dffa0 100644 (file)
--- a/src/qtui/settingspages/highlightsettingspage.h
+++ b/src/qtui/settingspages/highlightsettingspage.h
@@ -34,12 +34,12 @@ class HighlightSettingsPage : public SettingsPage
 public:
     HighlightSettingsPage(QWidget *parent = nullptr);
 
 public:
     HighlightSettingsPage(QWidget *parent = nullptr);
 

-    bool hasDefaults() const;
+    bool hasDefaults() const override;

 
 public slots:
 
 public slots:

-    void save();
-    void load();
-    void defaults();
+    void save() override;
+    void load() override;
+    void defaults() override;

 
 private slots:
     void widgetHasChanged();
 
 private slots:
     void widgetHasChanged();

diff --git a/src/qtui/settingspages/identitiessettingspage.h b/src/qtui/settingspages/identitiessettingspage.h
index e931d70..3674c34 100644 (file)
--- a/src/qtui/settingspages/identitiessettingspage.h
+++ b/src/qtui/settingspages/identitiessettingspage.h
@@ -38,9 +38,9 @@ class IdentitiesSettingsPage : public SettingsPage
 public:
     IdentitiesSettingsPage(QWidget *parent = nullptr);
 
 public:
     IdentitiesSettingsPage(QWidget *parent = nullptr);
 

-    virtual inline bool needsCoreConnection() const { return true; }
+    inline bool needsCoreConnection() const override { return true; }

 
 

-    bool aboutToSave();
+    bool aboutToSave() override;

 
 public slots:
     void save() final override;
 
 public slots:
     void save() final override;

diff --git a/src/qtui/settingspages/identityeditwidget.h b/src/qtui/settingspages/identityeditwidget.h
index 1d36987..07a62ad 100644 (file)
--- a/src/qtui/settingspages/identityeditwidget.h
+++ b/src/qtui/settingspages/identityeditwidget.h
@@ -53,7 +53,7 @@ public slots:
 
 protected:
 #ifdef HAVE_SSL
 
 protected:
 #ifdef HAVE_SSL

-    virtual bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) override;

 #endif
 
 signals:
 #endif
 
 signals:

diff --git a/src/qtui/settingspages/ignorelistmodel.h b/src/qtui/settingspages/ignorelistmodel.h
index f788fd4..4a9f9c6 100644 (file)
--- a/src/qtui/settingspages/ignorelistmodel.h
+++ b/src/qtui/settingspages/ignorelistmodel.h
@@ -33,19 +33,19 @@ class IgnoreListModel : public QAbstractItemModel
 public:
     IgnoreListModel(QObject *parent = nullptr);
 
 public:
     IgnoreListModel(QObject *parent = nullptr);
 

-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;

 
 

-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;

 
 

-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;

 
 

-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;

 
 

-    inline QModelIndex parent(const QModelIndex &) const { return QModelIndex(); }
+    inline QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); }

 
 

-    inline int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    inline int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    inline int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    inline int columnCount(const QModelIndex &parent = QModelIndex()) const override;

 
     inline bool configChanged() const { return _configChanged; }
     inline bool isReady() const { return _modelReady; }
 
     inline bool configChanged() const { return _configChanged; }
     inline bool isReady() const { return _modelReady; }


@@ -58,7 +58,7 @@ public:
 public slots:
     void loadDefaults();
     void removeIgnoreRule(int index);
 public slots:
     void loadDefaults();
     void removeIgnoreRule(int index);

-    void revert();
+    void revert() override;

     void commit();
 
 signals:
     void commit();
 
 signals:

diff --git a/src/qtui/settingspages/ignorelistsettingspage.h b/src/qtui/settingspages/ignorelistsettingspage.h
index 66a3205..41c3971 100644 (file)
--- a/src/qtui/settingspages/ignorelistsettingspage.h
+++ b/src/qtui/settingspages/ignorelistsettingspage.h
@@ -42,9 +42,9 @@ class IgnoreListDelegate : public QStyledItemDelegate
 public:
     IgnoreListDelegate(QWidget *parent = nullptr) : QStyledItemDelegate(parent) {}
     void paint(QPainter *painter, const QStyleOptionViewItem &option,
 public:
     IgnoreListDelegate(QWidget *parent = nullptr) : QStyledItemDelegate(parent) {}
     void paint(QPainter *painter, const QStyleOptionViewItem &option,

-        const QModelIndex &index) const;
+        const QModelIndex &index) const override;

     bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option,
     bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option,

-        const QModelIndex &index);
+        const QModelIndex &index) override;

 };
 
 
 };
 
 


@@ -78,15 +78,15 @@ class IgnoreListSettingsPage : public SettingsPage
 
 public:
     IgnoreListSettingsPage(QWidget *parent = nullptr);
 
 public:
     IgnoreListSettingsPage(QWidget *parent = nullptr);

-    ~IgnoreListSettingsPage();
-    virtual inline bool hasDefaults() const { return false; }
-    virtual inline bool needsCoreConnection() const { return true; }
+    ~IgnoreListSettingsPage() override;
+    inline bool hasDefaults() const override { return false; }
+    inline bool needsCoreConnection() const override { return true; }

     void editIgnoreRule(const QString &ignoreRule);
 
 public slots:
     void editIgnoreRule(const QString &ignoreRule);
 
 public slots:

-    void save();
-    void load();
-    void defaults();
+    void save() override;
+    void load() override;
+    void defaults() override;

     void newIgnoreRule(QString rule = QString());
 
 private slots:
     void newIgnoreRule(QString rule = QString());
 
 private slots:

diff --git a/src/qtui/settingspages/inputwidgetsettingspage.h b/src/qtui/settingspages/inputwidgetsettingspage.h
index 7554820..1d09ec0 100644 (file)
--- a/src/qtui/settingspages/inputwidgetsettingspage.h
+++ b/src/qtui/settingspages/inputwidgetsettingspage.h
@@ -31,12 +31,12 @@ class InputWidgetSettingsPage : public SettingsPage
 public:
     InputWidgetSettingsPage(QWidget *parent = nullptr);
 
 public:
     InputWidgetSettingsPage(QWidget *parent = nullptr);
 

-    inline bool hasDefaults() const { return true; }
+    inline bool hasDefaults() const override { return true; }

 
 private:
     Ui::InputWidgetSettingsPage ui;
 
 
 private:
     Ui::InputWidgetSettingsPage ui;
 

-    inline QString settingsKey() const { return QString("InputWidget"); }
+    inline QString settingsKey() const override { return QString("InputWidget"); }

 };
 
 
 };
 
 

diff --git a/src/qtui/settingspages/itemviewsettingspage.h b/src/qtui/settingspages/itemviewsettingspage.h
index a8ef28d..d53c1c0 100644 (file)
--- a/src/qtui/settingspages/itemviewsettingspage.h
+++ b/src/qtui/settingspages/itemviewsettingspage.h
@@ -35,10 +35,10 @@ class ItemViewSettingsPage : public SettingsPage
 public:
     ItemViewSettingsPage(QWidget *parent = nullptr);
 
 public:
     ItemViewSettingsPage(QWidget *parent = nullptr);
 

-    inline bool hasDefaults() const { return true; }
+    inline bool hasDefaults() const override { return true; }

 
 public slots:
 
 public slots:

-    void save();
+    void save() override;

 
 private slots:
     void updateBufferViewPreview(QWidget *button);
 
 private slots:
     void updateBufferViewPreview(QWidget *button);


@@ -49,7 +49,7 @@ private:
     QTreeWidgetItem *_networkItem, *_defaultBufferItem, *_inactiveBufferItem,
     *_activeBufferItem, *_unreadBufferItem, *_highlightedBufferItem;
 
     QTreeWidgetItem *_networkItem, *_defaultBufferItem, *_inactiveBufferItem,
     *_activeBufferItem, *_unreadBufferItem, *_highlightedBufferItem;
 

-    inline QString settingsKey() const { return QString("ItemViews"); }
+    inline QString settingsKey() const override { return QString("ItemViews"); }

 };
 
 
 };
 
 

diff --git a/src/qtui/settingspages/keysequencewidget.h b/src/qtui/settingspages/keysequencewidget.h
index 5382ac9..e8cddfd 100644 (file)
--- a/src/qtui/settingspages/keysequencewidget.h
+++ b/src/qtui/settingspages/keysequencewidget.h
@@ -98,9 +98,9 @@ public:
     explicit KeySequenceButton(KeySequenceWidget *d, QWidget *parent = nullptr);
 
 protected:
     explicit KeySequenceButton(KeySequenceWidget *d, QWidget *parent = nullptr);
 
 protected:

-    virtual bool event(QEvent *event);
-    virtual void keyPressEvent(QKeyEvent *event);
-    virtual void keyReleaseEvent(QKeyEvent *event);
+    bool event(QEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
+    void keyReleaseEvent(QKeyEvent *event) override;

 
 private:
     KeySequenceWidget *d;
 
 private:
     KeySequenceWidget *d;

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index c1696ad..5c9db11 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.h
@@ -40,13 +40,13 @@ class NetworksSettingsPage : public SettingsPage
 public:
     NetworksSettingsPage(QWidget *parent = nullptr);
 
 public:
     NetworksSettingsPage(QWidget *parent = nullptr);
 

-    virtual inline bool needsCoreConnection() const { return true; }
+    inline bool needsCoreConnection() const override { return true; }

 
 

-    bool aboutToSave();
+    bool aboutToSave() override;

 
 public slots:
 
 public slots:

-    void save();
-    void load();
+    void save() override;
+    void load() override;

     void bufferList_Open(NetworkId);
 
 private slots:
     void bufferList_Open(NetworkId);
 
 private slots:

diff --git a/src/qtui/settingspages/notificationssettingspage.h b/src/qtui/settingspages/notificationssettingspage.h
index 7f899f6..3b7fc44 100644 (file)
--- a/src/qtui/settingspages/notificationssettingspage.h
+++ b/src/qtui/settingspages/notificationssettingspage.h
@@ -36,7 +36,7 @@ class NotificationsSettingsPage : public SettingsPage
 public:
     NotificationsSettingsPage(QWidget *parent = nullptr);
 
 public:
     NotificationsSettingsPage(QWidget *parent = nullptr);
 

-    bool hasDefaults() const;
+    bool hasDefaults() const override;

 
 public slots:
     void save() final override;
 
 public slots:
     void save() final override;

diff --git a/src/qtui/settingspages/previewbufferview.h b/src/qtui/settingspages/previewbufferview.h
index 8516d2a..3f8b64b 100644 (file)
--- a/src/qtui/settingspages/previewbufferview.h
+++ b/src/qtui/settingspages/previewbufferview.h
@@ -31,8 +31,8 @@ public:
     PreviewBufferView(QWidget *parent = nullptr) : BufferView(parent) {}
 
 protected:
     PreviewBufferView(QWidget *parent = nullptr) : BufferView(parent) {}
 
 protected:

-    virtual void keyPressEvent(QKeyEvent *event) { QTreeView::keyPressEvent(event); }
-    virtual void contextMenuEvent(QContextMenuEvent *) {}
+    void keyPressEvent(QKeyEvent *event) override { QTreeView::keyPressEvent(event); }
+    void contextMenuEvent(QContextMenuEvent *) override {}

 };
 
 
 };
 
 

diff --git a/src/qtui/settingspages/shortcutsmodel.h b/src/qtui/settingspages/shortcutsmodel.h
index a4a72da..0502b32 100644 (file)
--- a/src/qtui/settingspages/shortcutsmodel.h
+++ b/src/qtui/settingspages/shortcutsmodel.h
@@ -44,15 +44,15 @@ public:
     };
 
     ShortcutsModel(const QHash<QString, ActionCollection *> &actionCollections, QObject *parent = nullptr);
     };
 
     ShortcutsModel(const QHash<QString, ActionCollection *> &actionCollections, QObject *parent = nullptr);

-    ~ShortcutsModel();
+    ~ShortcutsModel() override;

 
 

-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
-    QModelIndex parent(const QModelIndex &child) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = ActiveShortcutRole);
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &child) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = ActiveShortcutRole) override;

 
 public slots:
     //! Load shortcuts from the ActionCollections
 
 public slots:
     //! Load shortcuts from the ActionCollections

diff --git a/src/qtui/settingspages/shortcutssettingspage.h b/src/qtui/settingspages/shortcutssettingspage.h
index 13d8c09..6c5bd01 100644 (file)
--- a/src/qtui/settingspages/shortcutssettingspage.h
+++ b/src/qtui/settingspages/shortcutssettingspage.h
@@ -40,7 +40,7 @@ public slots:
     void setFilterString(const QString &filterString);
 
 protected:
     void setFilterString(const QString &filterString);
 
 protected:

-    virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;

 
 private:
     QString _filterString;
 
 private:
     QString _filterString;


@@ -53,12 +53,12 @@ class ShortcutsSettingsPage : public SettingsPage
 public:
     ShortcutsSettingsPage(const QHash<QString, ActionCollection *> &actionCollections, QWidget *parent = nullptr);
 
 public:
     ShortcutsSettingsPage(const QHash<QString, ActionCollection *> &actionCollections, QWidget *parent = nullptr);
 

-    inline bool hasDefaults() const { return true; }
+    inline bool hasDefaults() const override { return true; }

 
 public slots:
 
 public slots:

-    void save();
-    void load();
-    void defaults();
+    void save() override;
+    void load() override;
+    void defaults() override;

 
 private slots:
     void on_searchEdit_textChanged(const QString &text);
 
 private slots:
     void on_searchEdit_textChanged(const QString &text);

diff --git a/src/qtui/settingspages/sonnetsettingspage.h b/src/qtui/settingspages/sonnetsettingspage.h
index ef513ce..4431cdd 100644 (file)
--- a/src/qtui/settingspages/sonnetsettingspage.h
+++ b/src/qtui/settingspages/sonnetsettingspage.h
@@ -32,12 +32,12 @@ class SonnetSettingsPage : public SettingsPage
 public:
     SonnetSettingsPage(QWidget *parent = nullptr);
 
 public:
     SonnetSettingsPage(QWidget *parent = nullptr);
 

-    bool hasDefaults() const;
+    bool hasDefaults() const override;

 
 public slots:
 
 public slots:

-    void save();
-    void load();
-    void defaults();
+    void save() override;
+    void load() override;
+    void defaults() override;

 
 private slots:
     void widgetHasChanged();
 
 private slots:
     void widgetHasChanged();

diff --git a/src/qtui/settingspages/topicwidgetsettingspage.h b/src/qtui/settingspages/topicwidgetsettingspage.h
index 2748bc2..464dc4b 100644 (file)
--- a/src/qtui/settingspages/topicwidgetsettingspage.h
+++ b/src/qtui/settingspages/topicwidgetsettingspage.h
@@ -31,12 +31,12 @@ class TopicWidgetSettingsPage : public SettingsPage
 public:
     TopicWidgetSettingsPage(QWidget *parent = nullptr);
 
 public:
     TopicWidgetSettingsPage(QWidget *parent = nullptr);
 

-    inline bool hasDefaults() const { return true; }
+    inline bool hasDefaults() const override { return true; }

 
 private:
     Ui::TopicWidgetSettingsPage ui;
 
 
 private:
     Ui::TopicWidgetSettingsPage ui;
 

-    inline QString settingsKey() const { return QString("TopicWidget"); }
+    inline QString settingsKey() const override { return QString("TopicWidget"); }

 };
 
 
 };
 
 

diff --git a/src/qtui/statusnotifieritem.cpp b/src/qtui/statusnotifieritem.cpp
index f3b362e..63af7c6 100644 (file)
--- a/src/qtui/statusnotifieritem.cpp
+++ b/src/qtui/statusnotifieritem.cpp
@@ -61,7 +61,7 @@ public:
     {}
 
 protected:
     {}
 
 protected:

-    virtual QString iconNameForAction(QAction *action) // TODO Qt 4.7: fixme when we have converted our iconloader
+    QString iconNameForAction(QAction *action) override // TODO Qt 4.7: fixme when we have converted our iconloader

     {
         QIcon icon(action->icon());
         return icon.isNull() ? QString() : icon.name();
     {
         QIcon icon(action->icon());
         return icon.isNull() ? QString() : icon.name();

diff --git a/src/qtui/statusnotifieritemdbus.h b/src/qtui/statusnotifieritemdbus.h
index 6276ca2..20a76f9 100644 (file)
--- a/src/qtui/statusnotifieritemdbus.h
+++ b/src/qtui/statusnotifieritemdbus.h
@@ -69,7 +69,7 @@ class StatusNotifierItemDBus : public QObject
     friend class StatusNotifierItem;
 public:
     StatusNotifierItemDBus(StatusNotifierItem *parent);
     friend class StatusNotifierItem;
 public:
     StatusNotifierItemDBus(StatusNotifierItem *parent);

-    ~StatusNotifierItemDBus();
+    ~StatusNotifierItemDBus() override;

 
     /**
      * @return the dbus connection used by this object
 
     /**
      * @return the dbus connection used by this object

diff --git a/src/qtui/systrayanimationnotificationbackend.h b/src/qtui/systrayanimationnotificationbackend.h
index c9155e7..ed5d104 100644 (file)
--- a/src/qtui/systrayanimationnotificationbackend.h
+++ b/src/qtui/systrayanimationnotificationbackend.h
@@ -36,7 +36,7 @@ public:
 
     void notify(const Notification &) override;
     void close(uint notificationId) override;
 
     void notify(const Notification &) override;
     void close(uint notificationId) override;

-    virtual SettingsPage *createConfigWidget() const override;
+    SettingsPage *createConfigWidget() const override;

 
 private slots:
     void alertChanged(const QVariant &);
 
 private slots:
     void alertChanged(const QVariant &);

diff --git a/src/qtui/systraynotificationbackend.h b/src/qtui/systraynotificationbackend.h
index ca858b8..82425c3 100644 (file)
--- a/src/qtui/systraynotificationbackend.h
+++ b/src/qtui/systraynotificationbackend.h
@@ -33,12 +33,12 @@ class SystrayNotificationBackend : public AbstractNotificationBackend
 public:
     SystrayNotificationBackend(QObject *parent = nullptr);
 
 public:
     SystrayNotificationBackend(QObject *parent = nullptr);
 

-    void notify(const Notification &);
-    void close(uint notificationId);
-    virtual SettingsPage *createConfigWidget() const;
+    void notify(const Notification &) override;
+    void close(uint notificationId) override;
+    SettingsPage *createConfigWidget() const override;

 
 protected:
 
 protected:

-    virtual bool eventFilter(QObject *obj, QEvent *event);
+    bool eventFilter(QObject *obj, QEvent *event) override;

 
 private slots:
     void notificationActivated(uint notificationId);
 
 private slots:
     void notificationActivated(uint notificationId);


@@ -62,10 +62,10 @@ class SystrayNotificationBackend::ConfigWidget : public SettingsPage
 
 public:
     ConfigWidget(QWidget *parent = nullptr);
 
 public:
     ConfigWidget(QWidget *parent = nullptr);

-    void save();
-    void load();
-    bool hasDefaults() const;
-    void defaults();
+    void save() override;
+    void load() override;
+    bool hasDefaults() const override;
+    void defaults() override;

 
 private slots:
     void widgetChanged();
 
 private slots:
     void widgetChanged();

diff --git a/src/qtui/taskbarnotificationbackend.h b/src/qtui/taskbarnotificationbackend.h
index ca49ee9..b2bfda9 100644 (file)
--- a/src/qtui/taskbarnotificationbackend.h
+++ b/src/qtui/taskbarnotificationbackend.h
@@ -35,9 +35,9 @@ class TaskbarNotificationBackend : public AbstractNotificationBackend
 public:
     TaskbarNotificationBackend(QObject *parent = nullptr);
 
 public:
     TaskbarNotificationBackend(QObject *parent = nullptr);
 

-    void notify(const Notification &);
-    void close(uint notificationId);
-    virtual SettingsPage *createConfigWidget() const;
+    void notify(const Notification &) override;
+    void close(uint notificationId) override;
+    SettingsPage *createConfigWidget() const override;

 
 private slots:
     void enabledChanged(const QVariant &);
 
 private slots:
     void enabledChanged(const QVariant &);


@@ -57,10 +57,10 @@ class TaskbarNotificationBackend::ConfigWidget : public SettingsPage
 
 public:
     ConfigWidget(QWidget *parent = nullptr);
 
 public:
     ConfigWidget(QWidget *parent = nullptr);

-    void save();
-    void load();
-    bool hasDefaults() const;
-    void defaults();
+    void save() override;
+    void load() override;
+    bool hasDefaults() const override;
+    void defaults() override;

 
 private slots:
     void widgetChanged();
 
 private slots:
     void widgetChanged();

diff --git a/src/qtui/titlesetter.h b/src/qtui/titlesetter.h
index 3a88310..b0bc970 100644 (file)
--- a/src/qtui/titlesetter.h
+++ b/src/qtui/titlesetter.h
@@ -33,8 +33,8 @@ public:
     TitleSetter(MainWin *parent);
 
 protected slots:
     TitleSetter(MainWin *parent);
 
 protected slots:

-    virtual void currentChanged(const QModelIndex &current, const QModelIndex &previous);
-    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+    void currentChanged(const QModelIndex &current, const QModelIndex &previous) override;
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;

 
 private:
     MainWin *_mainWin;
 
 private:
     MainWin *_mainWin;

diff --git a/src/qtui/topicwidget.h b/src/qtui/topicwidget.h
index f054ff5..a7721d0 100644 (file)
--- a/src/qtui/topicwidget.h
+++ b/src/qtui/topicwidget.h
@@ -36,15 +36,15 @@ public:
     void setCustomFont(const QFont &);
     void setReadOnly(const bool &readonly);
 
     void setCustomFont(const QFont &);
     void setReadOnly(const bool &readonly);
 

-    virtual bool eventFilter(QObject *obj, QEvent *event);
+    bool eventFilter(QObject *obj, QEvent *event) override;

     inline bool isReadOnly() const { return _readonly; }
 
 signals:
     void switchedPlain();
 
 protected slots:
     inline bool isReadOnly() const { return _readonly; }
 
 signals:
     void switchedPlain();
 
 protected slots:

-    virtual void currentChanged(const QModelIndex &current, const QModelIndex &previous);
-    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+    void currentChanged(const QModelIndex &current, const QModelIndex &previous) override;
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;

 
 private slots:
     void on_topicLineEdit_textEntered();
 
 private slots:
     void on_topicLineEdit_textEntered();

diff --git a/src/qtui/verticaldock.h b/src/qtui/verticaldock.h
index 4194fa7..f7bbe93 100644 (file)
--- a/src/qtui/verticaldock.h
+++ b/src/qtui/verticaldock.h
@@ -31,12 +31,12 @@ class VerticalDockTitle : public QWidget
 public:
     VerticalDockTitle(QDockWidget *parent);
 
 public:
     VerticalDockTitle(QDockWidget *parent);
 

-    virtual QSize sizeHint() const;
-    virtual QSize minimumSizeHint() const;
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;

     void show(bool show_);
 
 protected:
     void show(bool show_);
 
 protected:

-    virtual void paintEvent(QPaintEvent *event);
+    void paintEvent(QPaintEvent *event) override;

 
 private:
     bool _show;
 
 private:
     bool _show;


@@ -50,7 +50,7 @@ class EmptyDockTitle : public QWidget
 public:
     inline EmptyDockTitle(QDockWidget *parent) : QWidget(parent) {}
 
 public:
     inline EmptyDockTitle(QDockWidget *parent) : QWidget(parent) {}
 

-    inline virtual QSize sizeHint() const { return QSize(0, 0); }
+    inline QSize sizeHint() const override { return QSize(0, 0); }

 };
 
 
 };
 
 

diff --git a/src/qtui/webpreviewitem.cpp b/src/qtui/webpreviewitem.cpp
index 06c0488..8a24d6f 100644 (file)
--- a/src/qtui/webpreviewitem.cpp
+++ b/src/qtui/webpreviewitem.cpp
@@ -46,7 +46,7 @@ public:
     CustomWebView(QGraphicsProxyWidget *pItem) {
         proxyItem = pItem;
     }
     CustomWebView(QGraphicsProxyWidget *pItem) {
         proxyItem = pItem;
     }

-    bool event(QEvent *event) {
+    bool event(QEvent *event) override {

         if (event->type() == QEvent::UpdateRequest)
         {
             proxyItem->update();
         if (event->type() == QEvent::UpdateRequest)
         {
             proxyItem->update();

diff --git a/src/qtui/webpreviewitem.h b/src/qtui/webpreviewitem.h
index 925d7d0..c506866 100644 (file)
--- a/src/qtui/webpreviewitem.h
+++ b/src/qtui/webpreviewitem.h
@@ -29,8 +29,8 @@ class WebPreviewItem : public QGraphicsItem
 {
 public:
     WebPreviewItem(const QUrl &url);
 {
 public:
     WebPreviewItem(const QUrl &url);

-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr);
-    virtual inline QRectF boundingRect() const { return _boundingRect; }
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;
+    inline QRectF boundingRect() const override { return _boundingRect; }

 
 private:
     QRectF _boundingRect;
 
 private:
     QRectF _boundingRect;

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

-    virtual ~AbstractBufferContainer();
+    ~AbstractBufferContainer() override;

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


@@ -60,8 +60,8 @@ protected:
     virtual inline bool autoMarkerLine() const { return true; }
 
 protected slots:
     virtual inline bool autoMarkerLine() const { return true; }
 
 protected slots:

-    virtual void currentChanged(const QModelIndex &current, const QModelIndex &previous);
-    virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
+    void currentChanged(const QModelIndex &current, const QModelIndex &previous) override;
+    void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override;

 
     //! Show the given chat view
     /** This method is called when the given chat view should be displayed. Use this e.g. for
 
     //! Show the given chat view
     /** This method is called when the given chat view should be displayed. Use this e.g. for

diff --git a/src/uisupport/abstractnotificationbackend.h b/src/uisupport/abstractnotificationbackend.h
index 7d6b1d9..3655d95 100644 (file)
--- a/src/uisupport/abstractnotificationbackend.h
+++ b/src/uisupport/abstractnotificationbackend.h
@@ -53,7 +53,7 @@ public:
     };
 
     inline AbstractNotificationBackend(QObject *parent) : QObject(parent) {};
     };
 
     inline AbstractNotificationBackend(QObject *parent) : QObject(parent) {};

-    virtual ~AbstractNotificationBackend() {};
+    ~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.h b/src/uisupport/actioncollection.h
index 5992eb8..10f7d93 100644 (file)
--- a/src/uisupport/actioncollection.h
+++ b/src/uisupport/actioncollection.h
@@ -43,7 +43,7 @@ class UISUPPORT_EXPORT ActionCollection : public QObject
 
 public:
     explicit ActionCollection(QObject *parent);
 
 public:
     explicit ActionCollection(QObject *parent);

-    virtual ~ActionCollection();
+    ~ActionCollection() override;

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


@@ -97,7 +97,7 @@ signals:
     void actionTriggered(QAction *action);
 
 protected slots:
     void actionTriggered(QAction *action);
 
 protected slots:

-    virtual void connectNotify(const QMetaMethod &signal);
+    void connectNotify(const QMetaMethod &signal) override;

     virtual void slotActionTriggered();
 
 private slots:
     virtual void slotActionTriggered();
 
 private slots:

diff --git a/src/uisupport/bufferhotlistfilter.h b/src/uisupport/bufferhotlistfilter.h
index 1ec9505..3d634af 100644 (file)
--- a/src/uisupport/bufferhotlistfilter.h
+++ b/src/uisupport/bufferhotlistfilter.h
@@ -32,11 +32,11 @@ class UISUPPORT_EXPORT BufferHotListFilter : public QSortFilterProxyModel
 public:
     BufferHotListFilter(QAbstractItemModel *source, QObject *parent = nullptr);
 
 public:
     BufferHotListFilter(QAbstractItemModel *source, QObject *parent = nullptr);
 

-    virtual inline int columnCount(const QModelIndex &) const { return 1; }
+    inline int columnCount(const QModelIndex &) const override { return 1; }

     BufferId hottestBuffer();
 //   QVariant data(const QModelIndex &index, int role) const;
 
 protected:
     BufferId hottestBuffer();
 //   QVariant data(const QModelIndex &index, int role) const;
 
 protected:

-    virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
-    virtual bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const;
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
+    bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;

 };
 };

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 52d4ffa..4fff602 100644 (file)
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -51,7 +51,7 @@ public:
     BufferView(QWidget *parent = nullptr);
     void init();
 
     BufferView(QWidget *parent = nullptr);
     void init();
 

-    void setModel(QAbstractItemModel *model);
+    void setModel(QAbstractItemModel *model) override;

     void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config);
 
     void setConfig(BufferViewConfig *config);
     void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config);
 
     void setConfig(BufferViewConfig *config);


@@ -79,14 +79,14 @@ signals:
     void removeBufferPermanently(const QModelIndex &);
 
 protected:
     void removeBufferPermanently(const QModelIndex &);
 
 protected:

-    virtual void dropEvent(QDropEvent *event);
-    virtual void rowsInserted(const QModelIndex &parent, int start, int end);
-    virtual void wheelEvent(QWheelEvent *);
-    virtual QSize sizeHint() const;
-    virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
-    virtual void contextMenuEvent(QContextMenuEvent *event);
+    void dropEvent(QDropEvent *event) override;
+    void rowsInserted(const QModelIndex &parent, int start, int end) override;
+    void wheelEvent(QWheelEvent *) override;
+    QSize sizeHint() const override;
+    void focusInEvent(QFocusEvent *event) override { QAbstractScrollArea::focusInEvent(event); }
+    void contextMenuEvent(QContextMenuEvent *event) override;

 
 

-    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) override;

 
 private slots:
     void joinChannel(const QModelIndex &index);
 
 private slots:
     void joinChannel(const QModelIndex &index);


@@ -183,8 +183,8 @@ public slots:
     void setActive(bool active = true);
 
 protected slots:
     void setActive(bool active = true);
 
 protected slots:

-    virtual bool eventFilter(QObject *object, QEvent *event);
-    virtual void focusInEvent(QFocusEvent*event) { qDebug() << event; }
+    bool eventFilter(QObject *object, QEvent *event) override;
+    void focusInEvent(QFocusEvent*event) override { qDebug() << event; }

 
 private slots:
     void bufferViewRenamed(const QString &newName);
 
 private slots:
     void bufferViewRenamed(const QString &newName);

diff --git a/src/uisupport/bufferviewfilter.h b/src/uisupport/bufferviewfilter.h
index 69f8928..72a6eef 100644 (file)
--- a/src/uisupport/bufferviewfilter.h
+++ b/src/uisupport/bufferviewfilter.h
@@ -54,27 +54,27 @@ public:
 
     BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config = nullptr);
 
 
     BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *config = nullptr);
 

-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-    virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;

 
 

-    QVariant data(const QModelIndex &index, int role) const;
+    QVariant data(const QModelIndex &index, int role) const override;

     QVariant checkedState(const QModelIndex &index) const;
 
     QVariant checkedState(const QModelIndex &index) const;
 

-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;

     bool setCheckedState(const QModelIndex &index, Qt::CheckState state);
 
     void setConfig(BufferViewConfig *config);
     inline BufferViewConfig *config() const { return _config; }
 
     bool setCheckedState(const QModelIndex &index, Qt::CheckState state);
 
     void setConfig(BufferViewConfig *config);
     inline BufferViewConfig *config() const { return _config; }
 

-    virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
+    void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;

 
     QList<QAction *> actions(const QModelIndex &index);
 
     void setFilterString(const QString string);
 
 protected:
 
     QList<QAction *> actions(const QModelIndex &index);
 
     void setFilterString(const QString string);
 
 protected:

-    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
-    bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const;
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
+    bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;

     bool bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const;
     bool networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const;
 
     bool bufferLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const;
     bool networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const;
 

diff --git a/src/uisupport/bufferviewoverlayfilter.h b/src/uisupport/bufferviewoverlayfilter.h
index 721d6cc..2ccc85b 100644 (file)
--- a/src/uisupport/bufferviewoverlayfilter.h
+++ b/src/uisupport/bufferviewoverlayfilter.h
@@ -38,7 +38,7 @@ public:
     void setOverlay(BufferViewOverlay *overlay);
 
 protected:
     void setOverlay(BufferViewOverlay *overlay);
 
 protected:

-    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;

 
 private slots:
     void overlayDestroyed();
 
 private slots:
     void overlayDestroyed();

diff --git a/src/uisupport/clearablelineedit.h b/src/uisupport/clearablelineedit.h
index 7c01a40..2a8a0b3 100644 (file)
--- a/src/uisupport/clearablelineedit.h
+++ b/src/uisupport/clearablelineedit.h
@@ -34,7 +34,7 @@ public:
     ClearableLineEdit(QWidget *parent = nullptr);
 
 protected:
     ClearableLineEdit(QWidget *parent = nullptr);
 
 protected:

-    void resizeEvent(QResizeEvent *event);
+    void resizeEvent(QResizeEvent *event) override;

 
 private slots:
     void updateClearButton(const QString &text);
 
 private slots:
     void updateClearButton(const QString &text);

diff --git a/src/uisupport/clickablelabel.h b/src/uisupport/clickablelabel.h
index c68fde2..77058de 100644 (file)
--- a/src/uisupport/clickablelabel.h
+++ b/src/uisupport/clickablelabel.h
@@ -35,5 +35,5 @@ signals:
     void clicked();
 
 protected:
     void clicked();
 
 protected:

-    void mouseReleaseEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event) override;

 };
 };

diff --git a/src/uisupport/contextmenuactionprovider.h b/src/uisupport/contextmenuactionprovider.h
index c95a3c1..e7e8eb4 100644 (file)
--- a/src/uisupport/contextmenuactionprovider.h
+++ b/src/uisupport/contextmenuactionprovider.h
@@ -30,7 +30,7 @@ class UISUPPORT_EXPORT ContextMenuActionProvider : public NetworkModelController
 
 public:
     ContextMenuActionProvider(QObject *parent = nullptr);
 
 public:
     ContextMenuActionProvider(QObject *parent = nullptr);

-    virtual ~ContextMenuActionProvider();
+    ~ContextMenuActionProvider() override;

 
     //! Provide a list of actions applying to the given item
     /**
 
     //! Provide a list of actions applying to the given item
     /**

diff --git a/src/uisupport/flatproxymodel.h b/src/uisupport/flatproxymodel.h
index aa594cc..17eb680 100644 (file)
--- a/src/uisupport/flatproxymodel.h
+++ b/src/uisupport/flatproxymodel.h
@@ -31,19 +31,19 @@ class UISUPPORT_EXPORT FlatProxyModel : public QAbstractProxyModel
 public:
     FlatProxyModel(QObject *parent = nullptr);
 
 public:
     FlatProxyModel(QObject *parent = nullptr);
 

-    virtual QModelIndex mapFromSource(const QModelIndex &sourceIndex) const;
-    virtual QModelIndex mapToSource(const QModelIndex &proxyIndex) const;
+    QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override;
+    QModelIndex mapToSource(const QModelIndex &proxyIndex) const override;

 
 

-    virtual QItemSelection mapSelectionFromSource(const QItemSelection &sourceSelection) const;
-    virtual QItemSelection mapSelectionToSource(const QItemSelection &proxySelection) const;
+    QItemSelection mapSelectionFromSource(const QItemSelection &sourceSelection) const override;
+    QItemSelection mapSelectionToSource(const QItemSelection &proxySelection) const override;

 
 

-    virtual void setSourceModel(QAbstractItemModel *sourceModel);
+    void setSourceModel(QAbstractItemModel *sourceModel) override;

 
 

-    virtual QModelIndex index(int row, int column, const QModelIndex &parent) const;
-    virtual QModelIndex parent(const QModelIndex &index) const;
+    QModelIndex index(int row, int column, const QModelIndex &parent) const override;
+    QModelIndex parent(const QModelIndex &index) const override;

 
 

-    virtual int rowCount(const QModelIndex &index) const;
-    virtual int columnCount(const QModelIndex &index) const;
+    int rowCount(const QModelIndex &index) const override;
+    int columnCount(const QModelIndex &index) const override;

 
 public slots:
     void linkTest() const;
 
 public slots:
     void linkTest() const;

diff --git a/src/uisupport/fontselector.h b/src/uisupport/fontselector.h
index c36a1fd..df12db0 100644 (file)
--- a/src/uisupport/fontselector.h
+++ b/src/uisupport/fontselector.h
@@ -42,7 +42,7 @@ signals:
     void fontChanged(const QFont &);
 
 protected:
     void fontChanged(const QFont &);
 
 protected:

-    void changeEvent(QEvent *e);
+    void changeEvent(QEvent *e) override;

 
 protected slots:
     void chooseFont();
 
 protected slots:
     void chooseFont();

diff --git a/src/uisupport/graphicalui.h b/src/uisupport/graphicalui.h
index b97371e..42b5785 100644 (file)
--- a/src/uisupport/graphicalui.h
+++ b/src/uisupport/graphicalui.h
@@ -78,7 +78,7 @@ public:
 
 protected:
     GraphicalUi(QObject *parent = nullptr);
 
 protected:
     GraphicalUi(QObject *parent = nullptr);

-    virtual void init();
+    void init() override;

 
     //! This is the widget we associate global actions with, typically the main window
     void setMainWidget(QWidget *);
 
     //! This is the widget we associate global actions with, typically the main window
     void setMainWidget(QWidget *);


@@ -105,10 +105,10 @@ protected:
     void setToolBarActionProvider(ToolBarActionProvider *);
     void setUiStyle(UiStyle *);
 
     void setToolBarActionProvider(ToolBarActionProvider *);
     void setUiStyle(UiStyle *);
 

-    virtual bool eventFilter(QObject *obj, QEvent *event);
+    bool eventFilter(QObject *obj, QEvent *event) override;

 
 protected slots:
 
 protected slots:

-    virtual void disconnectedFromCore();
+    void disconnectedFromCore() override;

 
 private:
     static QWidget *_mainWidget;
 
 private:
     static QWidget *_mainWidget;

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

-    ~MultiLineEdit();
+    ~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.h b/src/uisupport/networkmodelcontroller.h
index c7351c4..e224b75 100644 (file)
--- a/src/uisupport/networkmodelcontroller.h
+++ b/src/uisupport/networkmodelcontroller.h
@@ -38,7 +38,7 @@ class UISUPPORT_EXPORT NetworkModelController : public QObject
 
 public:
     NetworkModelController(QObject *parent = nullptr);
 
 public:
     NetworkModelController(QObject *parent = nullptr);

-    virtual ~NetworkModelController();
+    ~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/nickview.h b/src/uisupport/nickview.h
index ee53d82..08d57e8 100644 (file)
--- a/src/uisupport/nickview.h
+++ b/src/uisupport/nickview.h
@@ -35,16 +35,16 @@ public:
     NickView(QWidget *parent = nullptr);
 
 protected:
     NickView(QWidget *parent = nullptr);
 
 protected:

-    virtual void rowsInserted(const QModelIndex &parent, int start, int end);
+    void rowsInserted(const QModelIndex &parent, int start, int end) override;

 
     //! This reimplementation ensures that the current index is first in list
 
     //! This reimplementation ensures that the current index is first in list

-    virtual QModelIndexList selectedIndexes() const;
+    QModelIndexList selectedIndexes() const override;

 
     void unanimatedExpandAll();
 
 public slots:
 
     void unanimatedExpandAll();
 
 public slots:

-    virtual void setModel(QAbstractItemModel *model);
-    virtual void setRootIndex(const QModelIndex &index);
+    void setModel(QAbstractItemModel *model) override;
+    void setRootIndex(const QModelIndex &index) override;

     void init();
     void showContextMenu(const QPoint &pos);
     void startQuery(const QModelIndex &modelIndex);
     void init();
     void showContextMenu(const QPoint &pos);
     void startQuery(const QModelIndex &modelIndex);

diff --git a/src/uisupport/nickviewfilter.h b/src/uisupport/nickviewfilter.h
index 952271e..f10627b 100644 (file)
--- a/src/uisupport/nickviewfilter.h
+++ b/src/uisupport/nickviewfilter.h
@@ -36,11 +36,11 @@ class UISUPPORT_EXPORT NickViewFilter : public QSortFilterProxyModel
 public:
     NickViewFilter(const BufferId &bufferId, NetworkModel *parent = nullptr);
 
 public:
     NickViewFilter(const BufferId &bufferId, NetworkModel *parent = nullptr);
 

-    virtual QVariant data(const QModelIndex &index, int role) const;
+    QVariant data(const QModelIndex &index, int role) const override;

     QVariant icon(const QModelIndex &index) const;
 
 protected:
     QVariant icon(const QModelIndex &index) const;
 
 protected:

-    virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;

     QVariant styleData(const QModelIndex &index, int role) const;
 
 private:
     QVariant styleData(const QModelIndex &index, int role) const;
 
 private:

diff --git a/src/uisupport/resizingstackedwidget.h b/src/uisupport/resizingstackedwidget.h
index 4e8cff2..ada5b1a 100644 (file)
--- a/src/uisupport/resizingstackedwidget.h
+++ b/src/uisupport/resizingstackedwidget.h
@@ -31,7 +31,7 @@ class UISUPPORT_EXPORT ResizingStackedWidget : public QStackedWidget
 public:
     ResizingStackedWidget(QWidget *parent = nullptr);
 
 public:
     ResizingStackedWidget(QWidget *parent = nullptr);
 

-    virtual QSize sizeHint() const;
+    QSize sizeHint() const override;

 
 private slots:
     void indexChanged(int index);
 
 private slots:
     void indexChanged(int index);

diff --git a/src/uisupport/settingspage.h b/src/uisupport/settingspage.h
index 523cfa2..57bcfec 100644 (file)
--- a/src/uisupport/settingspage.h
+++ b/src/uisupport/settingspage.h
@@ -62,7 +62,7 @@ class UISUPPORT_EXPORT SettingsPage : public QWidget
 
 public:
     SettingsPage(const QString &category, const QString &name, QWidget *parent = nullptr);
 
 public:
     SettingsPage(const QString &category, const QString &name, QWidget *parent = nullptr);

-    virtual ~SettingsPage() {};
+    ~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/styledlabel.h b/src/uisupport/styledlabel.h
index 2cd7390..1a74608 100644 (file)
--- a/src/uisupport/styledlabel.h
+++ b/src/uisupport/styledlabel.h
@@ -43,7 +43,7 @@ public:
     void setText(const QString &text);
     void setCustomFont(const QFont &font);
 
     void setText(const QString &text);
     void setCustomFont(const QFont &font);
 

-    virtual QSize sizeHint() const;
+    QSize sizeHint() const override;

     //virtual QSize minimumSizeHint() const;
 
     inline QTextOption::WrapMode wrapMode() const { return _wrapMode; }
     //virtual QSize minimumSizeHint() const;
 
     inline QTextOption::WrapMode wrapMode() const { return _wrapMode; }


@@ -62,12 +62,12 @@ signals:
     void clickableActivated(const Clickable &click);
 
 protected:
     void clickableActivated(const Clickable &click);
 
 protected:

-    virtual void paintEvent(QPaintEvent *event);
-    virtual void resizeEvent(QResizeEvent *event);
-    virtual void enterEvent(QEvent *);
-    virtual void leaveEvent(QEvent *);
-    virtual void mouseMoveEvent(QMouseEvent *event);
-    virtual void mousePressEvent(QMouseEvent *event);
+    void paintEvent(QPaintEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
+    void enterEvent(QEvent *) override;
+    void leaveEvent(QEvent *) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void mousePressEvent(QMouseEvent *event) override;

 
     int posToCursor(const QPointF &pos);
 
 
     int posToCursor(const QPointF &pos);
 

diff --git a/src/uisupport/tabcompleter.h b/src/uisupport/tabcompleter.h
index 9d58d44..a0e6074 100644 (file)
--- a/src/uisupport/tabcompleter.h
+++ b/src/uisupport/tabcompleter.h
@@ -47,7 +47,7 @@ public:
     void reset();
     void complete();
 
     void reset();
     void complete();
 

-    virtual bool eventFilter(QObject *obj, QEvent *event);
+    bool eventFilter(QObject *obj, QEvent *event) override;

 
 public slots:
     void onTabCompletionKey();
 
 public slots:
     void onTabCompletionKey();

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

-    virtual ~ToolBarActionProvider();
+    ~ToolBarActionProvider() override;

 
     enum ToolBarType {
         MainToolBar,
 
     enum ToolBarType {
         MainToolBar,


@@ -43,13 +43,13 @@ public:
     void addActions(QToolBar *, ToolBarType type);
 
 public slots:
     void addActions(QToolBar *, ToolBarType type);
 
 public slots:

-    virtual void disconnectedFromCore();
+    void disconnectedFromCore() override;

 
 protected:
 
 protected:

-    virtual void handleNetworkAction(ActionType, QAction *);
-    virtual void handleBufferAction(ActionType, QAction *);
-    virtual void handleNickAction(ActionType, QAction *);
-    virtual void handleGeneralAction(ActionType, QAction *);
+    void handleNetworkAction(ActionType, QAction *) override;
+    void handleBufferAction(ActionType, QAction *) override;
+    void handleNickAction(ActionType, QAction *) override;
+    void handleGeneralAction(ActionType, QAction *) override;

 
 private slots:
     void networkCreated(NetworkId id);
 
 private slots:
     void networkCreated(NetworkId id);

diff --git a/src/uisupport/uisettings.h b/src/uisupport/uisettings.h
index 3fc627e..e597e59 100644 (file)
--- a/src/uisupport/uisettings.h
+++ b/src/uisupport/uisettings.h
@@ -64,8 +64,8 @@ class UISUPPORT_EXPORT SessionSettings : public UiSettings
 public:
     SessionSettings(const QString &sessionId, const QString &group = "Session");
 
 public:
     SessionSettings(const QString &sessionId, const QString &group = "Session");
 

-    virtual void setValue(const QString &key, const QVariant &data);
-    virtual QVariant value(const QString &key, const QVariant &def = QVariant());
+    void setValue(const QString &key, const QVariant &data) override;
+    QVariant value(const QString &key, const QVariant &def = QVariant()) override;

 
     void removeKey(const QString &key);
     void removeSession();
 
     void removeKey(const QString &key);
     void removeSession();

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 9e58992..2a098da 100644 (file)
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -47,7 +47,7 @@ class UISUPPORT_EXPORT UiStyle : public QObject
 
 public:
     UiStyle(QObject *parent = nullptr);
 
 public:
     UiStyle(QObject *parent = nullptr);

-    virtual ~UiStyle();
+    ~UiStyle() override;

 
     //! This enumerates the possible formats a text element may have. */
     /** These formats are ordered on increasing importance, in cases where a given property is specified
 
     //! This enumerates the possible formats a text element may have. */
     /** These formats are ordered on increasing importance, in cases where a given property is specified