diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-10-26 20:25:20 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-12-13 13:41:28 +0100 |
| commit | 53b413f1c589d976bbc1eb0ad2cc526633e247db (patch) | |
| tree | 6b5482253fd4eb211892cabac3511ab5ea7a96fa /src/widgets | |
| parent | 24e4fb34cdabf1d1d1d25b79edac03740b274549 (diff) | |
Rename QMessageDialogOptions::Icon to StandardIcon
To clarify its use as a pre-defined standard icon, which is a separate
use-case from providing a user-defined QIcon.
Change-Id: I187ce2e5f125a7392b1279c9bd1e871790c8065f
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qerrormessage.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp index 2c36e535c7..a4cf132e7b 100644 --- a/src/widgets/dialogs/qerrormessage.cpp +++ b/src/widgets/dialogs/qerrormessage.cpp @@ -85,7 +85,7 @@ void QErrorMessagePrivate::helperPrepareShow(QPlatformDialogHelper *helper) options->setWindowTitle(q->windowTitle()); options->setText(QErrorMessage::tr("An error occurred")); options->setInformativeText(currentMessage); - options->setIcon(QMessageDialogOptions::Critical); + options->setStandardIcon(QMessageDialogOptions::Critical); options->setSupressionCheckBoxEnabled(true); messageDialogHelper->setOptions(options); } diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index e38826534a..cbe365b8fc 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -2683,7 +2683,7 @@ void QMessageBoxPrivate::initHelper(QPlatformDialogHelper *h) static_cast<QPlatformMessageDialogHelper *>(h)->setOptions(options); } -static QMessageDialogOptions::Icon helperIcon(QMessageBox::Icon i) +static QMessageDialogOptions::StandardIcon helperIcon(QMessageBox::Icon i) { switch (i) { case QMessageBox::NoIcon: @@ -2715,7 +2715,7 @@ void QMessageBoxPrivate::helperPrepareShow(QPlatformDialogHelper *) #if QT_CONFIG(textedit) options->setDetailedText(q->detailedText()); #endif - options->setIcon(helperIcon(q->icon())); + options->setStandardIcon(helperIcon(q->icon())); options->setIconPixmap(q->iconPixmap()); options->setStandardButtons(helperStandardButtons(q)); } diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 5d75ffd842..fc2099eddd 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -34,7 +34,7 @@ class Q_WIDGETS_EXPORT QMessageBox : public QDialog public: enum Icon { - // keep this in sync with QMessageDialogOptions::Icon + // keep this in sync with QMessageDialogOptions::StandardIcon NoIcon = 0, Information = 1, Warning = 2, |