summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/painting
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/painting
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/painting')
-rw-r--r--tests/auto/gui/painting/qpainter/tst_qpainter.cpp19
-rw-r--r--tests/auto/gui/painting/qtransform/tst_qtransform.cpp26
-rw-r--r--tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp27
3 files changed, 1 insertions, 71 deletions
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 1571053d7e..266b1c2896 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -81,14 +81,9 @@ Q_OBJECT
public:
tst_QPainter();
- virtual ~tst_QPainter();
-
-public slots:
- void init();
- void cleanup();
- void cleanupTestCase();
private slots:
+ void cleanupTestCase();
void getSetCheck();
#ifndef QT_NO_WIDGETS
void drawPixmap_comp_data();
@@ -392,18 +387,6 @@ tst_QPainter::tst_QPainter()
QGuiApplication::setDesktopSettingsAware(true);
}
-tst_QPainter::~tst_QPainter()
-{
-}
-
-void tst_QPainter::init()
-{
-}
-
-void tst_QPainter::cleanup()
-{
-}
-
void tst_QPainter::cleanupTestCase()
{
QFile::remove(QLatin1String("dest.png"));
diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
index 60b89aa6ab..fa6a11022d 100644
--- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
+++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
@@ -43,14 +43,6 @@ class tst_QTransform : public QObject
{
Q_OBJECT
-public:
- tst_QTransform();
- virtual ~tst_QTransform();
-
-
-public slots:
- void init();
- void cleanup();
private slots:
void mapRect_data();
void mapToPolygon_data();
@@ -80,24 +72,6 @@ private:
Q_DECLARE_METATYPE(QTransform)
-tst_QTransform::tst_QTransform()
-{
-}
-
-tst_QTransform::~tst_QTransform()
-{
-}
-
-void tst_QTransform::init()
-{
- // No initialisation is required
-}
-
-void tst_QTransform::cleanup()
-{
- // No cleanup is required.
-}
-
#if defined(Q_OS_WIN) && !defined(M_PI)
#define M_PI 3.14159265897932384626433832795f
#endif
diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
index c4c4789b7a..9d87bddbe7 100644
--- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
+++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
@@ -42,14 +42,6 @@ class tst_QWMatrix : public QObject
{
Q_OBJECT
-public:
- tst_QWMatrix();
- virtual ~tst_QWMatrix();
-
-
-public slots:
- void init();
- void cleanup();
private slots:
void mapRect_data();
void mapToPolygon_data();
@@ -65,25 +57,6 @@ private:
void mapping_data();
};
-
-tst_QWMatrix::tst_QWMatrix()
-{
-}
-
-tst_QWMatrix::~tst_QWMatrix()
-{
-}
-
-void tst_QWMatrix::init()
-{
- // No initialisation is required
-}
-
-void tst_QWMatrix::cleanup()
-{
- // No cleanup is required.
-}
-
void tst_QWMatrix::mapRect_data()
{
mapping_data();