From fa388f4a5986ae243d9d50ea26b320cb76619377 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Fri, 20 Jan 2017 13:53:35 +0100
Subject: Move QQuickScrollBar(Attached)Private to a private header

To make the private classes accessible for the upcoming ScrollView.

Change-Id: Iae1d7f9b136a99ac5892418c52071a902e665476
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/quicktemplates2/qquickscrollbar.cpp | 93 +++++++--------------------------
 1 file changed, 19 insertions(+), 74 deletions(-)

(limited to 'src/quicktemplates2/qquickscrollbar.cpp')

diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index ea3a71dd..d2d9a194 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
@@ -35,11 +35,10 @@
 ****************************************************************************/
 
 #include "qquickscrollbar_p.h"
-#include "qquickcontrol_p_p.h"
+#include "qquickscrollbar_p_p.h"
 
 #include <QtQml/qqmlinfo.h>
 #include <QtQuick/private/qquickflickable_p.h>
-#include <QtQuick/private/qquickitemchangelistener_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -155,51 +154,19 @@ static const QQuickItemPrivate::ChangeTypes changeTypes = QQuickItemPrivate::Geo
 static const QQuickItemPrivate::ChangeTypes horizontalChangeTypes = changeTypes | QQuickItemPrivate::ImplicitHeight;
 static const QQuickItemPrivate::ChangeTypes verticalChangeTypes = changeTypes | QQuickItemPrivate::ImplicitWidth;
 
-class QQuickScrollBarPrivate : public QQuickControlPrivate
-{
-    Q_DECLARE_PUBLIC(QQuickScrollBar)
-
-public:
-    QQuickScrollBarPrivate()
-        : size(0),
-          position(0),
-          stepSize(0),
-          offset(0),
-          active(false),
-          pressed(false),
-          moving(false),
-          interactive(true),
-          orientation(Qt::Vertical),
-          snapMode(QQuickScrollBar::NoSnap)
-    {
-    }
-
-    static QQuickScrollBarPrivate *get(QQuickScrollBar *bar)
-    {
-        return bar->d_func();
-    }
-
-    qreal snapPosition(qreal position) const;
-    qreal positionAt(const QPointF &point) const;
-    void updateActive();
-    void resizeContent() override;
-
-    void handlePress(const QPointF &point);
-    void handleMove(const QPointF &point);
-    void handleRelease(const QPointF &point);
-    void handleUngrab();
-
-    qreal size;
-    qreal position;
-    qreal stepSize;
-    qreal offset;
-    bool active;
-    bool pressed;
-    bool moving;
-    bool interactive;
-    Qt::Orientation orientation;
-    QQuickScrollBar::SnapMode snapMode;
-};
+QQuickScrollBarPrivate::QQuickScrollBarPrivate()
+    : size(0),
+      position(0),
+      stepSize(0),
+      offset(0),
+      active(false),
+      pressed(false),
+      moving(false),
+      interactive(true),
+      orientation(Qt::Vertical),
+      snapMode(QQuickScrollBar::NoSnap)
+{
+}
 
 qreal QQuickScrollBarPrivate::snapPosition(qreal position) const
 {
@@ -603,34 +570,12 @@ QAccessible::Role QQuickScrollBar::accessibleRole() const
 }
 #endif
 
-class QQuickScrollBarAttachedPrivate : public QObjectPrivate, public QQuickItemChangeListener
+QQuickScrollBarAttachedPrivate::QQuickScrollBarAttachedPrivate()
+    : flickable(nullptr),
+      horizontal(nullptr),
+      vertical(nullptr)
 {
-public:
-    QQuickScrollBarAttachedPrivate()
-        : flickable(nullptr),
-          horizontal(nullptr),
-          vertical(nullptr)
-    {
-    }
-
-    void activateHorizontal();
-    void activateVertical();
-    void scrollHorizontal();
-    void scrollVertical();
-    void mirrorVertical();
-
-    void layoutHorizontal(bool move = true);
-    void layoutVertical(bool move = true);
-
-    void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) override;
-    void itemImplicitWidthChanged(QQuickItem *item) override;
-    void itemImplicitHeightChanged(QQuickItem *item) override;
-    void itemDestroyed(QQuickItem *item) override;
-
-    QQuickFlickable *flickable;
-    QQuickScrollBar *horizontal;
-    QQuickScrollBar *vertical;
-};
+}
 
 void QQuickScrollBarAttachedPrivate::activateHorizontal()
 {
-- 
cgit v1.2.3