diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-08-21 19:38:14 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-08-23 20:03:40 +0200 |
| commit | 46e9a9a3a1a8399adef2be2af683a0321e8bc86c (patch) | |
| tree | 951c0aec68db570c512fbd90382b3e61b9ab269a /src/dialogs/qquickdialog.cpp | |
| parent | 55077b4f6cd6281cf020fb301fdafd3fd6e02df4 (diff) | |
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>
Diffstat (limited to 'src/dialogs/qquickdialog.cpp')
| -rw-r--r-- | src/dialogs/qquickdialog.cpp | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp index 788c1e4c8..14c996f69 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) |