QGAL (Test): Fix memory leaks in example and tests

Some tests and the example were leaking memory what made it
harder to investigate leaks on the layout itself.

Those were simple errors like not deleting the layout at the
end of the test and were corrected.

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>

3 files changed, 34 insertions, 20 deletions

diff --git a/examples/graphicsview/anchorlayout/main.cpp b/examples/graphicsview/anchorlayout/main.cpp
index f898d1d245..389bc9e791 100644
--- a/examples/graphicsview/anchorlayout/main.cpp
+++ b/examples/graphicsview/anchorlayout/main.cpp
@@ -122,8 +122,8 @@ int main(int argc, char **argv)
 
     scene.addItem(w);
     scene.setBackgroundBrush(Qt::darkGreen);
-    QGraphicsView *view = new QGraphicsView(&scene);
-    view->show();
+    QGraphicsView view(&scene);
+    view.show();
 
     return app.exec();
 }
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index a7297c9c4e..d5664986e6 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -1197,7 +1197,7 @@ void tst_QGraphicsAnchorLayout::styleDefaults()
     QSizeF pref(20, 20);
     QSizeF max (50, 50);
 
-    /* 
+    /*
     create this layout, where a,b have controlType QSizePolicy::RadioButton
     c,d have controlType QSizePolicy::PushButton:
     +-------+
@@ -1244,9 +1244,9 @@ void tst_QGraphicsAnchorLayout::styleDefaults()
     scene.addItem(window);
 
     window->show();
-    QGraphicsView *view = new QGraphicsView(&scene);
-    view->resize(200, 200);
-    view->show();
+    QGraphicsView view(&scene);
+    view.resize(200, 200);
+    view.show();
 
     window->adjustSize();
     QCOMPARE(a->geometry(), QRectF(0,   3, 20, 20));    //radio
@@ -1265,10 +1265,13 @@ void tst_QGraphicsAnchorLayout::styleDefaults()
     window->setStyle(style);
     window->adjustSize();
     QCOMPARE(a->geometry(), QRectF(0,   3, 20, 20));
-    QCOMPARE(b->geometry(), QRectF(21, 25, 20, 20));     
+    QCOMPARE(b->geometry(), QRectF(21, 25, 20, 20));
     QCOMPARE(c->geometry(), QRectF(42, 47, 20, 20));
     QCOMPARE(d->geometry(), QRectF(63, 69, 20, 20));
     QCOMPARE(l->geometry(), QRectF(0,   0, 89, 98));
+
+    window->setStyle(0);
+    delete style;
 }
 
 
@@ -1777,7 +1780,8 @@ void tst_QGraphicsAnchorLayout::simplificationVsOrder()
     QGraphicsWidget *b = createItem(min, pref, max, "B");
     QGraphicsWidget *c = createItem(min, pref, max, "C");
 
-    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    QGraphicsWidget frame;
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout(&frame);
 
     // Bulk anchors
     l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
@@ -1847,7 +1851,8 @@ void tst_QGraphicsAnchorLayout::simplificationVsRedundance()
     QGraphicsWidget *b = createItem(min, pref, max, "B");
     QGraphicsWidget *c = createItem(min, pref, max, "C");
 
-    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    QGraphicsWidget frame;
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout(&frame);
 
     l->addCornerAnchors(a, Qt::TopLeftCorner, l, Qt::TopLeftCorner);
     l->addCornerAnchors(a, Qt::BottomLeftCorner, l, Qt::BottomLeftCorner);
diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index baa1ba13e8..57dc90d067 100644
--- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -356,6 +356,8 @@ void tst_QGraphicsAnchorLayout1::testItemAt()
 
     QVERIFY( layout->itemAt(0) == widget2 );
 
+    delete widget1;
+
     widget->setLayout(layout);
     delete widget;
 }
@@ -460,6 +462,12 @@ void tst_QGraphicsAnchorLayout1::testAddAndRemoveAnchor()
 
     QCOMPARE( layout->count(), 0 );
 
+    delete widget1;
+    delete widget2;
+    delete widget3;
+    delete widget4;
+    delete widget5;
+
     widget->setLayout(layout);
     delete widget;
 }
@@ -1740,9 +1748,9 @@ void tst_QGraphicsAnchorLayout1::testBasicLayout()
         QRectF actual = truncate(widgets[item.index]->geometry());
 
         QCOMPARE(actual, expected);
-        delete widgets[item.index];
     }
 
+    qDeleteAll(widgets);
     delete widget;
 }
 
@@ -2231,8 +2239,9 @@ void tst_QGraphicsAnchorLayout1::testRemoveCenterAnchor()
         const BasicLayoutTestResult item = result[i];
 
         QCOMPARE(widgets[item.index]->geometry(), item.rect);
-        delete widgets[item.index];
     }
+
+    qDeleteAll(widgets);
     delete widget;
 }
 
@@ -2360,7 +2369,7 @@ void tst_QGraphicsAnchorLayout1::testSingleSizePolicy()
     QFETCH(bool, valid);
 
     // create objects
-    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsWidget widget;
     TheAnchorLayout *layout = new TheAnchorLayout;
     TestWidget *childWidget = new TestWidget;
 
@@ -2370,11 +2379,11 @@ void tst_QGraphicsAnchorLayout1::testSingleSizePolicy()
     layout->setAnchor( layout, Qt::AnchorTop, childWidget, Qt::AnchorTop, 10 );
     layout->setAnchor( childWidget, Qt::AnchorBottom, layout, Qt::AnchorBottom, 10 );
 
-    widget->setLayout( layout );
+    widget.setLayout( layout );
 
     // set test case specific: policy and size
     childWidget->setSizePolicy( policy );
-    widget->setGeometry( QRectF( QPoint(0,0), size ) );
+    widget.setGeometry( QRectF( QPoint(0,0), size ) );
 
     QCOMPARE( layout->isValid() , valid );
 
@@ -2516,7 +2525,7 @@ void tst_QGraphicsAnchorLayout1::testDoubleSizePolicy()
     QFETCH(qreal, width2);
 
     // create objects
-    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsWidget widget;
     TheAnchorLayout *layout = new TheAnchorLayout;
     TestWidget *childWidget1 = new TestWidget;
     TestWidget *childWidget2 = new TestWidget;
@@ -2526,13 +2535,13 @@ void tst_QGraphicsAnchorLayout1::testDoubleSizePolicy()
     layout->setAnchor( childWidget1, Qt::AnchorRight, childWidget2, Qt::AnchorLeft, 10 );
     layout->setAnchor( childWidget2, Qt::AnchorRight, layout, Qt::AnchorRight, 10 );
 
-    widget->setLayout( layout );
+    widget.setLayout( layout );
 
     // set test case specific: policy
     childWidget1->setSizePolicy( policy1 );
     childWidget2->setSizePolicy( policy2 );
 
-    widget->setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
+    widget.setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
 
     // check results:
     if ( width1 == -1.0f ) {
@@ -2649,7 +2658,7 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution()
     QFETCH(qreal, width2);
 
     // create objects
-    QGraphicsWidget *widget = new QGraphicsWidget;
+    QGraphicsWidget widget;
     TheAnchorLayout *layout = new TheAnchorLayout;
     TestWidget *childWidget1 = new TestWidget;
     TestWidget *childWidget2 = new TestWidget;
@@ -2659,7 +2668,7 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution()
     layout->setAnchor( childWidget1, Qt::AnchorRight, childWidget2, Qt::AnchorLeft, 10 );
     layout->setAnchor( childWidget2, Qt::AnchorRight, layout, Qt::AnchorRight, 10 );
 
-    widget->setLayout( layout );
+    widget.setLayout( layout );
 
     // set test case specific: size hints
     childWidget1->setMinimumWidth( sizeHints1.value( Qt::MinimumSize ) );
@@ -2670,7 +2679,7 @@ void tst_QGraphicsAnchorLayout1::testSizeDistribution()
     childWidget2->setPreferredWidth( sizeHints2.value( Qt::PreferredSize ) );
     childWidget2->setMaximumWidth( sizeHints2.value( Qt::MaximumSize ) );
 
-    widget->setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
+    widget.setGeometry( QRectF( QPoint(0,0), QSize( 100,100 ) ) );
 
     // check results:
     if ( width1 == -1.0f ) {