summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/kernel/qapplication/modal
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets/kernel/qapplication/modal')
-rw-r--r--tests/auto/widgets/kernel/qapplication/modal/base.cpp4
-rw-r--r--tests/auto/widgets/kernel/qapplication/modal/base.h8
-rw-r--r--tests/auto/widgets/kernel/qapplication/modal/main.cpp5
3 files changed, 6 insertions, 11 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/modal/base.cpp b/tests/auto/widgets/kernel/qapplication/modal/base.cpp
index 19f8abebbd..249d402f2e 100644
--- a/tests/auto/widgets/kernel/qapplication/modal/base.cpp
+++ b/tests/auto/widgets/kernel/qapplication/modal/base.cpp
@@ -32,9 +32,8 @@ base::base(QWidget *parent) :
QWidget(parent)
{
m_timer = new QTimer(this);
- m_modalStarted = false;
m_timer->setSingleShot(false);
- connect(m_timer, SIGNAL(timeout()), this, SLOT(periodicTimer()));
+ connect(m_timer, &QTimer::timeout, this, &base::periodicTimer);
m_timer->start(5000);
}
@@ -43,6 +42,7 @@ void base::periodicTimer()
if(m_modalStarted)
exit(0);
m_modalDialog = new QDialog(this);
+ m_modalDialog->setWindowTitle(QLatin1String("modal"));
m_modalDialog->setModal(true);
m_modalDialog->show();
m_modalStarted = true;
diff --git a/tests/auto/widgets/kernel/qapplication/modal/base.h b/tests/auto/widgets/kernel/qapplication/modal/base.h
index 95eb427e61..153d9ca420 100644
--- a/tests/auto/widgets/kernel/qapplication/modal/base.h
+++ b/tests/auto/widgets/kernel/qapplication/modal/base.h
@@ -37,12 +37,10 @@ class base : public QWidget
{
Q_OBJECT
QTimer *m_timer;
- bool m_modalStarted;
- QDialog *m_modalDialog;
+ bool m_modalStarted = false;
+ QDialog *m_modalDialog = nullptr;
public:
- explicit base(QWidget *parent = 0);
-
-signals:
+ explicit base(QWidget *parent = nullptr);
public slots:
void periodicTimer();
diff --git a/tests/auto/widgets/kernel/qapplication/modal/main.cpp b/tests/auto/widgets/kernel/qapplication/modal/main.cpp
index 400792637f..9dcb6732fa 100644
--- a/tests/auto/widgets/kernel/qapplication/modal/main.cpp
+++ b/tests/auto/widgets/kernel/qapplication/modal/main.cpp
@@ -26,8 +26,6 @@
**
****************************************************************************/
-#include <QtGui>
-
#include <QApplication>
#include "base.h"
@@ -35,7 +33,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
QApplication::setAttribute(Qt::AA_NativeWindows); //QTBUG-15774
- base *b = new base();
- Q_UNUSED(b);
+ base b;
return app.exec();
}