X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.h;fp=src%2Fcore%2Fcorenetwork.h;h=a77491245623fcb1a4266555fe863db19936dc51;hp=4082268a727ad74ba1be0c61bc4b3b05f75bf62f;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h index 4082268a..a7749124 100644 --- 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); - virtual ~CoreNetwork(); - + ~CoreNetwork() override; inline CoreIdentity *identityPtr() const { return coreSession()->identity(identity()); } inline CoreSession *coreSession() const { return _coreSession; } @@ -204,15 +203,15 @@ public: }; 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); @@ -446,8 +445,8 @@ signals: 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