Build with QT_NO_KEYWORDS

[dolphin.git] / src / kitemviews / kitemlistcontainer.h

diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h
index 55a9a118f142ad1db45eda9024118c64dfb74b09..9d96d2ce0cf5e0da36fb51ee755022907d504d26 100644 (file)
--- a/src/kitemviews/kitemlistcontainer.h
+++ b/src/kitemviews/kitemlistcontainer.h
@@ -1,29 +1,15 @@
-/***************************************************************************
- *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
- *                                                                         *
- *   Based on the Itemviews NG project from Trolltech Labs:                *
- *   http://qt.gitorious.org/qt-labs/itemviews-ng                          *
- *                                                                         *
- *   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) any later version.                                   *
- *                                                                         *
- *   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            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2011 Peter Penz <peter.penz19@gmail.com>
+ *
+ * Based on the Itemviews NG project from Trolltech Labs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #ifndef KITEMLISTCONTAINER_H
 #define KITEMLISTCONTAINER_H
 
-#include <libdolphin_export.h>
+#include "dolphin_export.h"
 
 #include <QAbstractScrollArea>
 
@@ -31,6 +17,7 @@ class KItemListController;
 class KItemListSmoothScroller;
 class KItemListView;
 class KItemModelBase;
+class QScroller;
 
 /**
  * @brief Provides a QWidget based scrolling view for a KItemListController.
@@ -39,7 +26,7 @@ class KItemModelBase;
  *
  * @see KItemListController
  */
-class LIBDOLPHINPRIVATE_EXPORT KItemListContainer : public QAbstractScrollArea
+class DOLPHIN_EXPORT KItemListContainer : public QAbstractScrollArea
 {
     Q_OBJECT
 
@@ -50,27 +37,28 @@ public:
      *                   (the parent will be set to the KItemListContainer).
      * @param parent     Optional parent widget.
      */
-    explicit KItemListContainer(KItemListController* controller, QWidget* parent = 0);
-    virtual ~KItemListContainer();
+    explicit KItemListContainer(KItemListController* controller, QWidget* parent = nullptr);
+    ~KItemListContainer() override;
     KItemListController* controller() const;
 
     void setEnabledFrame(bool enable);
     bool enabledFrame() const;
 
 protected:
-    virtual void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
-    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
-    virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
-    virtual void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE;
-    virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent* event) override;
+    void showEvent(QShowEvent* event) override;
+    void resizeEvent(QResizeEvent* event) override;
+    void scrollContentsBy(int dx, int dy) override;
+    void wheelEvent(QWheelEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous);
     void slotModelChanged(KItemModelBase* current, KItemModelBase* previous);
     void slotViewChanged(KItemListView* current, KItemListView* previous);
     void scrollTo(qreal offset);
     void updateScrollOffsetScrollBar();
     void updateItemOffsetScrollBar();
+    void stopScroller();
 
 private:
     void updateGeometries();
@@ -88,6 +76,7 @@ private:
 
     KItemListSmoothScroller* m_horizontalSmoothScroller;
     KItemListSmoothScroller* m_verticalSmoothScroller;
+    QScroller* m_scroller;
 };
 
 #endif