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>

13 files changed, 21 insertions, 180 deletions

diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index 844a091495..320ca68f1a 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -50,13 +50,6 @@ class tst_QFont : public QObject
 {
 Q_OBJECT
 
-public:
-    tst_QFont();
-    virtual ~tst_QFont();
-
-public slots:
-    void init();
-    void cleanup();
 private slots:
     void getSetCheck();
     void exactMatch();
@@ -115,27 +108,6 @@ void tst_QFont::getSetCheck()
     QCOMPARE(QFont::StyleStrategy(QFont::OpenGLCompatible), obj1.styleStrategy());
 }
 
-tst_QFont::tst_QFont()
-{
-}
-
-tst_QFont::~tst_QFont()
-{
-
-}
-
-void tst_QFont::init()
-{
-// TODO: Add initialization code here.
-// This will be executed immediately before each test is run.
-}
-
-void tst_QFont::cleanup()
-{
-// TODO: Add cleanup code here.
-// This will be executed immediately after each test is run.
-}
-
 void tst_QFont::exactMatch()
 {
     QFont font;
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 5cc27f32b3..d142617666 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -46,13 +46,9 @@ Q_OBJECT
 
 public:
     tst_QFontDatabase();
-    virtual ~tst_QFontDatabase();
 
-public slots:
-    void initTestCase();
-    void init();
-    void cleanup();
 private slots:
+    void initTestCase();
     void styles_data();
     void styles();
 
@@ -82,28 +78,11 @@ tst_QFontDatabase::tst_QFontDatabase()
 {
 }
 
-tst_QFontDatabase::~tst_QFontDatabase()
-{
-
-}
-
 void tst_QFontDatabase::initTestCase()
 {
     QVERIFY(!m_testFont.isEmpty());
 }
 
-void tst_QFontDatabase::init()
-{
-// TODO: Add initialization code here.
-// This will be executed immediately before each test is run.
-}
-
-void tst_QFontDatabase::cleanup()
-{
-// TODO: Add cleanup code here.
-// This will be executed immediately after each test is run.
-}
-
 void tst_QFontDatabase::styles_data()
 {
     QTest::addColumn<QString>("font");
diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
index ec62bafd6c..f0a2b24873 100644
--- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
+++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
@@ -44,13 +44,6 @@ class tst_QFontMetrics : public QObject
 {
 Q_OBJECT
 
-public:
-    tst_QFontMetrics();
-    virtual ~tst_QFontMetrics();
-
-public slots:
-    void init();
-    void cleanup();
 private slots:
     void same();
     void metrics();
@@ -68,24 +61,6 @@ private slots:
     void leadingBelowLine();
 };
 
-tst_QFontMetrics::tst_QFontMetrics()
-
-{
-}
-
-tst_QFontMetrics::~tst_QFontMetrics()
-{
-
-}
-
-void tst_QFontMetrics::init()
-{
-}
-
-void tst_QFontMetrics::cleanup()
-{
-}
-
 void tst_QFontMetrics::same()
 {
     QFont font;
diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
index b8134291af..4992d6927b 100644
--- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
@@ -43,18 +43,22 @@
 
 // #define DEBUG_SAVE_IMAGE
 
+static inline QImage blankSquare()
+{
+    // a "blank" square; we compare against in our testfunctions to verify
+    // that we have actually painted something
+    QPixmap pm(1000, 1000);
+    pm.fill(Qt::white);
+    return pm.toImage();
+}
+
 class tst_QStaticText: public QObject
 {
     Q_OBJECT
 public:
-    tst_QStaticText() {}
+    tst_QStaticText() : m_whiteSquare(blankSquare()) {}
 
 private slots:
-    void initTestCase();
-
-    void init();
-    void cleanup();
-
     void constructionAndDestruction();
     void drawToPoint_data();
     void drawToPoint();
@@ -96,28 +100,11 @@ private slots:
 private:
     bool supportsTransformations() const;
 
-    QImage const    m_whiteSquare;
+    const QImage m_whiteSquare;
 };
 
 Q_DECLARE_METATYPE(QImage::Format);
 
-void tst_QStaticText::initTestCase()
-{
-    // a "blank" square; we compare against in our testfunctions to verify
-    // that we have actually painted something
-    QPixmap pm(1000, 1000);
-    pm.fill(Qt::white);
-    const_cast<QImage&>(m_whiteSquare) = pm.toImage();
-}
-
-void tst_QStaticText::init()
-{
-}
-
-void tst_QStaticText::cleanup()
-{
-}
-
 void tst_QStaticText::constructionAndDestruction()
 {
     QStaticText text("My text");
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
index 06448d11fe..a085d628d3 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
@@ -69,14 +69,10 @@ public:
 class tst_QSyntaxHighlighter : public QObject
 {
     Q_OBJECT
-public:
-    inline tst_QSyntaxHighlighter() {}
 
-public slots:
+private slots:
     void init();
     void cleanup();
-
-private slots:
     void basic();
     void basicTwo();
     void removeFormatsOnDelete();
diff --git a/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
index 49300871d9..3301b0b003 100644
--- a/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
+++ b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
@@ -48,14 +48,9 @@ class tst_QTextBlock : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QTextBlock();
-
-
-public slots:
+private slots:
     void init();
     void cleanup();
-private slots:
     void fragmentOverBlockBoundaries();
     void excludeParagraphSeparatorFragment();
     void backwardsBlockIterator();
@@ -67,9 +62,6 @@ private:
     QTextCursor cursor;
 };
 
-tst_QTextBlock::tst_QTextBlock()
-{}
-
 void tst_QTextBlock::init()
 {
     doc = new QTextDocument;
diff --git a/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
index 1ecc3f2eae..1e42fc4686 100644
--- a/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
+++ b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
@@ -51,14 +51,9 @@ class tst_QTextCursor : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QTextCursor();
-
-
-public slots:
+private slots:
     void init();
     void cleanup();
-private slots:
     void navigation1();
     void navigation2_data();
     void navigation2();
@@ -154,10 +149,6 @@ private:
     QTextCursor cursor;
 };
 
-
-tst_QTextCursor::tst_QTextCursor()
-{}
-
 void tst_QTextCursor::init()
 {
     doc = new QTextDocument;
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index ef96cda97d..3658a37ca7 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -64,13 +64,11 @@ class tst_QTextDocument : public QObject
 
 public:
     tst_QTextDocument();
-    virtual ~tst_QTextDocument();
 
-public slots:
+private slots:
     void init();
     void cleanup();
     void cleanupTestCase();
-private slots:
     void getSetCheck();
     void isEmpty();
     void find_data();
@@ -247,10 +245,6 @@ tst_QTextDocument::tst_QTextDocument()
     img.save("foo.png");
 }
 
-tst_QTextDocument::~tst_QTextDocument()
-{
-}
-
 void tst_QTextDocument::init()
 {
     doc = new QTextDocument;
diff --git a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
index f59f542a2b..1ae3462801 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
@@ -47,16 +47,11 @@
 class tst_QTextDocumentLayout : public QObject
 {
     Q_OBJECT
-public:
-    inline tst_QTextDocumentLayout() {}
-    virtual ~tst_QTextDocumentLayout() {}
 
-public slots:
+private slots:
     void init();
     void cleanup();
     void cleanupTestCase();
-
-private slots:
     void defaultPageSizeHandling();
     void idealWidth();
     void lineSeparatorFollowingTable();
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index 60ad5d32f5..4b99875f8f 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -59,13 +59,10 @@ class tst_QTextLayout : public QObject
 
 public:
     tst_QTextLayout();
-    virtual ~tst_QTextLayout();
 
-
-public slots:
+private slots:
     void init();
     void cleanup();
-private slots:
     void getSetCheck();
     void lineBreaking();
 #ifdef QT_BUILD_INTERNAL
@@ -199,10 +196,6 @@ tst_QTextLayout::tst_QTextLayout()
 #endif
 }
 
-tst_QTextLayout::~tst_QTextLayout()
-{
-}
-
 void tst_QTextLayout::init()
 {
     testFont = QFont();
diff --git a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
index 03e557d8dd..f73b4e1d93 100644
--- a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
+++ b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
@@ -45,14 +45,9 @@ class tst_QTextList : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QTextList();
-
-
-public slots:
+private slots:
     void init();
     void cleanup();
-private slots:
     void item();
     void autoNumbering();
     void autoNumberingRTL();
@@ -78,9 +73,6 @@ private:
     QTestDocumentLayout *layout;
 };
 
-tst_QTextList::tst_QTextList()
-{}
-
 void tst_QTextList::init()
 {
     doc = new QTextDocument();
diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
index 37b815c2e3..7c0962fcb6 100644
--- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -44,14 +44,9 @@ class tst_QTextScriptEngine : public QObject
 
 public:
     tst_QTextScriptEngine();
-    virtual ~tst_QTextScriptEngine();
 
-
-public slots:
-    void initTestCase();
-    void init();
-    void cleanup();
 private slots:
+    void initTestCase();
     void devanagari_data();
     void devanagari();
     void bengali_data();
@@ -97,10 +92,6 @@ tst_QTextScriptEngine::tst_QTextScriptEngine()
 {
 }
 
-tst_QTextScriptEngine::~tst_QTextScriptEngine()
-{
-}
-
 void tst_QTextScriptEngine::initTestCase()
 {
     if (!haveTestFonts) {
@@ -114,14 +105,6 @@ void tst_QTextScriptEngine::initTestCase()
     }
 }
 
-void tst_QTextScriptEngine::init()
-{
-}
-
-void tst_QTextScriptEngine::cleanup()
-{
-}
-
 struct ShapeTable {
     unsigned short unicode[16];
     unsigned short glyphs[16];
diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
index 1c099acc56..0ac0bf719c 100644
--- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
@@ -58,14 +58,9 @@ class tst_QTextTable : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QTextTable();
-
-
-public slots:
+private slots:
     void init();
     void cleanup();
-private slots:
     void cursorPositioning();
     void variousTableModifications();
     void tableShrinking();
@@ -115,9 +110,6 @@ private:
     QTextCursor cursor;
 };
 
-tst_QTextTable::tst_QTextTable()
-{}
-
 void tst_QTextTable::init()
 {
     doc = new QTextDocument;