1 files changed, 12 insertions, 19 deletions
diff --git a/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp b/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp
index 1facf99afa..022bd7f61e 100644
--- a/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp
+++ b/tests/auto/widgets/kernel/qsizepolicy/tst_qsizepolicy.cpp
@@ -37,33 +37,20 @@
 
 class tst_QSizePolicy : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 
-public:
-    tst_QSizePolicy();
-    virtual ~tst_QSizePolicy();
-
-private slots:
+private Q_SLOTS:
+    void defaultValues();
     void getSetCheck();
     void dataStream();
     void horizontalStretch();
     void verticalStretch();
 };
 
-tst_QSizePolicy::tst_QSizePolicy()
-{
-}
-
-tst_QSizePolicy::~tst_QSizePolicy()
-{
-}
-
-
-// Testing get/set functions
-void tst_QSizePolicy::getSetCheck()
+void tst_QSizePolicy::defaultValues()
 {
     {
-        // check values of a default constructed QSizePolicy
+        // check values of a default-constructed QSizePolicy
         QSizePolicy sp;
         QCOMPARE(sp.horizontalPolicy(), QSizePolicy::Fixed);
         QCOMPARE(sp.verticalPolicy(), QSizePolicy::Fixed);
@@ -74,7 +61,11 @@ void tst_QSizePolicy::getSetCheck()
         QCOMPARE(sp.hasHeightForWidth(), false);
         QCOMPARE(sp.hasWidthForHeight(), false);
     }
+}
 
+// Testing get/set functions
+void tst_QSizePolicy::getSetCheck()
+{
     {
         static const QSizePolicy::Policy policies[3] = {
             QSizePolicy::Fixed,
@@ -118,7 +109,7 @@ void tst_QSizePolicy::getSetCheck()
                                         case 0: sp.setHorizontalPolicy(hp); break;
                                         case 1: sp.setVerticalPolicy(vp); break;
                                         case 2: sp.setHorizontalStretch(hst); break;
-                           case 3: sp.setVerticalStretch(vst); break;
+                                        case 3: sp.setVerticalStretch(vst); break;
                                         case 4: sp.setControlType(ct); break;
                                         case 5: sp.setHeightForWidth(hfw); sp.setWidthForHeight(wfh); break;
                                         default: break;
@@ -152,6 +143,7 @@ void tst_QSizePolicy::getSetCheck()
             out.close();
         }
 #endif
+#undef ITEMCOUNT
     }
 }
 
@@ -212,5 +204,6 @@ void tst_QSizePolicy::verticalStretch()
     sp.setVerticalStretch(257);
     QCOMPARE(sp.verticalStretch(), 255);
 }
+
 QTEST_MAIN(tst_QSizePolicy)
 #include "tst_qsizepolicy.moc"