Repurpose ExclusiveGroup to ButtonGroup

This is another way of solving the naming clash with Qt Quick Controls,
and narrows our focus to the types of controls that actually make sense
to have in an "exclusive" group; buttons (Android calls them
"selection controls").

Change-Id: Icf6efe583fe784c3594de8635be84bbf757a55cd
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/src/templates/qquickabstractbutton_p_p.h b/src/templates/qquickabstractbutton_p_p.h
index dfa87e7f..ed0a8d9d 100644
--- a/src/templates/qquickabstractbutton_p_p.h
+++ b/src/templates/qquickabstractbutton_p_p.h
@@ -48,12 +48,12 @@
 // We mean it.
 //
 
+#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
 #include <QtLabsTemplates/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractButton;
-class QQuickExclusiveGroup;
+class QQuickButtonGroup;
 
 class QQuickAbstractButtonPrivate : public QQuickControlPrivate
 {
@@ -62,11 +62,15 @@ class QQuickAbstractButtonPrivate : public QQuickControlPrivate
 public:
     QQuickAbstractButtonPrivate();
 
+    static QQuickAbstractButtonPrivate *get(QQuickAbstractButton *button)
+    {
+        return button->d_func();
+    }
+
     void startRepeatDelay();
     void startPressRepeat();
     void stopPressRepeat();
 
-    QQuickExclusiveGroup *exclusiveGroup() const;
     QQuickAbstractButton *findCheckedButton() const;
     QList<QQuickAbstractButton *> findExclusiveButtons() const;
 
@@ -82,6 +86,7 @@ public:
     Qt::MouseButton repeatButton;
     QQuickItem *label;
     QQuickItem *indicator;
+    QQuickButtonGroup *group;
 };
 
 Q_DECLARE_TYPEINFO(QQuickAbstractButtonPrivate, Q_COMPLEX_TYPE);