modernize: Use auto where the type is clear from context

[quassel.git] / src / qtui / chatview.cpp

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index 704b3be..7b60ba8 100644 (file)
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -40,7 +40,7 @@ ChatView::ChatView(BufferId bufferId, QWidget *parent)
 {
     QList<BufferId> filterList;
     filterList.append(bufferId);
-    MessageFilter *filter = new MessageFilter(Client::messageModel(), filterList, this);
+    auto *filter = new MessageFilter(Client::messageModel(), filterList, this);
     init(filter);
 }
 
@@ -55,7 +55,7 @@ ChatView::ChatView(MessageFilter *filter, QWidget *parent)
 
 void ChatView::init(MessageFilter *filter)
 {
-    _bufferContainer = 0;
+    _bufferContainer = nullptr;
     _currentScaleFactor = 1;
     _invalidateFilter = false;
 
@@ -94,7 +94,7 @@ void ChatView::init(MessageFilter *filter)
 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:
@@ -109,11 +109,7 @@ bool ChatView::event(QEvent *event)
         }
     }
 
-#if QT_VERSION >= 0x050000
-    if (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->device()->type()==QTouchDevice::TouchScreen) {
-#else
-    if (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->deviceType()==QTouchEvent::TouchScreen) {
-#endif
+    if (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->device()->type() == QTouchDevice::TouchScreen) {
         // Enable scrolling by draging, disable selecting/clicking content
         setDragMode(QGraphicsView::ScrollHandDrag);
         setInteractive(false);
@@ -122,11 +118,7 @@ bool ChatView::event(QEvent *event)
         if (verticalScrollBar()->isVisible()) return true;
     }
 
-#if QT_VERSION >= 0x050000
     if (event->type() == QEvent::TouchEnd || event->type() == QEvent::TouchCancel) {
-#else
-    if (event->type() == QEvent::TouchEnd) {
-#endif
         // End scroll and reset settings to default
         setDragMode(QGraphicsView::NoDrag);
         setInteractive(true);
@@ -149,11 +141,7 @@ bool ChatView::event(QEvent *event)
         }
         // Applying the movement happens automatically by the drag-mode
     }
-#if QT_VERSION >= 0x050000
-    if (event->type() == QEvent::Wheel || (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->device()->type()==QTouchDevice::TouchScreen) || event->type() == QEvent::TouchUpdate) {
-#else
-    if (event->type() == QEvent::Wheel || (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->deviceType()==QTouchEvent::TouchScreen) || event->type() == QEvent::TouchUpdate) {
-#endif
+    if (event->type() == QEvent::Wheel || (event->type() == QEvent::TouchBegin && ((QTouchEvent*)event)->device()->type() == QTouchDevice::TouchScreen) || event->type() == QEvent::TouchUpdate) {
         if (!verticalScrollBar()->isVisible()) {
             scene()->requestBacklog();
             return true;
@@ -306,7 +294,7 @@ QSet<ChatLine *> ChatView::visibleChatLines(Qt::ItemSelectionMode mode) const
 {
     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);
     }
@@ -325,11 +313,11 @@ QList<ChatLine *> ChatView::visibleChatLinesSorted(Qt::ItemSelectionMode mode) c
 ChatLine *ChatView::lastVisibleChatLine(bool ignoreDayChange) const
 {
     if (!scene())
-        return 0;
+        return nullptr;
 
     QAbstractItemModel *model = scene()->model();
     if (!model || model->rowCount() == 0)
-        return 0;
+        return nullptr;
 
     int row = -1;
 
@@ -342,7 +330,7 @@ ChatLine *ChatView::lastVisibleChatLine(bool ignoreDayChange) const
     if (row >= 0)
         return scene()->chatLine(row);
 
-    return 0;
+    return nullptr;
 }
 
 
@@ -381,7 +369,7 @@ void ChatView::jumpToMarkerLine(bool requestBacklog)
 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();