From ccb1306902e00b67f4593307c61d64be57134f31 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Fri, 16 Nov 2018 20:04:01 +0100
Subject: [PATCH 1/1] Minor cleanup of BufferView

Fix some nitpicks.
---
 src/uisupport/bufferview.cpp | 26 +++++++++++++-------------
 src/uisupport/bufferview.h   | 14 ++++++++------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 5ac201b9..9bf7a524 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -594,7 +594,7 @@ void BufferView::hideCurrentBuffer()
     config()->requestRemoveBuffer(bufferId);
 }
 
-void BufferView::filterTextChanged(QString filterString)
+void BufferView::filterTextChanged(const QString& filterString)
 {
     BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
     if (!filter) {
@@ -624,15 +624,15 @@ QSize BufferView::sizeHint() const
 }
 
 
-void BufferView::changeHighlight(const BufferView::Direction direction)
+void BufferView::changeHighlight(BufferView::Direction direction)
 {
     // If for some weird reason we get a new delegate
-    BufferViewDelegate *delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(m_currentHighlight));
+    BufferViewDelegate *delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(_currentHighlight));
     if (delegate) {
         delegate->currentHighlight = QModelIndex();
     }
 
-    QModelIndex newIndex = m_currentHighlight;
+    QModelIndex newIndex = _currentHighlight;
     if (!newIndex.isValid()) {
         newIndex = model()->index(0, 0);
     }
@@ -647,20 +647,20 @@ void BufferView::changeHighlight(const BufferView::Direction direction)
         return;
     }
 
-    m_currentHighlight = newIndex;
+    _currentHighlight = newIndex;
 
-    delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(m_currentHighlight));
+    delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(_currentHighlight));
     if (delegate) {
-        delegate->currentHighlight = m_currentHighlight;
+        delegate->currentHighlight = _currentHighlight;
     }
     viewport()->update();
 }
 
 void BufferView::selectHighlighted()
 {
-    if (m_currentHighlight.isValid()) {
-        selectionModel()->setCurrentIndex(m_currentHighlight, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-        selectionModel()->select(m_currentHighlight, QItemSelectionModel::ClearAndSelect);
+    if (_currentHighlight.isValid()) {
+        selectionModel()->setCurrentIndex(_currentHighlight, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+        selectionModel()->select(_currentHighlight, QItemSelectionModel::ClearAndSelect);
     } else {
         selectFirstBuffer();
     }
@@ -671,16 +671,16 @@ void BufferView::selectHighlighted()
 void BufferView::clearHighlight()
 {
     // If for some weird reason we get a new delegate
-    BufferViewDelegate *delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(m_currentHighlight));
+    BufferViewDelegate *delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(_currentHighlight));
     if (delegate) {
         delegate->currentHighlight = QModelIndex();
     }
-    m_currentHighlight = QModelIndex();
+    _currentHighlight = QModelIndex();
     viewport()->update();
 }
 
 // ****************************************
-//  BufferViewDelgate
+//  BufferViewDelegate
 // ****************************************
 class ColorsChangedEvent : public QEvent
 {
diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index feb48a11..2a32eb2c 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -68,8 +68,8 @@ public slots:
     void nextBuffer();
     void previousBuffer();
     void hideCurrentBuffer();
-    void filterTextChanged(QString filterString);
-    void changeHighlight(const Direction direction);
+    void filterTextChanged(const QString& filterString);
+    void changeHighlight(Direction direction);
     void selectHighlighted();
     void clearHighlight();
 
@@ -135,12 +135,12 @@ private:
         WasActive = 0x02
     };
     QHash<NetworkId, short> _expandedState;
-    QModelIndex m_currentHighlight;
+    QModelIndex _currentHighlight;
 };
 
 
 // ******************************
-//  BufferViewDelgate
+//  BufferViewDelegate
 // ******************************
 
 class BufferViewDelegate : public QStyledItemDelegate
@@ -151,11 +151,13 @@ public:
     BufferViewDelegate(QObject *parent = 0);
     bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override;
 
-    QModelIndex currentHighlight;
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
+public:
+    QModelIndex currentHighlight;
+
 protected:
-    virtual void customEvent(QEvent *event) override;
+    void customEvent(QEvent *event) override;
 };
 
 
-- 
2.20.1