{
QList<BufferId> filterList;
filterList.append(bufferId);
- MessageFilter *filter = new MessageFilter(Client::messageModel(), filterList, this);
+ auto *filter = new MessageFilter(Client::messageModel(), filterList, this);
init(filter);
}
_scrollTimer.setInterval(100);
_scrollTimer.setSingleShot(true);
- connect(&_scrollTimer, SIGNAL(timeout()), SLOT(scrollTimerTimeout()));
+ connect(&_scrollTimer, &QTimer::timeout, this, &ChatView::scrollTimerTimeout);
_scene = new ChatScene(filter, filter->idString(), viewport()->width(), this);
- connect(_scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(adjustSceneRect()));
- connect(_scene, SIGNAL(lastLineChanged(QGraphicsItem *, qreal)), this, SLOT(lastLineChanged(QGraphicsItem *, qreal)));
- connect(_scene, SIGNAL(mouseMoveWhileSelecting(const QPointF &)), this, SLOT(mouseMoveWhileSelecting(const QPointF &)));
+ connect(_scene, &QGraphicsScene::sceneRectChanged, this, &ChatView::adjustSceneRect);
+ connect(_scene, &ChatScene::lastLineChanged, this, &ChatView::lastLineChanged);
+ connect(_scene, &ChatScene::mouseMoveWhileSelecting, this, &ChatView::mouseMoveWhileSelecting);
setScene(_scene);
- connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(verticalScrollbarChanged(int)));
+ connect(verticalScrollBar(), &QAbstractSlider::valueChanged, this, &ChatView::verticalScrollbarChanged);
_lastScrollbarPos = verticalScrollBar()->maximum();
- connect(Client::networkModel(), SIGNAL(markerLineSet(BufferId, MsgId)), SLOT(markerLineSet(BufferId, MsgId)));
+ connect(Client::networkModel(), &NetworkModel::markerLineSet, this, &ChatView::markerLineSet);
// only connect if client is synched with a core
if (Client::isConnected())
- connect(Client::ignoreListManager(), SIGNAL(ignoreListChanged()), this, SLOT(invalidateFilter()));
+ connect(Client::ignoreListManager(), &ClientIgnoreListManager::ignoreListChanged, this, &ChatView::invalidateFilter);
}
bool ChatView::event(QEvent *event)
{
if (event->type() == QEvent::KeyPress) {
- QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+ auto *keyEvent = static_cast<QKeyEvent *>(event);
switch (keyEvent->key()) {
case Qt::Key_Up:
case Qt::Key_Down:
MsgId ChatView::lastMsgId() const
{
if (!scene())
- return MsgId();
+ return {};
QAbstractItemModel *model = scene()->model();
if (!model || model->rowCount() == 0)
- return MsgId();
+ return {};
return model->index(model->rowCount() - 1, 0).data(MessageModel::MsgIdRole).value<MsgId>();
}
if (line)
return line->msgId();
- return MsgId();
+ return {};
}
{
QSet<ChatLine *> result;
foreach(QGraphicsItem *item, items(viewport()->rect().adjusted(-1, -1, 1, 1), mode)) {
- ChatLine *line = qgraphicsitem_cast<ChatLine *>(item);
+ auto *line = qgraphicsitem_cast<ChatLine *>(item);
if (line)
result.insert(line);
}
void ChatView::addActionsToMenu(QMenu *menu, const QPointF &pos)
{
// zoom actions
- BufferWidget *bw = qobject_cast<BufferWidget *>(bufferContainer());
+ auto *bw = qobject_cast<BufferWidget *>(bufferContainer());
if (bw) {
bw->addActionsToMenu(menu, pos);
menu->addSeparator();