X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Feventmanager.h;h=0a72a70ad8cc3021123a502c75bae1f06f753255;hb=d89f4d9cdbc167112e64fca1931e81bc27d17319;hp=246c58a76f9d2b48723c2792e98c008e3ad56fc2;hpb=92fc8c5b119111a35ab8423c3cbde5b2a022badf;p=quassel.git

diff --git a/src/common/eventmanager.h b/src/common/eventmanager.h
index 246c58a7..0a72a70a 100644
--- a/src/common/eventmanager.h
+++ b/src/common/eventmanager.h
@@ -122,7 +122,7 @@ public :
         KeyEvent                    = 0x00060000
     };
 
-    EventManager(QObject *parent = 0);
+    EventManager(QObject *parent = nullptr);
 
     static EventType eventTypeByName(const QString &name);
     static EventType eventGroupByName(const QString &name);
@@ -152,7 +152,7 @@ public slots:
 
 protected:
     virtual Network *networkById(NetworkId id) const = 0;
-    virtual void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;
 
 private:
     struct Handler {
@@ -160,7 +160,7 @@ private:
         int methodIndex;
         Priority priority;
 
-        explicit Handler(QObject *obj = 0, int method = 0, Priority prio = NormalPriority)
+        explicit Handler(QObject *obj = nullptr, int method = 0, Priority prio = NormalPriority)
         {
             object = obj;
             methodIndex = method;
@@ -168,7 +168,7 @@ private:
         }
     };
 
-    typedef QHash<uint, QList<Handler> > HandlerHash;
+    using HandlerHash = QHash<uint, QList<Handler>>;
 
     inline const HandlerHash &registeredHandlers() const { return _registeredHandlers; }
     inline HandlerHash &registeredHandlers() { return _registeredHandlers; }