[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib/graphicsview
From:       Jens-Michael Hoffmann <jensmh () gmx ! de>
Date:       2009-12-19 21:30:27
Message-ID: 1261258227.840571.32604.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1064013 by jmhoffmann:

Fix memory leak reported by valgrind by using QVector instead of dynamically
allocated C style arrays of pointers.

 M  +8 -14     MarbleGraphicsGridLayout.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/graphicsview/MarbleGraphicsGridLayout.cpp #1064012:1064013
@@ -12,13 +12,14 @@
 #include "MarbleGraphicsGridLayout.h"
 
 // Marble
+#include "MarbleDebug.h"
 #include "ScreenGraphicsItem.h"
 
 // Qt
-#include "MarbleDebug.h"
 #include <QtCore/QHash>
 #include <QtCore/QRectF>
 #include <QtCore/QSizeF>
+#include <QtCore/QVector>
 
 namespace Marble
 {
@@ -78,16 +79,9 @@
 
 void MarbleGraphicsGridLayout::updatePositions( MarbleGraphicsItem *parent )
 {
-    double *maxWidth = new double[d->m_columns];
-    double *maxHeight = new double[d->m_rows];
-
     // Initialize with 0.0
-    for ( int i = 0; i < d->m_columns; i++ ) {
-        maxWidth[i] = 0.0;
-    }
-    for ( int i = 0; i < d->m_rows; i++ ) {
-        maxHeight[i] = 0.0;
-    }
+    QVector<double> maxWidth( d->m_columns, 0.0 );
+    QVector<double> maxHeight( d->m_rows, 0.0 );
 
     // Determining the cell sizes
     for ( int row = 0; row < d->m_rows; row++ ) {
@@ -109,10 +103,10 @@
         }
     }
 
-    double *startX = new double[d->m_columns];
-    double *endX = new double[d->m_columns];
-    double *startY = new double[d->m_rows];
-    double *endY = new double[d->m_rows];
+    QVector<double> startX( d->m_columns );
+    QVector<double> endX( d->m_columns );
+    QVector<double> startY( d->m_rows );
+    QVector<double> endY( d->m_rows );
     QRectF contentRect = parent->contentRect();
 
     for ( int i = 0; i < d->m_columns; i++ ) {
[prev in list] [next in list] [prev in thread] [next in thread]