X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatlinemodelitem.h;h=750a42e021cf5ba750b78f145a9d133aafc3c1e7;hp=24f237e72f9d665ed1c994f02e40afa314d107a9;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf diff --git a/src/qtui/chatlinemodelitem.h b/src/qtui/chatlinemodelitem.h index 24f237e7..750a42e0 100644 --- a/src/qtui/chatlinemodelitem.h +++ b/src/qtui/chatlinemodelitem.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,35 +21,35 @@ #pragma once #include "messagemodel.h" - #include "uistyle.h" class ChatLineModelItem : public MessageModelItem { public: - ChatLineModelItem(const Message &); + 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 ×tamp() 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(); } /// Used to store information about words to be used for wrapping - struct Word { + struct Word + { quint16 start; qreal endX; qreal width; qreal trailing; }; - typedef QVector WrapList; + using WrapList = QVector; private: QVariant timestampData(int role) const; @@ -64,6 +64,6 @@ private: mutable WrapList _wrapList; UiStyle::StyledMessage _styledMsg; - static unsigned char *TextBoundaryFinderBuffer; + static unsigned char* TextBoundaryFinderBuffer; static int TextBoundaryFinderBufferSize; };