diff options
Diffstat (limited to 'tests/auto/widgets/dialogs')
4 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index d704d212dd..7e246b5366 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -243,7 +243,7 @@ void tst_QDialog::showMaximized() dialog.showMaximized(); QVERIFY(dialog.isMaximized()); QVERIFY(dialog.isVisible()); -#if QT_CONFIG(sizegrip) && !defined(Q_OS_DARWIN) && !defined(Q_OS_IRIX) && !defined(Q_OS_HPUX) +#if QT_CONFIG(sizegrip) && !defined(Q_OS_DARWIN) && !defined(Q_OS_HPUX) QVERIFY(!sizeGrip->isVisible()); #endif diff --git a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp index 62286d703f..259de49c67 100644 --- a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp +++ b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp @@ -338,7 +338,7 @@ class SelfDestructParent : public QWidget Q_OBJECT public: explicit SelfDestructParent(int delay = 100) - : QWidget(Q_NULLPTR) + : QWidget(nullptr) { QTimer::singleShot(delay, this, SLOT(deleteLater())); } diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index 6a16e48394..a5058f4b6c 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -134,10 +134,10 @@ class ExecCloseHelper : public QObject public: enum { CloseWindow = -1 }; - explicit ExecCloseHelper(QObject *parent = Q_NULLPTR) - : QObject(parent), m_key(0), m_timerId(0), m_testCandidate(Q_NULLPTR) { } + explicit ExecCloseHelper(QObject *parent = nullptr) + : QObject(parent), m_key(0), m_timerId(0), m_testCandidate(nullptr) { } - void start(int key, QWidget *testCandidate = Q_NULLPTR) + void start(int key, QWidget *testCandidate = nullptr) { m_key = key; m_testCandidate = testCandidate; @@ -147,7 +147,7 @@ public: bool done() const { return !m_timerId; } protected: - void timerEvent(QTimerEvent *te) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *te) override; private: int m_key; @@ -172,7 +172,7 @@ void ExecCloseHelper::timerEvent(QTimerEvent *te) QKeyEvent *ke = new QKeyEvent(QEvent::KeyPress, m_key, Qt::NoModifier); QCoreApplication::postEvent(m_testCandidate, ke); } - m_testCandidate = Q_NULLPTR; + m_testCandidate = nullptr; killTimer(m_timerId); m_timerId = m_key = 0; } diff --git a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp index 44b7894c53..00d640e55e 100644 --- a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp +++ b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp @@ -255,10 +255,10 @@ class QTestTranslator : public QTranslator public: explicit QTestTranslator(QString str) : m_str(qMove(str)) {} - QString translate(const char *, const char *sourceText, const char *, int) const Q_DECL_OVERRIDE + QString translate(const char *, const char *sourceText, const char *, int) const override { return m_str + sourceText + m_str; } - bool isEmpty() const Q_DECL_OVERRIDE { return false; } + bool isEmpty() const override { return false; } }; template <typename Translator> |