summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/kernel
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-12-03 16:59:30 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-12-10 05:26:05 +0000
commit1289bc8172a6829884a670a2f91ee863add5d042 (patch)
treeac72a4da3d5b84d1c2fa09582a1f545ce4bae15b /tests/auto/gui/kernel
parent872b9b231ef966ce7b2b40785ee92a0d4a8d2851 (diff)
Tests: Remove empty init/cleanup slots, constructors and destructors.
Move some code (like registrations of meta types) from init() to initTestCase() in the process. Change-Id: I57db5156647cfadab554fbed853b2e68b2815f3b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'tests/auto/gui/kernel')
-rw-r--r--tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp10
-rw-r--r--tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp21
-rw-r--r--tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp26
3 files changed, 1 insertions, 56 deletions
diff --git a/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp b/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp
index d21569dcc0..0257a50924 100644
--- a/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp
+++ b/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp
@@ -44,20 +44,10 @@ class tst_NoQtEventLoop : public QObject
Q_OBJECT
private slots:
- void initTestCase();
- void cleanup();
void consumeMouseEvents();
};
-void tst_NoQtEventLoop::initTestCase()
-{
-}
-
-void tst_NoQtEventLoop::cleanup()
-{
-}
-
class Window : public QWindow
{
public:
diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
index e6aa579ecd..e44f9c7da2 100644
--- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
+++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
@@ -75,16 +75,10 @@ class tst_QMouseEvent : public QObject
{
Q_OBJECT
-public:
- tst_QMouseEvent();
- virtual ~tst_QMouseEvent();
-
-
public slots:
void initTestCase();
void cleanupTestCase();
void init();
- void cleanup();
private slots:
void checkMousePressEvent_data();
void checkMousePressEvent();
@@ -95,17 +89,6 @@ private:
MouseEventWidget* testMouseWidget;
};
-
-
-tst_QMouseEvent::tst_QMouseEvent()
-{
-}
-
-tst_QMouseEvent::~tst_QMouseEvent()
-{
-
-}
-
void tst_QMouseEvent::initTestCase()
{
testMouseWidget = new MouseEventWidget(0);
@@ -129,10 +112,6 @@ void tst_QMouseEvent::init()
testMouseWidget->mouseReleaseModifiers = 0;
}
-void tst_QMouseEvent::cleanup()
-{
-}
-
void tst_QMouseEvent::checkMousePressEvent_data()
{
QTest::addColumn<int>("buttonPressed");
diff --git a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
index 4fae6fa096..ecf7a6a248 100644
--- a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
+++ b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
@@ -51,17 +51,9 @@ class tst_qmouseevent_modal : public QObject
{
Q_OBJECT
-public:
- tst_qmouseevent_modal();
- virtual ~tst_qmouseevent_modal();
-
-
-public slots:
+private slots:
void initTestCase();
void cleanupTestCase();
- void init();
- void cleanup();
-private slots:
void mousePressRelease();
private:
@@ -97,14 +89,6 @@ private:
int c;
};
-tst_qmouseevent_modal::tst_qmouseevent_modal()
-{
-}
-
-tst_qmouseevent_modal::~tst_qmouseevent_modal()
-{
-}
-
void tst_qmouseevent_modal::initTestCase()
{
w = new TstWidget;
@@ -117,14 +101,6 @@ void tst_qmouseevent_modal::cleanupTestCase()
w = 0;
}
-void tst_qmouseevent_modal::init()
-{
-}
-
-void tst_qmouseevent_modal::cleanup()
-{
-}
-
/*
Test for task 22500
*/