X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.h;h=a77491245623fcb1a4266555fe863db19936dc51;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hp=99e5fc2539410f2c60eed4f2d0992489a2d4e5b7;hpb=1ccf9666ade9a46880ffb68feeac81b7c39e570b;p=quassel.git

diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h
index 99e5fc25..a7749124 100644
--- a/src/core/corenetwork.h
+++ b/src/core/corenetwork.h
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef CORENETWORK_H
-#define CORENETWORK_H
+#pragma once
 
 #include "network.h"
 #include "coreircchannel.h"
@@ -52,14 +51,11 @@ class Event;
 
 class CoreNetwork : public Network
 {
-    SYNCABLE_OBJECT
-        Q_OBJECT
+    Q_OBJECT
 
 public:
     CoreNetwork(const NetworkId &networkid, CoreSession *session);
-    virtual ~CoreNetwork();
-
-    inline virtual const QMetaObject *syncMetaObject() const { return &Network::staticMetaObject; }
+    ~CoreNetwork() override;
 
     inline CoreIdentity *identityPtr() const { return coreSession()->identity(identity()); }
     inline CoreSession *coreSession() const { return _coreSession; }
@@ -207,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);
 
@@ -449,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
@@ -601,6 +597,3 @@ private:
     // List of blowfish keys for channels
     QHash<QString, QByteArray> _cipherKeys;
 };
-
-
-#endif //CORENETWORK_H