Cleanup corelib autotests

Remove redundant empty constructors, destructors and test functions.

Change-Id: Idb51368895e67ec3fc0345a9a5d33d77730c051b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

28 files changed, 14 insertions, 572 deletions

diff --git a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
index 72e5729ee9..1723c25d59 100644
--- a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 
 #include <iostream>
@@ -59,16 +58,7 @@ using namespace std;
 
 class tst_QAlgorithms : public QObject
 {
-Q_OBJECT
-
-public:
-    tst_QAlgorithms();
-    ~tst_QAlgorithms();
-
-public slots:
-    void init();
-    void cleanup();
-
+    Q_OBJECT
 private slots:
     void test_qLowerBound_data();
     void test_qLowerBound();
@@ -96,23 +86,6 @@ private:
 #endif
 };
 
-tst_QAlgorithms::tst_QAlgorithms()
-{
-}
-
-tst_QAlgorithms::~tst_QAlgorithms()
-{
-}
-
-void tst_QAlgorithms::init()
-{
-}
-
-void tst_QAlgorithms::cleanup()
-{
-}
-
-
 class TestInt
 {
 public:
diff --git a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
index 83fcfccd21..81c6736abd 100644
--- a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
+++ b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <QtCore/QBuffer>
 #include <QtCore/QDataStream>
@@ -71,16 +70,7 @@ static QBitArray QStringToQBitArray(const QString &str)
 
 class tst_QBitArray : public QObject
 {
-Q_OBJECT
-
-public:
-    tst_QBitArray();
-    virtual ~tst_QBitArray();
-
-
-public slots:
-    void init();
-    void cleanup();
+    Q_OBJECT
 private slots:
     void size_data();
     void size();
@@ -115,27 +105,6 @@ private slots:
 
 Q_DECLARE_METATYPE(QBitArray)
 
-tst_QBitArray::tst_QBitArray()
-{
-}
-
-tst_QBitArray::~tst_QBitArray()
-{
-
-}
-
-void tst_QBitArray::init()
-{
-// TODO: Add initialization code here.
-// This will be executed immediately before each test is run.
-}
-
-void tst_QBitArray::cleanup()
-{
-// TODO: Add cleanup code here.
-// This will be executed immediately after each test is run.
-}
-
 void tst_QBitArray::size_data()
 {
     //create the testtable instance and define the elements
diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
index 05bc7399a0..90d24d487a 100644
--- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 
 #include <qbytearray.h>
@@ -59,13 +58,6 @@ class tst_QByteArray : public QObject
 
 public:
     tst_QByteArray();
-    virtual ~tst_QByteArray();
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
 private slots:
     void swap();
     void qCompress_data();
@@ -154,26 +146,6 @@ tst_QByteArray::tst_QByteArray()
     qRegisterMetaType<qulonglong>("qulonglong");
 }
 
-tst_QByteArray::~tst_QByteArray()
-{
-}
-
-void tst_QByteArray::initTestCase()
-{
-}
-
-void tst_QByteArray::cleanupTestCase()
-{
-}
-
-void tst_QByteArray::init()
-{
-}
-
-void tst_QByteArray::cleanup()
-{
-}
-
 void tst_QByteArray::qCompress_data()
 {
     QTest::addColumn<QByteArray>("ba");
diff --git a/tests/auto/corelib/tools/qcache/tst_qcache.cpp b/tests/auto/corelib/tools/qcache/tst_qcache.cpp
index 2c1f256313..cc00fe3fa5 100644
--- a/tests/auto/corelib/tools/qcache/tst_qcache.cpp
+++ b/tests/auto/corelib/tools/qcache/tst_qcache.cpp
@@ -49,11 +49,6 @@
 class tst_QCache : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QCache();
-    virtual ~tst_QCache();
-
 public slots:
     void initTestCase();
     void cleanupTestCase();
@@ -82,14 +77,6 @@ struct Foo {
 
 int Foo::count = 0;
 
-tst_QCache::tst_QCache()
-{
-}
-
-tst_QCache::~tst_QCache()
-{
-}
-
 void tst_QCache::initTestCase()
 {
     Foo::count = 0;
diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
index a89250ca33..839103415f 100644
--- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qchar.h>
 #include <qfile.h>
@@ -49,23 +48,13 @@
 #include <qcoreapplication.h>
 #endif
 
-
-
 //TESTED_CLASS=
 //TESTED_FILES=
 
 class tst_QChar : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QChar();
-    ~tst_QChar();
-
-
 public slots:
-    void initTestCase();
-    void cleanupTestCase();
     void init();
     void cleanup();
 private slots:
@@ -104,20 +93,8 @@ private:
 #endif
 };
 
-tst_QChar::tst_QChar()
-{}
-
-tst_QChar::~tst_QChar()
-{ }
-
-void tst_QChar::initTestCase()
-{ }
-
-void tst_QChar::cleanupTestCase()
-{ }
-
 void tst_QChar::init()
-{ 
+{
 #if defined(Q_OS_WINCE)
     int argc = 0;
     app = new QCoreApplication(argc, NULL);
diff --git a/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp b/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
index 96731f7d78..c96b26bdfb 100644
--- a/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
+++ b/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
@@ -50,9 +50,6 @@
 class tst_QContiguousCache : public QObject
 {
     Q_OBJECT
-public:
-    tst_QContiguousCache() {}
-    virtual ~tst_QContiguousCache() {}
 private slots:
     void empty();
     void swap();
diff --git a/tests/auto/corelib/tools/qdate/tst_qdate.cpp b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
index b1e0f33ba6..3aa7d03d81 100644
--- a/tests/auto/corelib/tools/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qdatetime.h>
 #include <qlocale.h>
@@ -49,15 +48,7 @@
 
 class tst_QDate : public QObject
 {
-Q_OBJECT
-
-public:
-    tst_QDate();
-    virtual ~tst_QDate();
-
-public slots:
-    void init();
-    void cleanup();
+    Q_OBJECT
 private slots:
     void toString();
     void isValid_data();
@@ -104,27 +95,6 @@ private slots:
 
 Q_DECLARE_METATYPE(QDate)
 
-tst_QDate::tst_QDate()
-{
-}
-
-tst_QDate::~tst_QDate()
-{
-
-}
-
-void tst_QDate::init()
-{
-// This will be executed immediately before each test is run.
-// TODO: Add initialization code here.
-}
-
-void tst_QDate::cleanup()
-{
-// This will be executed immediately after each test is run.
-// TODO: Add cleanup code here.
-}
-
 void tst_QDate::isValid_data()
 {
     QTest::addColumn<int>("year");
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index 13b2938027..1bea54f2ec 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #ifndef Q_OS_WINCE
 #include <time.h>
@@ -61,13 +60,11 @@ class tst_QDateTime : public QObject
 
 public:
     tst_QDateTime();
-    virtual ~tst_QDateTime();
 
     static QString str( int y, int month, int d, int h, int min, int s );
     static QDateTime dt( const QString& str );
 public slots:
     void init();
-    void cleanup();
 private slots:
     void ctor();
     void operator_eq();
@@ -162,23 +159,13 @@ tst_QDateTime::tst_QDateTime()
     europeanTimeZone = (x1 == 631148400 && x2 == 644191200);
 }
 
-tst_QDateTime::~tst_QDateTime()
-{
-
-}
-
 void tst_QDateTime::init()
 {
 #if defined(Q_OS_WINCE)
-	SetUserDefaultLCID(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT));
+    SetUserDefaultLCID(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT));
 #elif defined(Q_OS_WIN)
     SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT));
 #endif
-
-}
-
-void tst_QDateTime::cleanup()
-{
 }
 
 QString tst_QDateTime::str( int y, int month, int d, int h, int min, int s )
diff --git a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
index 851a9d463c..107f9769b1 100644
--- a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
+++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 
 #include <qeasingcurve.h>
@@ -47,17 +46,9 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
-class tst_QEasingCurve : public QObject {
-  Q_OBJECT
-
-public:
-    tst_QEasingCurve();
-    virtual ~tst_QEasingCurve();
-
-public Q_SLOTS:
-    void init();
-    void cleanup();
-
+class tst_QEasingCurve : public QObject
+{
+    Q_OBJECT
 private slots:
     void type();
     void propertyDefaults();
@@ -67,27 +58,8 @@ private slots:
     void operators();
     void properties();
     void metaTypes();
-
-protected:
 };
 
-tst_QEasingCurve::tst_QEasingCurve()
-{
-}
-
-tst_QEasingCurve::~tst_QEasingCurve()
-{
-}
-
-void tst_QEasingCurve::init()
-{
-}
-
-void tst_QEasingCurve::cleanup()
-{
-}
-#include <qdebug.h>
-
 void tst_QEasingCurve::type()
 {
     {
diff --git a/tests/auto/corelib/tools/qhash/tst_qhash.cpp b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
index 277171124c..843216faec 100644
--- a/tests/auto/corelib/tools/qhash/tst_qhash.cpp
+++ b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
@@ -50,11 +50,6 @@
 class tst_QHash : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QHash();
-    virtual ~tst_QHash() {}
-
 private slots:
     void insert1();
     void erase();
@@ -92,9 +87,6 @@ struct Foo {
     int data[8];
 };
 
-tst_QHash::tst_QHash()
-{}
-
 int Foo::count = 0;
 
 //copied from tst_QMap.cpp
diff --git a/tests/auto/corelib/tools/qline/tst_qline.cpp b/tests/auto/corelib/tools/qline/tst_qline.cpp
index de47506ae3..8451cc631a 100644
--- a/tests/auto/corelib/tools/qline/tst_qline.cpp
+++ b/tests/auto/corelib/tools/qline/tst_qline.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qline.h>
 #include <math.h>
@@ -53,11 +52,7 @@
 
 class tst_QLine : public QObject
 {
-Q_OBJECT
-
-public:
-    tst_QLine();
-
+    Q_OBJECT
 private slots:
     void testIntersection();
     void testIntersection_data();
@@ -90,11 +85,6 @@ private slots:
 
 const qreal epsilon = sizeof(qreal) == sizeof(double) ? 1e-8 : 1e-4;
 
-tst_QLine::tst_QLine()
-
-{
-}
-
 void tst_QLine::testSet()
 {
     {
diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
index e6e8466aa2..04d6c6a14a 100644
--- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp
+++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
@@ -44,7 +44,6 @@
 #include <QtTest/QtTest>
 #include <QDebug>
 
-
 #include <qmap.h>
 
 //TESTED_CLASS=
@@ -53,10 +52,6 @@
 class tst_QMap : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QMap();
-
 public slots:
     void init();
 private slots:
@@ -84,10 +79,6 @@ private slots:
     void const_shared_null();
 };
 
-tst_QMap::tst_QMap()
-{
-}
-
 typedef QMap<QString, QString> StringMap;
 
 class MyClass
diff --git a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
index cb0dd2d67d..b7affac7af 100644
--- a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
+++ b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
@@ -50,15 +50,6 @@ Q_DECLARE_METATYPE(QMargins)
 class tst_QMargins : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QMargins();
-    virtual ~tst_QMargins();
-
-
-public slots:
-    void init();
-    void cleanup();
 private slots:
     void getSetCheck();
     void dataStreamCheck();
@@ -112,23 +103,5 @@ void tst_QMargins::dataStreamCheck()
     }
 }
 
-tst_QMargins::tst_QMargins()
-{
-}
-
-tst_QMargins::~tst_QMargins()
-{
-}
-
-void tst_QMargins::init()
-{
-}
-
-void tst_QMargins::cleanup()
-{
-}
-
-
-
 QTEST_APPLESS_MAIN(tst_QMargins)
 #include "tst_qmargins.moc"
diff --git a/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp b/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
index c4b5339a3b..1c6117d299 100644
--- a/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
+++ b/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 
 #include <qcoreapplication.h>
@@ -51,12 +50,7 @@
 
 class tst_QPoint : public QObject
 {
-Q_OBJECT
-
-public:
-    tst_QPoint();
-    virtual ~tst_QPoint();
-
+    Q_OBJECT
 private slots:
     void getSetCheck();
     void division();
@@ -64,16 +58,6 @@ private slots:
     void manhattanLength();
 };
 
-tst_QPoint::tst_QPoint()
-{
-}
-
-tst_QPoint::~tst_QPoint()
-{
-}
-
-
-
 void tst_QPoint::manhattanLength()
 {
     {
diff --git a/tests/auto/corelib/tools/qrect/tst_qrect.cpp b/tests/auto/corelib/tools/qrect/tst_qrect.cpp
index fe3be33255..56db459c29 100644
--- a/tests/auto/corelib/tools/qrect/tst_qrect.cpp
+++ b/tests/auto/corelib/tools/qrect/tst_qrect.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qrect.h>
 #include <limits.h>
@@ -72,17 +71,10 @@ public:
 	NegXQPoint, NegYQPoint, RandomQPoint
     };
 
-    tst_QRect();
-    virtual ~tst_QRect();
-
-
     static QRect getQRectCase( QRectCases c );
     static int getIntCase( IntCases i );
     static QPoint getQPointCase( QPointCases p );
 
-public slots:
-    void init();
-    void cleanup();
 private slots:
     void isNull_data();
     void isNull();
@@ -215,23 +207,6 @@ private slots:
 #define LARGE 1000000000
 static bool isLarge(int x) { return x > LARGE || x < -LARGE; }
 
-
-tst_QRect::tst_QRect()
-{
-}
-
-tst_QRect::~tst_QRect()
-{
-}
-
-void tst_QRect::init()
-{
-}
-
-void tst_QRect::cleanup()
-{
-}
-
 QRect tst_QRect::getQRectCase( QRectCases c )
 {
     // Should return the best variety of possible QRects, if a
diff --git a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
index 13b020023c..244d637fa4 100644
--- a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
+++ b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qregexp.h>
 
@@ -51,15 +50,6 @@ const int N = 1;
 class tst_QRegExp : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QRegExp();
-    virtual ~tst_QRegExp();
-
-
-public slots:
-    void init();
-    void cleanup();
 private slots:
     void getSetCheck();
     void indexIn_data();
@@ -125,14 +115,6 @@ void tst_QRegExp::getSetCheck()
 
 extern const char email[];
 
-tst_QRegExp::tst_QRegExp()
-{
-}
-
-tst_QRegExp::~tst_QRegExp()
-{
-}
-
 void tst_QRegExp::lastIndexIn_data()
 {
     indexIn_data();
@@ -518,15 +500,6 @@ void tst_QRegExp::indexIn_addMoreRows(const QByteArray &stri)
 			        << QStringList();
 }
 
-
-void tst_QRegExp::init()
-{
-}
-
-void tst_QRegExp::cleanup()
-{
-}
-
 /*
 void tst_QRegExp::isEmpty()
 {
diff --git a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
index 0ca360fda7..ea90b2236d 100644
--- a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
+++ b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
@@ -46,13 +46,6 @@
 class tst_QRingBuffer : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QRingBuffer();
-    virtual ~tst_QRingBuffer();
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
 private slots:
     void readPointerAtPositionWriteRead();
     void readPointerAtPositionEmptyRead();
@@ -63,22 +56,6 @@ private slots:
     void sizeWhenReserved();
 };
 
-tst_QRingBuffer::tst_QRingBuffer()
-{
-}
-
-tst_QRingBuffer::~tst_QRingBuffer()
-{
-}
-
-void tst_QRingBuffer::initTestCase()
-{
-}
-
-void tst_QRingBuffer::cleanupTestCase()
-{
-}
-
 void tst_QRingBuffer::sizeWhenReserved()
 {
     QRingBuffer ringBuffer;
diff --git a/tests/auto/corelib/tools/qsize/tst_qsize.cpp b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
index ae9426c568..da636a3747 100644
--- a/tests/auto/corelib/tools/qsize/tst_qsize.cpp
+++ b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qsize.h>
 
@@ -51,15 +50,6 @@ Q_DECLARE_METATYPE(QSize)
 class tst_QSize : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QSize();
-    virtual ~tst_QSize();
-
-
-public slots:
-    void init();
-    void cleanup();
 private slots:
     void getSetCheck();
     void scale();
@@ -112,23 +102,6 @@ void tst_QSize::getSetCheck()
     QCOMPARE(1.1, obj2.height());
 }
 
-
-tst_QSize::tst_QSize()
-{
-}
-
-tst_QSize::~tst_QSize()
-{
-}
-
-void tst_QSize::init()
-{
-}
-
-void tst_QSize::cleanup()
-{
-}
-
 void tst_QSize::scale()
 {
     QSize t1( 10, 12 );
diff --git a/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
index 9a40abccf4..936df75366 100644
--- a/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
+++ b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qsize.h>
 
@@ -48,17 +47,9 @@ Q_DECLARE_METATYPE(QSizeF)
 //TESTED_CLASS=
 //TESTED_FILES=corelib/tools/qsize.h corelib/tools/qsize.cpp
 
-class tst_QSizeF : public QObject {
+class tst_QSizeF : public QObject
+{
     Q_OBJECT
-
-public:
-    tst_QSizeF();
-    virtual ~tst_QSizeF();
-
-public slots:
-    void init();
-    void cleanup();
-
 private slots:
     void scale();
 
@@ -72,18 +63,6 @@ private slots:
     void transpose();
 };
 
-tst_QSizeF::tst_QSizeF() {
-}
-
-tst_QSizeF::~tst_QSizeF() {
-}
-
-void tst_QSizeF::init() {
-}
-
-void tst_QSizeF::cleanup() {
-}
-
 void tst_QSizeF::scale() {
     QSizeF t1(10.4, 12.8);
     t1.scale(60.6, 60.6, Qt::IgnoreAspectRatio);
diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
index 0bf1c8607a..3922e482c8 100644
--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qregexp.h>
 #include <qtextcodec.h>
@@ -67,11 +66,7 @@ class tst_QString : public QObject
 
 public:
     tst_QString();
-    virtual ~tst_QString();
-
-
 public slots:
-    void init();
     void cleanup();
 private slots:
 #if !defined(Q_CC_HPACC) && !defined(QT_NO_STL)
@@ -319,14 +314,6 @@ tst_QString::tst_QString()
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("ISO 8859-1"));
 }
 
-tst_QString::~tst_QString()
-{
-}
-
-void tst_QString::init()
-{
-}
-
 void tst_QString::cleanup()
 {
     QLocale::setDefault(QString("C"));
diff --git a/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp b/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
index 250badb231..08485e87e0 100644
--- a/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
+++ b/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
@@ -39,29 +39,16 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qregexp.h>
 #include <qstringlist.h>
 
-
-
-
-
 //TESTED_CLASS=
 //TESTED_FILES=
 
 class tst_QStringList : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QStringList();
-    virtual ~tst_QStringList();
-
-public slots:
-    void init();
-    void cleanup();
 private slots:
     void filter();
     void replaceInStrings();
@@ -86,22 +73,6 @@ private slots:
 
 extern const char email[];
 
-tst_QStringList::tst_QStringList()
-{
-}
-
-tst_QStringList::~tst_QStringList()
-{
-}
-
-void tst_QStringList::init()
-{
-}
-
-void tst_QStringList::cleanup()
-{
-}
-
 void tst_QStringList::indexOf_regExp()
 {
     QStringList list;
diff --git a/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp b/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp
index 9dade954f8..e8f36c4840 100644
--- a/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp
+++ b/tests/auto/corelib/tools/qstringmatcher/tst_qstringmatcher.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qstringmatcher.h>
 
@@ -48,7 +47,6 @@ class tst_QStringMatcher : public QObject
     Q_OBJECT
 
 private slots:
-    void qstringmatcher_data();
     void qstringmatcher();
     void caseSensitivity();
     void indexIn_data();
@@ -64,10 +62,6 @@ class SubQStringMatcher : public QStringMatcher
 public:
 };
 
-void tst_QStringMatcher::qstringmatcher_data()
-{
-}
-
 void tst_QStringMatcher::qstringmatcher()
 {
     SubQStringMatcher matcher;
diff --git a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
index d5284caeb2..7b0009fc6e 100644
--- a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
@@ -51,18 +51,10 @@ Q_DECLARE_METATYPE(qlonglong)
 //TESTED_CLASS=
 //TESTED_FILES=
 
-
 class tst_QStringRef : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QStringRef();
-    virtual ~tst_QStringRef();
-
-
 public slots:
-    void init();
     void cleanup();
 private slots:
     void endsWith();
@@ -167,18 +159,6 @@ static inline double nan()
 #   define NAN (::nan())
 #endif
 
-tst_QStringRef::tst_QStringRef()
-{
-}
-
-tst_QStringRef::~tst_QStringRef()
-{
-}
-
-void tst_QStringRef::init()
-{
-}
-
 void tst_QStringRef::cleanup()
 {
     QLocale::setDefault(QString(QLatin1Char('C')));
diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index 75955591c1..a649824a61 100644
--- a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 
 #include <qtextboundaryfinder.h>
@@ -52,15 +51,8 @@
 class tst_QTextBoundaryFinder : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QTextBoundaryFinder();
-    virtual ~tst_QTextBoundaryFinder();
-
-
 public slots:
     void init();
-    void cleanup();
 private slots:
     void graphemeBoundaries();
     void wordBoundaries();
@@ -74,14 +66,6 @@ private slots:
     void toPreviousBoundary();
 };
 
-tst_QTextBoundaryFinder::tst_QTextBoundaryFinder()
-{
-}
-
-tst_QTextBoundaryFinder::~tst_QTextBoundaryFinder()
-{
-}
-
 void tst_QTextBoundaryFinder::init()
 {
 #ifndef Q_OS_IRIX
@@ -89,10 +73,6 @@ void tst_QTextBoundaryFinder::init()
 #endif
 }
 
-void tst_QTextBoundaryFinder::cleanup()
-{
-}
-
 void tst_QTextBoundaryFinder::graphemeBoundaries()
 {
     QFile file("data/GraphemeBreakTest.txt");
diff --git a/tests/auto/corelib/tools/qtime/tst_qtime.cpp b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
index e528ead7ca..cde953efb8 100644
--- a/tests/auto/corelib/tools/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include "qdatetime.h"
 
@@ -49,17 +48,6 @@
 class tst_QTime : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QTime();
-    virtual ~tst_QTime();
-
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
 private slots:
     void toStringLocale();
     void toString();
@@ -94,37 +82,6 @@ private slots:
 
 Q_DECLARE_METATYPE(QTime)
 
-tst_QTime::tst_QTime()
-{
-}
-
-tst_QTime::~tst_QTime()
-{
-
-}
-
-// initTestCase will be executed once before the first testfunction is executed.
-void tst_QTime::initTestCase()
-{
-}
-
-// cleanupTestCase will be executed once after the last testfunction is executed.
-void tst_QTime::cleanupTestCase()
-{
-}
-
-// init() will be executed immediately before each testfunction is run.
-void tst_QTime::init()
-{
-// TODO: Add testfunction specific initialization code here.
-}
-
-// cleanup() will be executed immediately after each testfunction is run.
-void tst_QTime::cleanup()
-{
-// TODO: Add testfunction specific cleanup code here.
-}
-
 void tst_QTime::addSecs_data()
 {
     QTest::addColumn<QTime>("t1");
diff --git a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
index 176688b809..f3a4f11216 100644
--- a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
+++ b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 
 #include <qtimeline.h>
@@ -47,17 +46,9 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
-class tst_QTimeLine : public QObject {
+class tst_QTimeLine : public QObject
+{
   Q_OBJECT
-
-public:
-    tst_QTimeLine();
-    virtual ~tst_QTimeLine();
-
-public Q_SLOTS:
-    void init();
-    void cleanup();
-
 private slots:
     void range();
     void currentTime();
@@ -91,23 +82,6 @@ protected:
     QTimeLine * view;
 };
 
-tst_QTimeLine::tst_QTimeLine()
-{
-}
-
-tst_QTimeLine::~tst_QTimeLine()
-{
-}
-
-void tst_QTimeLine::init()
-{
-}
-
-void tst_QTimeLine::cleanup()
-{
-}
-#include <qdebug.h>
-
 void tst_QTimeLine::range()
 {
 #ifdef Q_OS_WINCE //On WinCE timer resolution is bad - using longer times instead
diff --git a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
index 73ff971945..d10094c78e 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qvarlengtharray.h>
 #include <qvariant.h>
@@ -52,11 +51,6 @@ const int N = 1;
 class tst_QVarLengthArray : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QVarLengthArray() {}
-    virtual ~tst_QVarLengthArray() {}
-
 private slots:
     void append();
     void removeLast();
diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 59ff332a1e..490b836f3d 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-
 #include <QtTest/QtTest>
 #include <qvector.h>
 
@@ -49,11 +48,6 @@
 class tst_QVector : public QObject
 {
     Q_OBJECT
-
-public:
-    tst_QVector() {}
-    virtual ~tst_QVector() {}
-
 private slots:
     void constructors() const;
     void append() const;