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 aecc9bc..2d07a88 100644 (file)
--- a/src/qtui/chatlinemodel.h
+++ b/src/qtui/chatlinemodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,48 +15,50 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #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 = 0);
+    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;
-    virtual inline const MessageModelItem *messageItemAt(int i) const { return &_messageList[i]; }
 protected:
-//   virtual MessageModelItem *createMessageModelItem(const Message &);
+    //   virtual MessageModelItem *createMessageModelItem(const Message &);
 
-    virtual inline int messageCount() const { return _messageList.count(); }
-    virtual inline bool messagesIsEmpty() const { return _messageList.isEmpty(); }
-    virtual inline MessageModelItem *messageItemAt(int i) { return &_messageList[i]; }
-    virtual inline const MessageModelItem *firstMessageItem() const { return &_messageList.first(); }
-    virtual inline MessageModelItem *firstMessageItem() { return &_messageList.first(); }
-    virtual inline const MessageModelItem *lastMessageItem() const { return &_messageList.last(); }
-    virtual inline MessageModelItem *lastMessageItem() { return &_messageList.last(); }
-    virtual inline void insertMessage__(int pos, const Message &msg) { _messageList.insert(pos, ChatLineModelItem(msg)); }
-    virtual void insertMessages__(int pos, const QList<Message> &);
-    virtual inline void removeMessageAt(int i) { _messageList.removeAt(i); }
-    virtual inline void removeAllMessages() { _messageList.clear(); }
-    virtual Message takeMessageAt(int i);
+    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 void removeMessageAt(int i) override { _messageList.removeAt(i); }
+    inline void removeAllMessages() override { _messageList.clear(); }
+    Message takeMessageAt(int i) override;
 
 protected slots:
     virtual void styleChanged();
@@ -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)