Dialog: do not emit signals twice when a button is clicked

buttonClicked() is public API, whereas click(button, role) is called
when a button is clicked.  So there is no need to have buttonClicked()
connect to anything internally.

Task-number: QTBUG-40613
Change-Id: I25872d532ba77b4d708a2c25b31b6064fd5da599
Reviewed-by: Liang Qi <liang.qi@digia.com>

2 files changed, 0 insertions, 33 deletions

diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp
index 788c1e4c..14c996f6 100644
--- a/src/dialogs/qquickdialog.cpp
+++ b/src/dialogs/qquickdialog.cpp
@@ -211,7 +211,6 @@ QT_BEGIN_NAMESPACE
 QQuickDialog::QQuickDialog(QObject *parent)
     : QQuickAbstractDialog(parent)
 {
-    connect(this, SIGNAL(buttonClicked()), this, SLOT(clicked()));
 }
 
 
@@ -371,37 +370,6 @@ void QQuickDialog::click(QQuickAbstractDialog::StandardButton button)
             QPlatformDialogHelper::buttonRole(static_cast<QPlatformDialogHelper::StandardButton>(button))));
 }
 
-void QQuickDialog::clicked() {
-    switch (QPlatformDialogHelper::buttonRole(static_cast<QPlatformDialogHelper::StandardButton>(m_clickedButton))) {
-    case QPlatformDialogHelper::AcceptRole:
-        accept();
-        break;
-    case QPlatformDialogHelper::RejectRole:
-        reject();
-        break;
-    case QPlatformDialogHelper::DestructiveRole:
-        emit discard();
-        break;
-    case QPlatformDialogHelper::HelpRole:
-        emit help();
-        break;
-    case QPlatformDialogHelper::YesRole:
-        emit yes();
-        break;
-    case QPlatformDialogHelper::NoRole:
-        emit no();
-        break;
-    case QPlatformDialogHelper::ApplyRole:
-        emit apply();
-        break;
-    case QPlatformDialogHelper::ResetRole:
-        emit reset();
-        break;
-    default:
-        qWarning("StandardButton %d has no role", m_clickedButton);
-    }
-}
-
 void QQuickDialog::accept() {
     // enter key is treated like OK
     if (m_clickedButton == NoButton)
diff --git a/src/dialogs/qquickdialog_p.h b/src/dialogs/qquickdialog_p.h
index d8b95234..5a04a83e 100644
--- a/src/dialogs/qquickdialog_p.h
+++ b/src/dialogs/qquickdialog_p.h
@@ -105,7 +105,6 @@ protected:
 protected Q_SLOTS:
     virtual void accept();
     virtual void reject();
-    void clicked();
 
 private:
     void updateStandardButtons();