Clean up tst_qlabel

Remove unused ctors and dtor, add Q_OBJECT, indent,
privatize slots, don't check for nullptr before
delete'ing a pointer, and add one override keyword.

Setting test_box (a QPointer) to nullptr is already
done by the variable's default ctor.

Change-Id: I13f06dc8104ef1c0ac08a25c960641c076f10499
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>

1 files changed, 6 insertions, 22 deletions

diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
index 789a280e80..d76dbf6b46 100644
--- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
+++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
@@ -47,13 +47,12 @@
 
 class Widget : public QWidget
 {
+    Q_OBJECT
 public:
-    Widget() { }
-
     QList<QEvent::Type> events;
 
 protected:
-    bool event(QEvent *ev) {
+    bool event(QEvent *ev) Q_DECL_OVERRIDE {
         events.append(ev->type());
         return QWidget::event(ev);
     }
@@ -62,19 +61,14 @@ protected:
 
 class tst_QLabel : public QObject
 {
-Q_OBJECT
-
-public:
-    tst_QLabel();
-    virtual ~tst_QLabel();
-
+    Q_OBJECT
 
-public slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
-private slots:
+
     void getSetCheck();
     void setText_data();
     void setText();
@@ -143,15 +137,6 @@ void tst_QLabel::getSetCheck()
     delete var3;
 }
 
-
-tst_QLabel::tst_QLabel(): test_box(0)
-{
-}
-
-tst_QLabel::~tst_QLabel()
-{
-}
-
 void tst_QLabel::initTestCase()
 {
     // Create the test class
@@ -164,8 +149,7 @@ void tst_QLabel::cleanupTestCase()
 {
     delete testWidget;
     testWidget = 0;
-    if (test_box)
-        delete test_box;
+    delete test_box;
 }
 
 void tst_QLabel::init()