sigproxy: Don't expose the thread_local '_current' attribute

[quassel.git] / src / uisupport / bufferview.h

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index feb48a1..47a519f 100644 (file)
--- 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();
 
@@ -85,11 +85,7 @@ protected:
     virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
     virtual void contextMenuEvent(QContextMenuEvent *event);
 
-#if QT_VERSION < 0x050000
-    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-#else
     virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
-#endif
 
 private slots:
     void joinChannel(const QModelIndex &index);
@@ -135,12 +131,12 @@ private:
         WasActive = 0x02
     };
     QHash<NetworkId, short> _expandedState;
-    QModelIndex m_currentHighlight;
+    QModelIndex _currentHighlight;
 };
 
 
 // ******************************
-//  BufferViewDelgate
+//  BufferViewDelegate
 // ******************************
 
 class BufferViewDelegate : public QStyledItemDelegate
@@ -151,11 +147,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;
 };