diff options
author | Berthold Krevert <berthold.krevert@basyskom.com> | 2014-01-16 19:13:16 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-20 10:07:18 +0100 |
commit | a5669568904b37b1d6b297e7190d18306e198604 (patch) | |
tree | ffff0a8e862e4d6b10b2710b5351c0a65fd2cb64 | |
parent | ed7115ffde52c57a308199c3d279ea3c96668117 (diff) |
Remove redundant button clicked handler in QQuickMessageBox
Change c286b4fccb2d83fcc01b21913b95c5e4f21f2982 added the
QQuickAbstractMessageDialog::click() handler, which made the
QQuickMessageDialog::clicked() handler redundant.
Change-Id: Ifd770a3c67b35fd9a4929fc55b9e5298c36fb960
Task-number: QTBUG-35933
Reviewed-by: Liang Qi <liang.qi@digia.com>
-rw-r--r-- | src/imports/dialogs/qquickmessagedialog.cpp | 48 | ||||
-rw-r--r-- | src/imports/dialogs/qquickmessagedialog_p.h | 1 |
2 files changed, 0 insertions, 49 deletions
diff --git a/src/imports/dialogs/qquickmessagedialog.cpp b/src/imports/dialogs/qquickmessagedialog.cpp index 43b6ca09b4..5346aeeda8 100644 --- a/src/imports/dialogs/qquickmessagedialog.cpp +++ b/src/imports/dialogs/qquickmessagedialog.cpp @@ -93,7 +93,6 @@ QT_BEGIN_NAMESPACE QQuickMessageDialog::QQuickMessageDialog(QObject *parent) : QQuickAbstractMessageDialog(parent) { - connect(this, SIGNAL(buttonClicked()), this, SLOT(clicked())); } @@ -117,53 +116,6 @@ QQuickMessageDialog::~QQuickMessageDialog() \l Window or an \l Item. */ - -void QQuickMessageDialog::clicked() { - switch (m_clickedButton) { - // This mapping from buttons to roles is the same as - // documented for enum QMessageBox::StandardButton - case Ok: - case Open: - case Save: - case SaveAll: - case Retry: - case Ignore: - accept(); - break; - case Cancel: - case Close: - case Abort: - reject(); - break; - case Discard: - emit discard(); - close(); - break; - case Help: - emit help(); - break; - case Yes: - case YesToAll: - emit yes(); - close(); - break; - case No: - case NoToAll: - emit no(); - close(); - break; - case Apply: - emit apply(); - break; - case Reset: - case RestoreDefaults: - emit reset(); - break; - default: - qWarning("StandardButton %d has no role", m_clickedButton); - } -} - void QQuickMessageDialog::accept() { // enter key is treated like OK if (m_clickedButton == NoButton) diff --git a/src/imports/dialogs/qquickmessagedialog_p.h b/src/imports/dialogs/qquickmessagedialog_p.h index b21d8cba42..99c59ecca1 100644 --- a/src/imports/dialogs/qquickmessagedialog_p.h +++ b/src/imports/dialogs/qquickmessagedialog_p.h @@ -73,7 +73,6 @@ protected: protected Q_SLOTS: virtual void accept(); virtual void reject(); - void clicked(); private: Q_DISABLE_COPY(QQuickMessageDialog) |