qa: Replace deprecated qVariantFromValue() by QVariant::fromValue()

[quassel.git] / src / qtui / chatlinemodel.h

diff --git a/src/qtui/chatlinemodel.h b/src/qtui/chatlinemodel.h
index 84d77e9..2d07a88 100644 (file)
--- a/src/qtui/chatlinemodel.h
+++ b/src/qtui/chatlinemodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,39 +21,41 @@
 #ifndef CHATLINEMODEL_H_
 #define CHATLINEMODEL_H_
 
-#include "messagemodel.h"
-
 #include <QList>
+
 #include "chatlinemodelitem.h"
+#include "messagemodel.h"
 
 class ChatLineModel : public MessageModel
 {
     Q_OBJECT
 
 public:
-    enum ChatLineRole {
+    enum ChatLineRole
+    {
         WrapListRole = MessageModel::UserRole,
         MsgLabelRole,
         SelectedBackgroundRole
     };
 
-    ChatLineModel(QObject *parent = nullptr);
+    ChatLineModel(QObject* parent = nullptr);
+
+    using Word = ChatLineModelItem::Word;
+    using WrapList = ChatLineModelItem::WrapList;
+    inline const MessageModelItem* messageItemAt(int i) const override { return &_messageList[i]; }
 
-    typedef ChatLineModelItem::Word Word;
-    typedef ChatLineModelItem::WrapList WrapList;
-    inline const MessageModelItem *messageItemAt(int i) const override { return &_messageList[i]; }
 protected:
-//   virtual MessageModelItem *createMessageModelItem(const Message &);
+    //   virtual MessageModelItem *createMessageModelItem(const Message &);
 
     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 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;
@@ -65,9 +67,8 @@ private:
     QList<ChatLineModelItem> _messageList;
 };
 
-
-QDataStream &operator<<(QDataStream &out, const ChatLineModel::WrapList);
-QDataStream &operator>>(QDataStream &in, ChatLineModel::WrapList &);
+QDataStream& operator<<(QDataStream& out, const ChatLineModel::WrapList);
+QDataStream& operator>>(QDataStream& in, ChatLineModel::WrapList&);
 
 Q_DECLARE_METATYPE(ChatLineModel::WrapList)