diff options
Diffstat (limited to 'tests/auto/widgets')
43 files changed, 39 insertions, 869 deletions
diff --git a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp index c5e31a4bd4..0915bf072e 100644 --- a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp +++ b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp @@ -50,12 +50,6 @@ public slots: void testGetRgba(); void testNativeActiveModalWidget(); -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void defaultOkButton(); void native_activeModalWidget(); @@ -108,22 +102,6 @@ void tst_QColorDialog::native_activeModalWidget() qApp->exec(); } -void tst_QColorDialog::initTestCase() -{ -} - -void tst_QColorDialog::cleanupTestCase() -{ -} - -void tst_QColorDialog::init() -{ -} - -void tst_QColorDialog::cleanup() -{ -} - void tst_QColorDialog::postKeyReturn() { QWidgetList list = QApplication::topLevelWidgets(); for (int i=0; i<list.count(); ++i) { diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 32253674d8..2ab9ca330f 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -101,16 +101,10 @@ class tst_QFiledialog : public QObject { Q_OBJECT -public: - tst_QFiledialog(); - virtual ~tst_QFiledialog(); - -public slots: +private slots: void initTestCase(); void init(); void cleanup(); - -private slots: void currentChangedSignal(); #ifdef QT_BUILD_INTERNAL void directoryEnteredSignal(); @@ -171,14 +165,6 @@ private: void cleanupSettingsFile(); }; -tst_QFiledialog::tst_QFiledialog() -{ -} - -tst_QFiledialog::~tst_QFiledialog() -{ -} - void tst_QFiledialog::cleanupSettingsFile() { // clean up the sidebar between each test diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 5e5affed28..35f4e406e0 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -93,14 +93,12 @@ Q_OBJECT public: tst_QFileDialog2(); - virtual ~tst_QFileDialog2(); -public slots: +private slots: void initTestCase(); void init(); void cleanup(); -private slots: #ifdef QT_BUILD_INTERNAL void deleteDirAndFiles(); void listRoot(); @@ -159,10 +157,6 @@ tst_QFileDialog2::tst_QFileDialog2() #endif } -tst_QFileDialog2::~tst_QFileDialog2() -{ -} - void tst_QFileDialog2::cleanupSettingsFile() { // clean up the sidebar between each test diff --git a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp index 943e86e9dc..c0c2732d23 100644 --- a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp +++ b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp @@ -39,14 +39,6 @@ class tst_QSidebar : public QObject { Q_OBJECT -public: - tst_QSidebar(); - virtual ~tst_QSidebar(); - -public Q_SLOTS: - void init(); - void cleanup(); - private slots: void setUrls(); void selectUrls(); @@ -55,22 +47,6 @@ private slots: void goToUrl(); }; -tst_QSidebar::tst_QSidebar() -{ -} - -tst_QSidebar::~tst_QSidebar() -{ -} - -void tst_QSidebar::init() -{ -} - -void tst_QSidebar::cleanup() -{ -} - void tst_QSidebar::setUrls() { QList<QUrl> urls; diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 3ff672f288..9663d9cf58 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -59,11 +59,8 @@ class tst_QWizard : public QObject public: tst_QWizard(); -public slots: - void init(); - void cleanup(); - private slots: + void cleanup(); void buttonText(); void setButtonLayout(); void setButton(); @@ -138,10 +135,6 @@ private slots: tst_QWizard::tst_QWizard() { -} - -void tst_QWizard::init() -{ #ifdef Q_OS_WINCE //disable magic for WindowsCE qApp->setAutoMaximizeThreshold(-1); #endif diff --git a/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp index e21cb13a33..1fb8aee1e9 100644 --- a/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp +++ b/tests/auto/widgets/effects/qpixmapfilter/tst_qpixmapfilter.cpp @@ -41,15 +41,6 @@ class tst_QPixmapFilter : public QObject { Q_OBJECT -public: - tst_QPixmapFilter(); - virtual ~tst_QPixmapFilter(); - - -public slots: - void init(); - void cleanup(); - private slots: void colorizeSetColor(); void colorizeSetStrength(); @@ -78,22 +69,6 @@ public: } }; -tst_QPixmapFilter::tst_QPixmapFilter() -{ -} - -tst_QPixmapFilter::~tst_QPixmapFilter() -{ -} - -void tst_QPixmapFilter::init() -{ -} - -void tst_QPixmapFilter::cleanup() -{ -} - void tst_QPixmapFilter::testDefaultImplementations() { CustomFilter filter; diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 2d1efab4d1..4a17977207 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -42,13 +42,8 @@ class tst_QGraphicsGridLayout : public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: + void initTestCase(); void qgraphicsgridlayout_data(); void qgraphicsgridlayout(); void addItem_data(); @@ -309,27 +304,11 @@ typedef QList<QSizeF> SizeList; // It is only called once. void tst_QGraphicsGridLayout::initTestCase() { -} - -// This will be called after the last test function is executed. -// It is only called once. -void tst_QGraphicsGridLayout::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QGraphicsGridLayout::init() -{ #ifdef Q_OS_WINCE //disable magic for WindowsCE qApp->setAutoMaximizeThreshold(-1); #endif } -// This will be called after every test function. -void tst_QGraphicsGridLayout::cleanup() -{ -} - void tst_QGraphicsGridLayout::qgraphicsgridlayout_data() { } diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp index 43993f6dbc..e28d1af60c 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp @@ -40,12 +40,6 @@ class tst_QGraphicsLayoutItem : public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void qgraphicslayoutitem(); @@ -96,28 +90,6 @@ public: }; -// This will be called before the first test function is executed. -// It is only called once. -void tst_QGraphicsLayoutItem::initTestCase() -{ -} - -// This will be called after the last test function is executed. -// It is only called once. -void tst_QGraphicsLayoutItem::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QGraphicsLayoutItem::init() -{ -} - -// This will be called after every test function. -void tst_QGraphicsLayoutItem::cleanup() -{ -} - void tst_QGraphicsLayoutItem::qgraphicslayoutitem() { SubQGraphicsLayoutItem layoutItem; diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index d0aacf5dad..1d234c88fb 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -46,13 +46,8 @@ class tst_QGraphicsLinearLayout : public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: + void initTestCase(); void qgraphicslinearlayout_data(); void qgraphicslinearlayout(); @@ -151,22 +146,6 @@ void tst_QGraphicsLinearLayout::initTestCase() QApplication::setStyle("windows"); } -// This will be called after the last test function is executed. -// It is only called once. -void tst_QGraphicsLinearLayout::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QGraphicsLinearLayout::init() -{ -} - -// This will be called after every test function. -void tst_QGraphicsLinearLayout::cleanup() -{ -} - class RectWidget : public QGraphicsWidget { public: diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp index 0f9e8c101e..7080b667af 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp @@ -43,12 +43,6 @@ class tst_QGraphicsObject : public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void pos(); void x(); @@ -60,30 +54,6 @@ private slots: void deleted(); }; - -// This will be called before the first test function is executed. -// It is only called once. -void tst_QGraphicsObject::initTestCase() -{ -} - -// This will be called after the last test function is executed. -// It is only called once. -void tst_QGraphicsObject::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QGraphicsObject::init() -{ -} - -// This will be called after every test function. -void tst_QGraphicsObject::cleanup() -{ -} - - class MyGraphicsObject : public QGraphicsObject { public: diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp index 774a41b212..7f900302fe 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp @@ -40,12 +40,6 @@ class tst_QGraphicsPixmapItem : public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void qgraphicspixmapitem_data(); void qgraphicspixmapitem(); @@ -102,28 +96,6 @@ public: { return SubQGraphicsPixmapItem::supportsExtension((QGraphicsItem::Extension)extension); } }; -// This will be called before the first test function is executed. -// It is only called once. -void tst_QGraphicsPixmapItem::initTestCase() -{ -} - -// This will be called after the last test function is executed. -// It is only called once. -void tst_QGraphicsPixmapItem::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QGraphicsPixmapItem::init() -{ -} - -// This will be called after every test function. -void tst_QGraphicsPixmapItem::cleanup() -{ -} - void tst_QGraphicsPixmapItem::qgraphicspixmapitem_data() { } diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp index 376846471b..ab4f2cec08 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp @@ -41,12 +41,6 @@ class tst_QGraphicsPolygonItem : public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void qgraphicspolygonitem_data(); void qgraphicspolygonitem(); @@ -98,28 +92,6 @@ public: { return SubQGraphicsPolygonItem::supportsExtension((QGraphicsItem::Extension)extension); } }; -// This will be called before the first test function is executed. -// It is only called once. -void tst_QGraphicsPolygonItem::initTestCase() -{ -} - -// This will be called after the last test function is executed. -// It is only called once. -void tst_QGraphicsPolygonItem::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QGraphicsPolygonItem::init() -{ -} - -// This will be called after every test function. -void tst_QGraphicsPolygonItem::cleanup() -{ -} - void tst_QGraphicsPolygonItem::qgraphicspolygonitem_data() { } diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 10708c0dd7..d8746906e9 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -84,13 +84,9 @@ class tst_QGraphicsProxyWidget : public QObject { Q_OBJECT -public slots: +private slots: void initTestCase(); - void cleanupTestCase(); - void init(); void cleanup(); - -private slots: void qgraphicsproxywidget_data(); void qgraphicsproxywidget(); void paint(); @@ -291,17 +287,6 @@ void tst_QGraphicsProxyWidget::initTestCase() QApplication::setEffectEnabled(Qt::UI_AnimateCombo, false); } -// This will be called after the last test function is executed. -// It is only called once. -void tst_QGraphicsProxyWidget::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QGraphicsProxyWidget::init() -{ -} - // This will be called after every test function. void tst_QGraphicsProxyWidget::cleanup() { diff --git a/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp b/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp index cf1edae9ff..ade69c4685 100644 --- a/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp @@ -39,12 +39,6 @@ class tst_QGraphicsTransform : public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void scale(); void rotation(); @@ -57,29 +51,6 @@ private: QString toString(QTransform const&); }; - -// This will be called before the first test function is executed. -// It is only called once. -void tst_QGraphicsTransform::initTestCase() -{ -} - -// This will be called after the last test function is executed. -// It is only called once. -void tst_QGraphicsTransform::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QGraphicsTransform::init() -{ -} - -// This will be called after every test function. -void tst_QGraphicsTransform::cleanup() -{ -} - static QTransform transform2D(const QGraphicsTransform& t) { QMatrix4x4 m; diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index b61610dee3..fe7e3bf59e 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -77,12 +77,6 @@ protected: class tst_QGraphicsWidget : public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void qgraphicswidget(); @@ -262,28 +256,6 @@ protected: } }; -// This will be called before the first test function is executed. -// It is only called once. -void tst_QGraphicsWidget::initTestCase() -{ -} - -// This will be called after the last test function is executed. -// It is only called once. -void tst_QGraphicsWidget::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QGraphicsWidget::init() -{ -} - -// This will be called after every test function. -void tst_QGraphicsWidget::cleanup() -{ -} - class SizeHinter : public QGraphicsWidget { public: 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() { /* diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 1257a3f420..dfa2280a6b 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -103,13 +103,10 @@ Q_OBJECT public: tst_QApplication(); - virtual ~tst_QApplication(); -public slots: +private slots: void initTestCase(); - void init(); void cleanup(); -private slots: void sendEventsOnProcessEvents(); // this must be the first test void staticSetup(); @@ -249,17 +246,6 @@ tst_QApplication::tst_QApplication() #endif } -tst_QApplication::~tst_QApplication() -{ - -} - -void tst_QApplication::init() -{ -// TODO: Add initialization code here. -// This will be executed immediately before each test is run. -} - void tst_QApplication::cleanup() { // TODO: Add cleanup code here. diff --git a/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp index e94dfa5754..df7f14add3 100644 --- a/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp +++ b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp @@ -41,15 +41,9 @@ class tst_QDesktopWidget : public QObject { Q_OBJECT -public: - tst_QDesktopWidget(); - virtual ~tst_QDesktopWidget(); - -public slots: - void init(); +private slots: void cleanup(); -private slots: void numScreens(); void primaryScreen(); void screenNumberForQWidget(); @@ -59,18 +53,6 @@ private slots: void topLevels(); }; -tst_QDesktopWidget::tst_QDesktopWidget() -{ -} - -tst_QDesktopWidget::~tst_QDesktopWidget() -{ -} - -void tst_QDesktopWidget::init() -{ -} - void tst_QDesktopWidget::cleanup() { QVERIFY(QApplication::topLevelWidgets().isEmpty()); diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp index eec572c3c4..e65e2e0899 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp +++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp @@ -46,16 +46,11 @@ class tst_QStackedLayout : public QObject public: tst_QStackedLayout(); - virtual ~tst_QStackedLayout(); - -public slots: - void initTestCase(); - void cleanupTestCase(); +private slots: void init(); void cleanup(); -private slots: void getSetCheck(); void testCase(); void deleteCurrent(); @@ -100,18 +95,6 @@ tst_QStackedLayout::tst_QStackedLayout() { } -tst_QStackedLayout::~tst_QStackedLayout() -{ -} - -void tst_QStackedLayout::initTestCase() -{ -} - -void tst_QStackedLayout::cleanupTestCase() -{ -} - void tst_QStackedLayout::init() { if (testWidget) { @@ -134,7 +117,6 @@ void tst_QStackedLayout::cleanup() testWidget = 0; } - void tst_QStackedLayout::testCase() { QStackedLayout onStack(testWidget); diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index 21369d4520..cf1341b376 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -92,17 +92,15 @@ class tst_QStyle : public QObject Q_OBJECT public: tst_QStyle(); - virtual ~tst_QStyle(); + private: bool testAllFunctions(QStyle *); bool testScrollBarSubControls(QStyle *); void testPainting(QStyle *style, const QString &platform); private slots: void drawItemPixmap(); - void initTestCase(); - void cleanup(); - void cleanupTestCase(); void init(); + void cleanup(); #ifndef QT_NO_STYLE_FUSION void testFusionStyle(); #endif @@ -142,10 +140,6 @@ tst_QStyle::tst_QStyle() testWidget = 0; } -tst_QStyle::~tst_QStyle() -{ -} - class MyWidget : public QWidget { public: @@ -165,14 +159,6 @@ void tst_QStyle::cleanup() testWidget = 0; } -void tst_QStyle::initTestCase() -{ -} - -void tst_QStyle::cleanupTestCase() -{ -} - void tst_QStyle::testStyleFactory() { QStringList keys = QStyleFactory::keys(); diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp index 43d6912c6e..bfd99ad121 100644 --- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp +++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp @@ -48,17 +48,11 @@ class tst_QAbstractButton : public QObject { Q_OBJECT -public: - tst_QAbstractButton(); - virtual ~tst_QAbstractButton(); - - -public slots: +private slots: void initTestCase(); void cleanupTestCase(); void init(); - void cleanup(); -private slots: + void setAutoRepeat_data(); void setAutoRepeat(); @@ -147,14 +141,6 @@ private: } }; -tst_QAbstractButton::tst_QAbstractButton() -{ -} - -tst_QAbstractButton::~tst_QAbstractButton() -{ -} - void tst_QAbstractButton::initTestCase() { testWidget = new MyButton(0); @@ -188,10 +174,6 @@ void tst_QAbstractButton::init() click_count = 0; } -void tst_QAbstractButton::cleanup() -{ -} - void tst_QAbstractButton::resetValues() { toggle_count = 0; diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp index 5dec6224ca..90e7d5f3ea 100644 --- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp +++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp @@ -68,14 +68,7 @@ protected: class tst_QButtonGroup : public QObject { Q_OBJECT -public: - tst_QButtonGroup(); -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); private slots: void arrowKeyNavigation(); void exclusive(); @@ -91,27 +84,6 @@ private slots: void task209485_removeFromGroupInEventHandler(); }; -tst_QButtonGroup::tst_QButtonGroup() -{ -} - - -void tst_QButtonGroup::initTestCase() -{ -} - -void tst_QButtonGroup::cleanupTestCase() -{ -} - -void tst_QButtonGroup::init() -{ -} - -void tst_QButtonGroup::cleanup() -{ -} - QT_BEGIN_NAMESPACE extern bool Q_GUI_EXPORT qt_tab_all_widgets(); QT_END_NAMESPACE diff --git a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp index 9b8ab110cd..b3ade17c49 100644 --- a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp +++ b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp @@ -46,15 +46,6 @@ class tst_QCalendarWidget : public QObject { Q_OBJECT -public: - tst_QCalendarWidget(); - virtual ~tst_QCalendarWidget(); -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void getSetCheck(); void buttonClickCheck(); @@ -265,31 +256,6 @@ void tst_QCalendarWidget::setWeekdayFormat() } } -tst_QCalendarWidget::tst_QCalendarWidget() -{ -} - -tst_QCalendarWidget::~tst_QCalendarWidget() -{ -} - -void tst_QCalendarWidget::initTestCase() -{ -} - -void tst_QCalendarWidget::cleanupTestCase() -{ -} - -void tst_QCalendarWidget::init() -{ -} - -void tst_QCalendarWidget::cleanup() -{ -} - - typedef void (QCalendarWidget::*ShowFunc)(); Q_DECLARE_METATYPE(ShowFunc) diff --git a/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp index 5696382fab..3583a135be 100644 --- a/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp +++ b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp @@ -45,17 +45,12 @@ class tst_QCheckBox : public QObject { Q_OBJECT -public: - tst_QCheckBox(); - virtual ~tst_QCheckBox(); - -public slots: +private slots: void initTestCase(); void cleanupTestCase(); void init(); void cleanup(); -private slots: void setChecked(); void setTriState(); void setText_data(); @@ -86,14 +81,6 @@ private: QCheckBox *testWidget; }; -tst_QCheckBox::tst_QCheckBox() -{ -} - -tst_QCheckBox::~tst_QCheckBox() -{ -} - void tst_QCheckBox::initTestCase() { // Create the test class diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp index a57553097a..2f761d3864 100644 --- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp +++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp @@ -48,16 +48,12 @@ class tst_QCommandLinkButton : public QObject { Q_OBJECT -public: - tst_QCommandLinkButton(); - virtual ~tst_QCommandLinkButton(); -public slots: +private slots: void initTestCase(); void cleanupTestCase(); void init(); - void cleanup(); -private slots: + void getSetCheck(); void pressed(); void setAccel(); @@ -112,14 +108,6 @@ void tst_QCommandLinkButton::getSetCheck() delete var1; } -tst_QCommandLinkButton::tst_QCommandLinkButton() -{ -} - -tst_QCommandLinkButton::~tst_QCommandLinkButton() -{ -} - void tst_QCommandLinkButton::initTestCase() { // Create the test class @@ -153,10 +141,6 @@ void tst_QCommandLinkButton::init() resetCounters(); } -void tst_QCommandLinkButton::cleanup() -{ -} - void tst_QCommandLinkButton::resetCounters() { toggle_count = 0; diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index d496386773..42353a6ea5 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -125,15 +125,13 @@ public: class tst_QDateTimeEdit : public QObject { Q_OBJECT -public: - tst_QDateTimeEdit(); - virtual ~tst_QDateTimeEdit(); -public slots: + +private slots: void initTestCase(); void init(); void cleanup(); void cleanupTestCase(); -private slots: + void cachedDayTest(); void getSetCheck(); void constructor_qwidget(); @@ -314,14 +312,6 @@ void tst_QDateTimeEdit::getSetCheck() QCOMPARE(timeEdit.inputMethodQuery(Qt::ImHints), QVariant(int(Qt::ImhPreferNumbers))); } -tst_QDateTimeEdit::tst_QDateTimeEdit() -{ -} - -tst_QDateTimeEdit::~tst_QDateTimeEdit() -{ -} - void tst_QDateTimeEdit::initTestCase() { QLocale system = QLocale::system(); diff --git a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp index 09de0e6dc9..3b4d817b58 100644 --- a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp +++ b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp @@ -39,12 +39,6 @@ class tst_QFontComboBox : public QObject { Q_OBJECT -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); - private slots: void qfontcombobox_data(); void qfontcombobox(); @@ -69,28 +63,6 @@ public: { return SubQFontComboBox::event(e); } }; -// This will be called before the first test function is executed. -// It is only called once. -void tst_QFontComboBox::initTestCase() -{ -} - -// This will be called after the last test function is executed. -// It is only called once. -void tst_QFontComboBox::cleanupTestCase() -{ -} - -// This will be called before each test function is executed. -void tst_QFontComboBox::init() -{ -} - -// This will be called after every test function. -void tst_QFontComboBox::cleanup() -{ -} - void tst_QFontComboBox::qfontcombobox_data() { } diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index de896ea273..c919d4ca79 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -132,14 +132,13 @@ public: enum EventStates { Press, Release, Click }; tst_QLineEdit(); - virtual ~tst_QLineEdit(); -public slots: +private slots: void initTestCase(); void cleanupTestCase(); void init(); void cleanup(); -private slots: + void getSetCheck(); void experimental(); @@ -380,10 +379,6 @@ tst_QLineEdit::tst_QLineEdit() : validInput(false), m_testWidget(0), m_keyboardS } } -tst_QLineEdit::~tst_QLineEdit() -{ -} - QLineEdit *tst_QLineEdit::ensureTestWidget() { if (!m_testWidget) { diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp index 1657751605..42a24ba908 100644 --- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp @@ -49,17 +49,12 @@ class tst_QPushButton : public QObject { Q_OBJECT -public: - tst_QPushButton(); - virtual ~tst_QPushButton(); - -public slots: +private slots: void initTestCase(); void cleanupTestCase(); void init(); - void cleanup(); -private slots: + void getSetCheck(); void autoRepeat(); void pressed(); @@ -109,14 +104,6 @@ void tst_QPushButton::getSetCheck() delete var1; } -tst_QPushButton::tst_QPushButton() -{ -} - -tst_QPushButton::~tst_QPushButton() -{ -} - void tst_QPushButton::initTestCase() { // Create the test class @@ -149,11 +136,6 @@ void tst_QPushButton::init() resetCounters(); } -void tst_QPushButton::cleanup() -{ -} - - void tst_QPushButton::resetCounters() { toggle_count = 0; diff --git a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp index 991e72acd0..7b03368139 100644 --- a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp +++ b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp @@ -44,21 +44,13 @@ class tst_QStatusBar: public QObject { Q_OBJECT -public: - tst_QStatusBar(); - virtual ~tst_QStatusBar(); - - protected slots: void messageChanged(const QString&); -public slots: - void initTestCase(); - void cleanupTestCase(); +private slots: void init(); void cleanup(); -private slots: void tempMessage(); void insertWidget(); void insertPermanentWidget(); @@ -73,14 +65,6 @@ private: QString currentMessage; }; -tst_QStatusBar::tst_QStatusBar() -{ -} - -tst_QStatusBar::~tst_QStatusBar() -{ -} - void tst_QStatusBar::init() { testWidget = new QStatusBar; @@ -97,14 +81,6 @@ void tst_QStatusBar::cleanup() delete testWidget; } -void tst_QStatusBar::initTestCase() -{ -} - -void tst_QStatusBar::cleanupTestCase() -{ -} - void tst_QStatusBar::messageChanged(const QString &m) { currentMessage = m; diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp index a991f18110..e5e0e5fe10 100644 --- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp +++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp @@ -76,13 +76,11 @@ class QTabWidgetChild:public QTabWidget { class tst_QTabWidget:public QObject { Q_OBJECT - public: - tst_QTabWidget(); - public slots: +private slots: void init(); void cleanup(); - private slots: + void getSetCheck(); void testChild(); void addRemoveTab(); @@ -156,10 +154,6 @@ void tst_QTabWidget::getSetCheck() QCOMPARE(w5, obj1.currentWidget()); // current not changed } -tst_QTabWidget::tst_QTabWidget() -{ -} - void tst_QTabWidget::init() { tw = new QTabWidget(0); diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp index adc768f828..4a8d1888d8 100644 --- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp +++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp @@ -72,15 +72,11 @@ QVariant TestBrowser::loadResource(int type, const QUrl &name) class tst_QTextBrowser : public QObject { Q_OBJECT -public: - tst_QTextBrowser(); - virtual ~tst_QTextBrowser(); -public slots: +private slots: void init(); void cleanup(); -private slots: void noReloadOnAnchorJump(); void bgColorOnSourceChange(); void forwardButton(); @@ -104,14 +100,6 @@ private: TestBrowser *browser; }; -tst_QTextBrowser::tst_QTextBrowser() -{ -} - -tst_QTextBrowser::~tst_QTextBrowser() -{ -} - void tst_QTextBrowser::init() { QString prefix = QFileInfo(QFINDTESTDATA("subdir")).absolutePath(); diff --git a/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp b/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp index b016811eeb..096ce28690 100644 --- a/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp +++ b/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp @@ -44,19 +44,13 @@ class tst_QToolBox : public QObject { Q_OBJECT -public: - tst_QToolBox(); - virtual ~tst_QToolBox(); - protected slots: void currentChanged(int); -public slots: - void initTestCase(); - void cleanupTestCase(); +private slots: void init(); void cleanup(); -private slots: + void getSetCheck(); void populate(); void change(); @@ -106,14 +100,6 @@ void tst_QToolBox::getSetCheck() QCOMPARE(w3, obj1.currentWidget()); } -tst_QToolBox::tst_QToolBox() -{ -} - -tst_QToolBox::~tst_QToolBox() -{ -} - class tst_QToolBoxPrivate { public: @@ -183,14 +169,6 @@ void tst_QToolBox::cleanup() delete d; } -void tst_QToolBox::initTestCase() -{ -} - -void tst_QToolBox::cleanupTestCase() -{ -} - void tst_QToolBox::currentChanged(int index) { currentIndex = index; |