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

List:       kde-commits
Subject:    kdesupport/soprano/backends/virtuoso
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-05-28 18:28:46
Message-ID: 20100528182846.2BD7EAC8C3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1131706 by trueg:

Use QScopedPointer instead of our own implementation.

 M  +2 -17     odbcqueryresult.cpp  


--- trunk/kdesupport/soprano/backends/virtuoso/odbcqueryresult.cpp #1131705:1131706
@@ -33,6 +33,7 @@
 #include <QtCore/QMutexLocker>
 #include <QtCore/QVariant>
 #include <QtCore/QStringList>
+#include <QtCore/QScopedPointer>
 #include <QtCore/QDebug>
 
 
@@ -105,22 +106,6 @@
 }
 
 
-namespace {
-    class DataArrayPointer
-    {
-    public:
-        DataArrayPointer( SQLCHAR* data )
-            : m_data( data ) {
-        }
-        ~DataArrayPointer() {
-            delete [] m_data;
-        }
-
-    private:
-        SQLCHAR* m_data;
-    };
-}
-
 Soprano::Node Soprano::ODBC::QueryResult::getData( int colNum )
 {
     SQLCHAR* data = 0;
@@ -130,7 +115,7 @@
         int dvtype = 0;
 
         // easy mem cleanup: never care about data again below
-        DataArrayPointer dap( data );
+        QScopedPointer<SQLCHAR, QScopedPointerArrayDeleter<SQLCHAR> > dap( data );
 
         //
         // Before we can retrieve the column meta data using SQLGetDescField,
[prev in list] [next in list] [prev in thread] [next in thread]