X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatlinemodelitem.h;h=5713d0dbe00d150a768c084d2ab8f7eeb154818c;hp=5e03e0c8dd964b5c46f3b4e66b6f255cd7b9d8eb;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c

diff --git a/src/qtui/chatlinemodelitem.h b/src/qtui/chatlinemodelitem.h
index 5e03e0c8..5713d0db 100644
--- a/src/qtui/chatlinemodelitem.h
+++ b/src/qtui/chatlinemodelitem.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef CHATLINEMODELITEM_H_
-#define CHATLINEMODELITEM_H_
+#pragma once
 
 #include "messagemodel.h"
 
@@ -30,16 +29,16 @@ class ChatLineModelItem : public MessageModelItem
 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(); }
 
@@ -58,7 +57,7 @@ private:
     QVariant contentsData(int role) const;
 
     QVariant backgroundBrush(UiStyle::FormatType subelement, bool selected = false) const;
-    quint32 messageLabel() const;
+    UiStyle::MessageLabel messageLabel() const;
 
     void computeWrapList() const;
 
@@ -68,6 +67,3 @@ private:
     static unsigned char *TextBoundaryFinderBuffer;
     static int TextBoundaryFinderBufferSize;
 };
-
-
-#endif