diff options
Diffstat (limited to 'src/widgets/dialogs/qmessagebox.cpp')
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index fdfffb45cf..190ce93439 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -98,7 +98,7 @@ public: public: TextEdit(QWidget *parent=0) : QTextEdit(parent) { } #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent * e) Q_DECL_OVERRIDE + void contextMenuEvent(QContextMenuEvent * e) override { QMenu *menu = createStandardContextMenu(); menu->setAttribute(Qt::WA_DeleteOnClose); @@ -173,7 +173,7 @@ public: void setLabel(DetailButtonLabel lbl) { setText(label(lbl)); } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { ensurePolished(); QStyleOptionButton opt; @@ -259,9 +259,9 @@ public: QByteArray signalToDisconnectOnClose; QSharedPointer<QMessageDialogOptions> options; private: - void initHelper(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - void helperPrepareShow(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) Q_DECL_OVERRIDE; + void initHelper(QPlatformDialogHelper *) override; + void helperPrepareShow(QPlatformDialogHelper *) override; + void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) override; }; void QMessageBoxPrivate::init(const QString &title, const QString &text) @@ -2608,7 +2608,7 @@ QPixmap QMessageBoxPrivate::standardIcon(QMessageBox::Icon icon, QMessageBox *mb break; } if (!tmpIcon.isNull()) { - QWindow *window = Q_NULLPTR; + QWindow *window = nullptr; if (mb) { window = mb->windowHandle(); if (!window) { |