projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clang-tidy: Avoid another warning about potential memory leak
[quassel.git]
/
src
/
qtui
/
chatlinemodelitem.cpp
diff --git
a/src/qtui/chatlinemodelitem.cpp
b/src/qtui/chatlinemodelitem.cpp
index
5000221
..
fa0a103
100644
(file)
--- a/
src/qtui/chatlinemodelitem.cpp
+++ b/
src/qtui/chatlinemodelitem.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-65,7
+65,7
@@
bool ChatLineModelItem::setData(int column, const QVariant &value, int role)
{
switch (role) {
case MessageModel::FlagsRole:
{
switch (role) {
case MessageModel::FlagsRole:
- _styledMsg.setFlags((Message::Flags)value.to
U
Int());
+ _styledMsg.setFlags((Message::Flags)value.toInt());
return true;
default:
return MessageModelItem::setData(column, value, role);
return true;
default:
return MessageModelItem::setData(column, value, role);
@@
-76,7
+76,7
@@
bool ChatLineModelItem::setData(int column, const QVariant &value, int role)
QVariant ChatLineModelItem::data(int column, int role) const
{
if (role == ChatLineModel::MsgLabelRole)
QVariant ChatLineModelItem::data(int column, int role) const
{
if (role == ChatLineModel::MsgLabelRole)
- return
messageLabel(
);
+ return
QVariant::fromValue<UiStyle::MessageLabel>(messageLabel()
);
QVariant variant;
MessageModel::ColumnType col = (MessageModel::ColumnType)column;
QVariant variant;
MessageModel::ColumnType col = (MessageModel::ColumnType)column;
@@
-107,12
+107,11
@@
QVariant ChatLineModelItem::timestampData(int role) const
case ChatLineModel::EditRole:
return _styledMsg.timestamp();
case ChatLineModel::BackgroundRole:
case ChatLineModel::EditRole:
return _styledMsg.timestamp();
case ChatLineModel::BackgroundRole:
- return backgroundBrush(UiStyle::Timestamp);
+ return backgroundBrush(UiStyle::
FormatType::
Timestamp);
case ChatLineModel::SelectedBackgroundRole:
case ChatLineModel::SelectedBackgroundRole:
- return backgroundBrush(UiStyle::Timestamp, true);
+ return backgroundBrush(UiStyle::
FormatType::
Timestamp, true);
case ChatLineModel::FormatRole:
case ChatLineModel::FormatRole:
- return QVariant::fromValue<UiStyle::FormatList>(UiStyle::FormatList()
- << qMakePair((quint16)0, (quint32) UiStyle::formatType(_styledMsg.type()) | UiStyle::Timestamp));
+ return QVariant::fromValue<UiStyle::FormatList>({std::make_pair(quint16{0}, UiStyle::Format{UiStyle::formatType(_styledMsg.type()) | UiStyle::FormatType::Timestamp, {}, {}})});
}
return QVariant();
}
}
return QVariant();
}
@@
-126,12
+125,11
@@
QVariant ChatLineModelItem::senderData(int role) const
case ChatLineModel::EditRole:
return _styledMsg.plainSender();
case ChatLineModel::BackgroundRole:
case ChatLineModel::EditRole:
return _styledMsg.plainSender();
case ChatLineModel::BackgroundRole:
- return backgroundBrush(UiStyle::Sender);
+ return backgroundBrush(UiStyle::
FormatType::
Sender);
case ChatLineModel::SelectedBackgroundRole:
case ChatLineModel::SelectedBackgroundRole:
- return backgroundBrush(UiStyle::Sender, true);
+ return backgroundBrush(UiStyle::
FormatType::
Sender, true);
case ChatLineModel::FormatRole:
case ChatLineModel::FormatRole:
- return QVariant::fromValue<UiStyle::FormatList>(UiStyle::FormatList()
- << qMakePair((quint16)0, (quint32) UiStyle::formatType(_styledMsg.type()) | UiStyle::Sender));
+ return QVariant::fromValue<UiStyle::FormatList>({std::make_pair(quint16{0}, UiStyle::Format{UiStyle::formatType(_styledMsg.type()) | UiStyle::FormatType::Sender, {}, {}})});
}
return QVariant();
}
}
return QVariant();
}
@@
-144,9
+142,9
@@
QVariant ChatLineModelItem::contentsData(int role) const
case ChatLineModel::EditRole:
return _styledMsg.plainContents();
case ChatLineModel::BackgroundRole:
case ChatLineModel::EditRole:
return _styledMsg.plainContents();
case ChatLineModel::BackgroundRole:
- return backgroundBrush(UiStyle::Contents);
+ return backgroundBrush(UiStyle::
FormatType::
Contents);
case ChatLineModel::SelectedBackgroundRole:
case ChatLineModel::SelectedBackgroundRole:
- return backgroundBrush(UiStyle::Contents, true);
+ return backgroundBrush(UiStyle::
FormatType::
Contents, true);
case ChatLineModel::FormatRole:
return QVariant::fromValue<UiStyle::FormatList>(_styledMsg.contentsFormatList());
case ChatLineModel::WrapListRole:
case ChatLineModel::FormatRole:
return QVariant::fromValue<UiStyle::FormatList>(_styledMsg.contentsFormatList());
case ChatLineModel::WrapListRole:
@@
-158,20
+156,23
@@
QVariant ChatLineModelItem::contentsData(int role) const
}
}
-
quint32
ChatLineModelItem::messageLabel() const
+
UiStyle::MessageLabel
ChatLineModelItem::messageLabel() const
{
{
- quint32 label = _styledMsg.senderHash() << 16;
+ using MessageLabel = UiStyle::MessageLabel;
+
+ MessageLabel label = static_cast<MessageLabel>(_styledMsg.senderHash() << 16);
if (_styledMsg.flags() & Message::Self)
if (_styledMsg.flags() & Message::Self)
- label |=
UiStyle
::OwnMsg;
+ label |=
MessageLabel
::OwnMsg;
if (_styledMsg.flags() & Message::Highlight)
if (_styledMsg.flags() & Message::Highlight)
- label |=
UiStyle
::Highlight;
+ label |=
MessageLabel
::Highlight;
return label;
}
QVariant ChatLineModelItem::backgroundBrush(UiStyle::FormatType subelement, bool selected) const
{
return label;
}
QVariant ChatLineModelItem::backgroundBrush(UiStyle::FormatType subelement, bool selected) const
{
- QTextCharFormat fmt = QtUi::style()->format(UiStyle::formatType(_styledMsg.type()) | subelement, messageLabel() | (selected ? UiStyle::Selected : 0));
+ QTextCharFormat fmt = QtUi::style()->format({UiStyle::formatType(_styledMsg.type()) | subelement, {}, {}},
+ messageLabel() | (selected ? UiStyle::MessageLabel::Selected : UiStyle::MessageLabel::None));
if (fmt.hasProperty(QTextFormat::BackgroundBrush))
return QVariant::fromValue<QBrush>(fmt.background());
return QVariant();
if (fmt.hasProperty(QTextFormat::BackgroundBrush))
return QVariant::fromValue<QBrush>(fmt.background());
return QVariant();