X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatview.cpp;h=95ee9a18b8dd27c4de37edd603794414548cd77d;hb=8f2ee00f4edef1693628d3af0bdee84d725eb754;hp=7b60ba80db97b9c51e577078824db0506e682481;hpb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;p=quassel.git

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index 7b60ba80..95ee9a18 100644
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -72,22 +72,22 @@ void ChatView::init(MessageFilter *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);
 }
 
 
@@ -262,11 +262,11 @@ void ChatView::verticalScrollbarChanged(int newPos)
 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>();
 }
@@ -279,7 +279,7 @@ MsgId ChatView::lastVisibleMsgId() const
     if (line)
         return line->msgId();
 
-    return MsgId();
+    return {};
 }