X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=4fff6021216078e5f0d09c0b33c2a0632e8ee9e4;hp=feb48a11b0a378f7c605e041d41df77f08bf1b35;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=5c4459d5df51a99bc6ee2e7389e3a7aec3f81091

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index feb48a11..4fff6021 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -18,8 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef BUFFERVIEW_H_
-#define BUFFERVIEW_H_
+#pragma once
+
+#include "uisupport-export.h"
 
 #include <QAction>
 #include <QMenu>
@@ -37,7 +38,7 @@
 /*****************************************
  * The TreeView showing the Buffers
  *****************************************/
-class BufferView : public TreeViewTouch
+class UISUPPORT_EXPORT BufferView : public TreeViewTouch
 {
     Q_OBJECT
 
@@ -47,10 +48,10 @@ public:
         Backward = -1
     };
 
-    BufferView(QWidget *parent = 0);
+    BufferView(QWidget *parent = nullptr);
     void init();
 
-    void setModel(QAbstractItemModel *model);
+    void setModel(QAbstractItemModel *model) override;
     void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config);
 
     void setConfig(BufferViewConfig *config);
@@ -68,8 +69,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();
 
@@ -78,18 +79,14 @@ signals:
     void removeBufferPermanently(const QModelIndex &);
 
 protected:
-    virtual void dropEvent(QDropEvent *event);
-    virtual void rowsInserted(const QModelIndex &parent, int start, int end);
-    virtual void wheelEvent(QWheelEvent *);
-    virtual QSize sizeHint() const;
-    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
+    void dropEvent(QDropEvent *event) override;
+    void rowsInserted(const QModelIndex &parent, int start, int end) override;
+    void wheelEvent(QWheelEvent *) override;
+    QSize sizeHint() const override;
+    void focusInEvent(QFocusEvent *event) override { QAbstractScrollArea::focusInEvent(event); }
+    void contextMenuEvent(QContextMenuEvent *event) override;
+
+    void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles) override;
 
 private slots:
     void joinChannel(const QModelIndex &index);
@@ -135,12 +132,12 @@ private:
         WasActive = 0x02
     };
     QHash<NetworkId, short> _expandedState;
-    QModelIndex m_currentHighlight;
+    QModelIndex _currentHighlight;
 };
 
 
 // ******************************
-//  BufferViewDelgate
+//  BufferViewDelegate
 // ******************************
 
 class BufferViewDelegate : public QStyledItemDelegate
@@ -148,21 +145,23 @@ class BufferViewDelegate : public QStyledItemDelegate
     Q_OBJECT
 
 public:
-    BufferViewDelegate(QObject *parent = 0);
+    BufferViewDelegate(QObject *parent = nullptr);
     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;
 };
 
 
 // ==============================
 //  BufferView Dock
 // ==============================
-class BufferViewDock : public QDockWidget
+class UISUPPORT_EXPORT BufferViewDock : public QDockWidget
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ isActive WRITE setActive STORED true)
@@ -184,8 +183,8 @@ public slots:
     void setActive(bool active = true);
 
 protected slots:
-    virtual bool eventFilter(QObject *object, QEvent *event);
-    virtual void focusInEvent(QFocusEvent*event) { qDebug() << event; }
+    bool eventFilter(QObject *object, QEvent *event) override;
+    void focusInEvent(QFocusEvent*event) override { qDebug() << event; }
 
 private slots:
     void bufferViewRenamed(const QString &newName);
@@ -201,6 +200,3 @@ private:
     bool _active;
     QString _title;
 };
-
-
-#endif