Some cleanups

Closes GH-187.

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index c6e6209..7da0847 100644 (file)
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -113,7 +113,7 @@ bool ChatView::event(QEvent *event)
         // Enable scrolling by draging, disable selecting/clicking content
         setDragMode(QGraphicsView::ScrollHandDrag);
         setInteractive(false);
-        // if scrollbar is not visible we need to request backlog below else we need to accept 
+        // if scrollbar is not visible we need to request backlog below else we need to accept
         // the event now (return true) so that we will receive TouchUpdate and TouchEnd/TouchCancel
         if (verticalScrollBar()->isVisible()) return true;
     }
@@ -135,8 +135,8 @@ bool ChatView::event(QEvent *event)
             // After the first movement of a Touch-Point, calculate the distance in both axis
             // and if the point moved more horizontally abort scroll.
             QTouchEvent::TouchPoint p = ((QTouchEvent*)event)->touchPoints().at(0);
-            double dx = abs (p.lastPos().x() - p.pos().x());
-            double dy = abs (p.lastPos().y() - p.pos().y());
+            double dx = qAbs(p.lastPos().x() - p.pos().x());
+            double dy = qAbs(p.lastPos().y() - p.pos().y());
             if (dx > dy) {
                 setDragMode(QGraphicsView::NoDrag);
                 setInteractive(true);

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 4971e36..444f018 100644 (file)
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -26,14 +26,13 @@
 #include <QDockWidget>
 #include <QModelIndex>
 #include <QStyledItemDelegate>
-#include <QTreeView>
 #include <QPointer>
 
 #include "actioncollection.h"
 #include "bufferviewconfig.h"
 #include "networkmodel.h"
-#include "types.h"
 #include "treeviewtouch.h"
+#include "types.h"
 
 /*****************************************
  * The TreeView showing the Buffers

diff --git a/src/uisupport/treeviewtouch.cpp b/src/uisupport/treeviewtouch.cpp
index 13db59d..0ef3b36 100644 (file)
--- a/src/uisupport/treeviewtouch.cpp
+++ b/src/uisupport/treeviewtouch.cpp
@@ -1,27 +1,29 @@
 /***************************************************************************
-*   Copyright (C) 2005-2015 by the Quassel Project                        *
-*   devel@quassel-irc.org                                                 *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) version 3.                                           *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU General Public License     *
-*   along with this program; if not, write to the                         *
-*   Free Software Foundation, Inc.,                                       *
-*   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
-***************************************************************************/
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) version 3.                                           *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
 #include "treeviewtouch.h"
 
-#include <QtCore>
-#include <QTouchEvent>
+#include <QEvent>
 #include <QScrollBar>
+#include <QTouchEvent>
+
 
 TreeViewTouch::TreeViewTouch(QWidget *parent)
     : QTreeView(parent)
@@ -29,6 +31,7 @@ TreeViewTouch::TreeViewTouch(QWidget *parent)
     setAttribute(Qt::WA_AcceptTouchEvents);
 }
 
+
 bool TreeViewTouch::event(QEvent *event) {
     if (event->type() == QEvent::TouchBegin) {
         // Register that we may be scrolling, set the scroll mode to scroll-per-pixel
@@ -43,8 +46,8 @@ bool TreeViewTouch::event(QEvent *event) {
         if (!_firstTouchUpdateHappened) {
             // After the first movement of a Touch-Point, calculate the distance in both axis
             // and if the point moved more horizontally abort scroll.
-            double dx = abs(p.lastPos().x() - p.pos().x());
-            double dy = abs(p.lastPos().y() - p.pos().y());
+            double dx = qAbs(p.lastPos().x() - p.pos().x());
+            double dy = qAbs(p.lastPos().y() - p.pos().y());
             if (dx > dy) {
                 _touchScrollInProgress = false;
             }
@@ -69,12 +72,14 @@ bool TreeViewTouch::event(QEvent *event) {
     return QTreeView::event(event);
 }
 
-void TreeViewTouch::mousePressEvent(QMouseEvent * event) {
+
+void TreeViewTouch::mousePressEvent(QMouseEvent *event) {
     if (!_touchScrollInProgress)
         QTreeView::mousePressEvent(event);
 }
 
-void TreeViewTouch::mouseMoveEvent(QMouseEvent * event) {
+
+void TreeViewTouch::mouseMoveEvent(QMouseEvent *event) {
     if (!_touchScrollInProgress)
         QTreeView::mouseMoveEvent(event);
 };

diff --git a/src/uisupport/treeviewtouch.h b/src/uisupport/treeviewtouch.h
index d7f9f1b..cd4e9a4 100644 (file)
--- a/src/uisupport/treeviewtouch.h
+++ b/src/uisupport/treeviewtouch.h
@@ -1,32 +1,31 @@
 /***************************************************************************
-*   Copyright (C) 2005-2015 by the Quassel Project                        *
-*   devel@quassel-irc.org                                                 *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) version 3.                                           *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU General Public License     *
-*   along with this program; if not, write to the                         *
-*   Free Software Foundation, Inc.,                                       *
-*   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
-***************************************************************************/
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) version 3.                                           *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
 
-#ifndef TREEVIEWTOUCH_H_
-#define TREEVIEWTOUCH_H_
+#pragma once
 
 #include <QTreeView>
+
 /**
 * This class handles Touch Events for TreeViews
 */
-class TreeViewTouch :
-    public QTreeView
+class TreeViewTouch : public QTreeView
 {
     Q_OBJECT
 
@@ -41,7 +40,7 @@ protected:
     * @param[in,out] an event
     * @returns true if event got handled, false if event got ignored
     */
-    virtual bool event(QEvent *event);
+    bool event(QEvent *event) override;
 
     /**
     * Handles Mouse Move Events
@@ -50,7 +49,7 @@ protected:
     *
     * @param[in,out] An Event
     */
-    virtual void mouseMoveEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event) override;
 
     /**
     * Handles Mouse Press Events
@@ -59,11 +58,9 @@ protected:
     *
     * @param[in,out] An Event
     */
-    virtual void mousePressEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event) override;
 
 private:
     bool _touchScrollInProgress = false;
     bool _firstTouchUpdateHappened = false;
 };
-
-#endif
\ No newline at end of file