projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'simplify-time-formatting' of https://github.com/justjanne/quassel
[quassel.git]
/
src
/
qtui
/
chatlinemodel.cpp
diff --git
a/src/qtui/chatlinemodel.cpp
b/src/qtui/chatlinemodel.cpp
index
5e5dd62
..
b3f3fb2
100644
(file)
--- a/
src/qtui/chatlinemodel.cpp
+++ b/
src/qtui/chatlinemodel.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
9
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 *
@@
-19,24
+19,24
@@
***************************************************************************/
#include "chatlinemodel.h"
***************************************************************************/
#include "chatlinemodel.h"
+
#include "qtui.h"
#include "qtuistyle.h"
#include "qtui.h"
#include "qtuistyle.h"
-ChatLineModel::ChatLineModel(QObject
*
parent)
+ChatLineModel::ChatLineModel(QObject
*
parent)
: MessageModel(parent)
{
qRegisterMetaType<WrapList>("ChatLineModel::WrapList");
qRegisterMetaTypeStreamOperators<WrapList>("ChatLineModel::WrapList");
: MessageModel(parent)
{
qRegisterMetaType<WrapList>("ChatLineModel::WrapList");
qRegisterMetaTypeStreamOperators<WrapList>("ChatLineModel::WrapList");
- connect(QtUi::style(),
SIGNAL(changed()), SLOT(styleChanged())
);
+ connect(QtUi::style(),
&UiStyle::changed, this, &ChatLineModel::styleChanged
);
}
}
-
// MessageModelItem *ChatLineModel::createMessageModelItem(const Message &msg) {
// return new ChatLineModelItem(msg);
// }
// MessageModelItem *ChatLineModel::createMessageModelItem(const Message &msg) {
// return new ChatLineModelItem(msg);
// }
-void ChatLineModel::insertMessages__(int pos, const QList<Message>
&
messages)
+void ChatLineModel::insertMessages__(int pos, const QList<Message>
&
messages)
{
for (int i = 0; i < messages.count(); i++) {
_messageList.insert(pos, ChatLineModelItem(messages[i]));
{
for (int i = 0; i < messages.count(); i++) {
_messageList.insert(pos, ChatLineModelItem(messages[i]));
@@
-44,7
+44,6
@@
void ChatLineModel::insertMessages__(int pos, const QList<Message> &messages)
}
}
}
}
-
Message ChatLineModel::takeMessageAt(int i)
{
Message msg = _messageList[i].message();
Message ChatLineModel::takeMessageAt(int i)
{
Message msg = _messageList[i].message();
@@
-52,17
+51,15
@@
Message ChatLineModel::takeMessageAt(int i)
return msg;
}
return msg;
}
-
void ChatLineModel::styleChanged()
{
void ChatLineModel::styleChanged()
{
- foreach(ChatLineModelItem item, _messageList) {
+ foreach
(ChatLineModelItem item, _messageList) {
item.invalidateWrapList();
}
item.invalidateWrapList();
}
- emit dataChanged(index(0, 0), index(rowCount()
-1, columnCount()-
1));
+ emit dataChanged(index(0, 0), index(rowCount()
- 1, columnCount() -
1));
}
}
-
-QDataStream &operator<<(QDataStream &out, const ChatLineModel::WrapList wplist)
+QDataStream& operator<<(QDataStream& out, const ChatLineModel::WrapList wplist)
{
out << wplist.count();
ChatLineModel::WrapList::const_iterator it = wplist.begin();
{
out << wplist.count();
ChatLineModel::WrapList::const_iterator it = wplist.begin();
@@
-73,8
+70,7
@@
QDataStream &operator<<(QDataStream &out, const ChatLineModel::WrapList wplist)
return out;
}
return out;
}
-
-QDataStream &operator>>(QDataStream &in, ChatLineModel::WrapList &wplist)
+QDataStream& operator>>(QDataStream& in, ChatLineModel::WrapList& wplist)
{
quint16 cnt;
in >> cnt;
{
quint16 cnt;
in >> cnt;