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>

11 files changed, 10 insertions, 216 deletions

diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index 894058b41a..0a80450766 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
@@ -51,14 +51,10 @@ class tst_QColumnView : public QObject {
 
 public:
     tst_QColumnView();
-    virtual ~tst_QColumnView();
 
-public Q_SLOTS:
+private slots:
     void initTestCase();
     void init();
-    void cleanup();
-
-private slots:
     void rootIndex();
     void grips();
     void isIndexHidden();
@@ -183,10 +179,6 @@ tst_QColumnView::tst_QColumnView()
     m_fakeDirHomeIndex = m_fakeDirModel.indexFromItem(homeItem);
 }
 
-tst_QColumnView::~tst_QColumnView()
-{
-}
-
 void tst_QColumnView::initTestCase()
 {
     QVERIFY(m_fakeDirHomeIndex.isValid());
@@ -201,10 +193,6 @@ void tst_QColumnView::init()
 #endif
 }
 
-void tst_QColumnView::cleanup()
-{
-}
-
 void tst_QColumnView::rootIndex()
 {
     ColumnView view;
diff --git a/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp
index fba83a24c7..11463dd79d 100644
--- a/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp
+++ b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp
@@ -40,12 +40,6 @@ class tst_QFileIconProvider : public QObject
 {
     Q_OBJECT
 
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
 private slots:
     void qfileiconprovider_data();
     void qfileiconprovider();
@@ -69,29 +63,6 @@ public:
 
 };
 
-// This will be called before the first test function is executed.
-// It is only called once.
-void tst_QFileIconProvider::initTestCase()
-{
-}
-
-// This will be called after the last test function is executed.
-// It is only called once.
-void tst_QFileIconProvider::cleanupTestCase()
-{
-}
-
-// This will be called before each test function is executed.
-void tst_QFileIconProvider::init()
-{
-}
-
-// This will be called after every test function.
-void tst_QFileIconProvider::cleanup()
-{
-}
-
-
 void tst_QFileIconProvider::qfileiconprovider_data()
 {
 }
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index 34cd9a55fc..bdb12c52f0 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -106,15 +106,12 @@ class tst_QHeaderView : public QObject
 
 public:
     tst_QHeaderView();
-    virtual ~tst_QHeaderView();
 
-public slots:
+private slots:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
-
-private slots:
     void getSetCheck();
     void visualIndex();
 
@@ -383,10 +380,6 @@ tst_QHeaderView::tst_QHeaderView()
     qRegisterMetaType<int>("Qt::SortOrder");
 }
 
-tst_QHeaderView::~tst_QHeaderView()
-{
-}
-
 void tst_QHeaderView::initTestCase()
 {
 #ifdef Q_OS_WINCE //disable magic for WindowsCE
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index 25f27cb0c7..91f72cbe85 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -189,15 +189,7 @@ class tst_QItemDelegate : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QItemDelegate();
-    virtual ~tst_QItemDelegate();
-
 private slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
     void getSetCheck();
     void textRectangle_data();
     void textRectangle();
@@ -255,30 +247,6 @@ void tst_QItemDelegate::getSetCheck()
     QCOMPARE(obj1.hasClipping(), true);
 }
 
-tst_QItemDelegate::tst_QItemDelegate()
-{
-}
-
-tst_QItemDelegate::~tst_QItemDelegate()
-{
-}
-
-void tst_QItemDelegate::initTestCase()
-{
-}
-
-void tst_QItemDelegate::cleanupTestCase()
-{
-}
-
-void tst_QItemDelegate::init()
-{
-}
-
-void tst_QItemDelegate::cleanup()
-{
-}
-
 void tst_QItemDelegate::textRectangle_data()
 {
     QFont font;
diff --git a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
index 64919581c3..401ad1346e 100644
--- a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
+++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
@@ -90,15 +90,10 @@ class tst_QItemView : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QItemView() {};
-    virtual ~tst_QItemView() {};
-
-public slots:
+private slots:
     void init();
     void cleanup();
 
-private slots:
     void nonDestructiveBasicTest_data();
     void nonDestructiveBasicTest();
 
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index 6540c544cc..eb4dc94a05 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -87,17 +87,9 @@ class tst_QListView : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QListView();
-    virtual ~tst_QListView();
-
-
-public slots:
+private slots:
     void initTestCase();
-    void cleanupTestCase();
-    void init();
     void cleanup();
-private slots:
     void getSetCheck();
     void noDelegate();
     void noModel();
@@ -292,24 +284,8 @@ public:
     mutable bool wrongIndex;
 };
 
-tst_QListView::tst_QListView()
-{
-}
-
-tst_QListView::~tst_QListView()
-{
-}
-
 void tst_QListView::initTestCase()
 {
-}
-
-void tst_QListView::cleanupTestCase()
-{
-}
-
-void tst_QListView::init()
-{
 #ifdef Q_OS_WINCE //disable magic for WindowsCE
     qApp->setAutoMaximizeThreshold(-1);
 #endif
@@ -320,7 +296,6 @@ void tst_QListView::cleanup()
     QVERIFY(QApplication::topLevelWidgets().isEmpty());
 }
 
-
 void tst_QListView::noDelegate()
 {
     QtTestModel model(0);
diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index 7b5fd34f44..443fa34659 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -46,7 +46,6 @@ class tst_QListWidget : public QObject
 
 public:
     tst_QListWidget();
-    ~tst_QListWidget();
 
     enum ModelChanged {
         RowsAboutToBeInserted,
@@ -59,13 +58,10 @@ public:
         ColumnsRemoved
     };
 
-public slots:
+private slots:
     void initTestCase();
     void cleanupTestCase();
     void init();
-    void cleanup();
-
-private slots:
     void addItem();
     void addItem2();
     void addItems();
@@ -162,10 +158,6 @@ tst_QListWidget::tst_QListWidget(): testWidget(0), rcParent(8), rcFirst(8,0), rc
 {
 }
 
-tst_QListWidget::~tst_QListWidget()
-{
-}
-
 void tst_QListWidget::initTestCase()
 {
     testWidget = new QListWidget();
@@ -210,10 +202,6 @@ void tst_QListWidget::checkDefaultValues()
     QCOMPARE(testWidget->count(), 0);
 }
 
-void tst_QListWidget::cleanup()
-{
-}
-
 void tst_QListWidget::populate()
 {
     addItem();
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 432c03a2df..a4ff7e1c60 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -65,17 +65,9 @@ class tst_QTableView : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QTableView();
-    virtual ~tst_QTableView();
-
-public slots:
+private slots:
     void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
 
-private slots:
     void getSetCheck();
 
     void noDelegate();
@@ -532,14 +524,6 @@ public:
     QSize hint;
 };
 
-tst_QTableView::tst_QTableView()
-{
-}
-
-tst_QTableView::~tst_QTableView()
-{
-}
-
 void tst_QTableView::initTestCase()
 {
 #ifdef Q_OS_WINCE //disable magic for WindowsCE
@@ -547,18 +531,6 @@ void tst_QTableView::initTestCase()
 #endif
 }
 
-void tst_QTableView::cleanupTestCase()
-{
-}
-
-void tst_QTableView::init()
-{
-}
-
-void tst_QTableView::cleanup()
-{
-}
-
 void tst_QTableView::noDelegate()
 {
     QtTestTableModel model(3, 3);
diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index db3cf8082d..a19dbd15d4 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
@@ -51,14 +51,11 @@ class tst_QTableWidget : public QObject
 
 public:
     tst_QTableWidget();
-    ~tst_QTableWidget();
 
-public slots:
+private slots:
     void initTestCase();
     void cleanupTestCase();
     void init();
-    void cleanup();
-private slots:
     void getSetCheck();
     void clear();
     void clearContents();
@@ -161,10 +158,6 @@ tst_QTableWidget::tst_QTableWidget(): testWidget(0)
 {
 }
 
-tst_QTableWidget::~tst_QTableWidget()
-{
-}
-
 void tst_QTableWidget::initTestCase()
 {
     testWidget = new QTableWidget();
@@ -188,11 +181,6 @@ void tst_QTableWidget::init()
         testWidget->showColumn(column);
 }
 
-void tst_QTableWidget::cleanup()
-{
-
-}
-
 void tst_QTableWidget::clearContents()
 {
     QTableWidgetItem *item = new QTableWidgetItem("test");
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 07413f5040..7ebfda11b7 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -119,20 +119,12 @@ class tst_QTreeView : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QTreeView();
-    virtual ~tst_QTreeView();
-
-
 public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
     void selectionOrderTest();
 
 private slots:
+    void initTestCase();
+
     void getSetCheck();
 
     // one test per QTreeView property
@@ -402,14 +394,6 @@ public:
     mutable QMap<QModelIndex,QModelIndex> parentHash;
 };
 
-tst_QTreeView::tst_QTreeView()
-{
-}
-
-tst_QTreeView::~tst_QTreeView()
-{
-}
-
 void tst_QTreeView::initTestCase()
 {
 #ifdef Q_OS_WINCE //disable magic for WindowsCE
@@ -417,18 +401,6 @@ void tst_QTreeView::initTestCase()
 #endif
 }
 
-void tst_QTreeView::cleanupTestCase()
-{
-}
-
-void tst_QTreeView::init()
-{
-}
-
-void tst_QTreeView::cleanup()
-{
-}
-
 // Testing get/set functions
 void tst_QTreeView::getSetCheck()
 {
diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
index 2ea78f8154..c3308e96c6 100644
--- a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
@@ -46,15 +46,11 @@ class tst_QTreeWidgetItemIterator : public QObject
 
 public:
     tst_QTreeWidgetItemIterator();
-    ~tst_QTreeWidgetItemIterator();
 
-public slots:
+private slots:
     void initTestCase();
     void cleanupTestCase();
-    void init();
-    void cleanup();
 
-private slots:
     void postincrement();
     void preincrement();
     void postdecrement();
@@ -81,10 +77,6 @@ tst_QTreeWidgetItemIterator::tst_QTreeWidgetItemIterator(): testWidget(0)
 {
 }
 
-tst_QTreeWidgetItemIterator::~tst_QTreeWidgetItemIterator()
-{
-}
-
 void tst_QTreeWidgetItemIterator::initTestCase()
 {
     testWidget = new QTreeWidget();
@@ -175,14 +167,6 @@ void tst_QTreeWidgetItemIterator::cleanupTestCase()
     delete testWidget;
 }
 
-void tst_QTreeWidgetItemIterator::init()
-{
-}
-
-void tst_QTreeWidgetItemIterator::cleanup()
-{
-}
-
 void tst_QTreeWidgetItemIterator::iteratorflags_data()
 {
   /*