Remove DialogButtonBox::flat

The Material Design allows mixing standard flat buttons with non-flat
custom buttons. It is enough that the delegate provides flat standard
buttons by default. It is better to not force all buttons to be flat,
but let the user freely specify whether custom buttons are flat.

This API has not yet been released, so it is still safe to remove.

Change-Id: Iec400553ccefb47f20fb98d64919491d9bb27cbe
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

3 files changed, 0 insertions, 39 deletions

diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp
index bc05bd7a..2f2ab479 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox.cpp
+++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp
@@ -142,7 +142,6 @@ static QPlatformDialogHelper::ButtonRole buttonRole(QQuickAbstractButton *button
 }
 
 QQuickDialogButtonBoxPrivate::QQuickDialogButtonBoxPrivate() :
-    flat(false),
     alignment(0),
     position(QQuickDialogButtonBox::Footer),
     standardButtons(QPlatformDialogHelper::NoButton),
@@ -358,36 +357,6 @@ QQuickDialogButtonBox::~QQuickDialogButtonBox()
 {
 }
 
-/*!
-    \qmlproperty bool QtQuick.Controls::DialogButtonBox::flat
-
-    This property holds whether the buttons in the button box are flat.
-
-    The default value is \c false.
-
-    \sa Button::flat
-*/
-bool QQuickDialogButtonBox::isFlat() const
-{
-    Q_D(const QQuickDialogButtonBox);
-    return d->flat;
-}
-
-void QQuickDialogButtonBox::setFlat(bool flat)
-{
-    Q_D(QQuickDialogButtonBox);
-    if (flat == d->flat)
-        return;
-
-    for (int i = 0; i < count(); ++i) {
-        QQuickButton *button = qobject_cast<QQuickButton *>(itemAt(i));
-        if (button)
-            button->setFlat(flat);
-    }
-
-    d->flat = flat;
-    emit flatChanged();
-}
 
 /*!
     \qmlproperty enumeration QtQuick.Controls::DialogButtonBox::position
@@ -604,8 +573,6 @@ void QQuickDialogButtonBox::itemAdded(int index, QQuickItem *item)
     Q_UNUSED(index);
     if (QQuickAbstractButton *button = qobject_cast<QQuickAbstractButton *>(item))
         QObjectPrivate::connect(button, &QQuickAbstractButton::clicked, d, &QQuickDialogButtonBoxPrivate::handleClick);
-    if (QQuickButton *button = qobject_cast<QQuickButton *>(item))
-        button->setFlat(d->flat);
     if (QQuickDialogButtonBoxAttached *attached = qobject_cast<QQuickDialogButtonBoxAttached *>(qmlAttachedPropertiesObject<QQuickDialogButtonBox>(item, false)))
         QQuickDialogButtonBoxAttachedPrivate::get(attached)->setButtonBox(this);
     if (isComponentComplete())
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p.h
index 633cf577..445b645b 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox_p.h
+++ b/src/quicktemplates2/qquickdialogbuttonbox_p.h
@@ -62,7 +62,6 @@ class QQuickDialogButtonBoxAttachedPrivate;
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialogButtonBox : public QQuickContainer
 {
     Q_OBJECT
-    Q_PROPERTY(bool flat READ isFlat WRITE setFlat NOTIFY flatChanged FINAL)
     Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)
     Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment RESET resetAlignment NOTIFY alignmentChanged FINAL)
     Q_PROPERTY(QPlatformDialogHelper::StandardButtons standardButtons READ standardButtons WRITE setStandardButtons NOTIFY standardButtonsChanged FINAL)
@@ -73,9 +72,6 @@ public:
     explicit QQuickDialogButtonBox(QQuickItem *parent = nullptr);
     ~QQuickDialogButtonBox();
 
-    bool isFlat() const;
-    void setFlat(bool flat);
-
     enum Position {
         Header,
         Footer
@@ -104,7 +100,6 @@ Q_SIGNALS:
     void helpRequested();
     void clicked(QQuickAbstractButton *button);
 
-    void flatChanged();
     void positionChanged();
     void alignmentChanged();
     void standardButtonsChanged();
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h
index b40fb75a..d25bd90a 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h
+++ b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h
@@ -75,7 +75,6 @@ public:
     QQuickAbstractButton *createStandardButton(QPlatformDialogHelper::StandardButton button);
     void removeStandardButtons();
 
-    bool flat;
     Qt::Alignment alignment;
     QQuickDialogButtonBox::Position position;
     QPlatformDialogHelper::StandardButtons standardButtons;