Coverity fixes

qgis · May 26, 2015 · 7af658f · 7af658f
1 parent 95a7408
commit 7af658f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/app/qgsmaptooldeletepart.cpp b/src/app/qgsmaptooldeletepart.cpp
@@ -138,6 +138,7 @@ QgsGeometry* QgsMapToolDeletePart::partUnderPoint( QPoint point, QgsFeatureId& f
       {
         fid = match.featureId();
         partNum = snapVertex;
+        delete geomPart;
         return QgsGeometry::fromPoint( match.point() );
       }
       if ( g->wkbType() == QGis::WKBMultiLineString || g->wkbType() == QGis::WKBMultiLineString25D )
@@ -149,6 +150,7 @@ QgsGeometry* QgsMapToolDeletePart::partUnderPoint( QPoint point, QgsFeatureId& f
           {
             fid = match.featureId();
             partNum = part;
+            delete geomPart;
             return QgsGeometry::fromPolyline( mline[part] );
           }
           snapVertex -= mline[part].count();
@@ -178,6 +180,7 @@ QgsGeometry* QgsMapToolDeletePart::partUnderPoint( QPoint point, QgsFeatureId& f
         {
           fid = f.id();
           partNum = part;
+          delete geomPart;
           return partGeo;
         }
       }

diff --git a/src/gui/attributetable/qgsfeaturemodel.h b/src/gui/attributetable/qgsfeaturemodel.h
@@ -7,6 +7,9 @@
 class QgsFeatureModel
 {
   public:
+    ~ QgsFeatureModel()
+    {}
+
     virtual QModelIndex fidToIndex( QgsFeatureId fid ) = 0;
 };
 

diff --git a/src/providers/postgres/qgspostgresexpressioncompiler.h b/src/providers/postgres/qgspostgresexpressioncompiler.h
@@ -35,15 +35,12 @@ class QgsPostgresExpressionCompiler
 
     Result compile( const QgsExpression* exp );
 
-    inline Result success() { return mSuccess; }
-
     const QString& result() { return mResult; }
 
   private:
     Result compile( const QgsExpression::Node* node, QString& str );
 
   private:
-    Result mSuccess;
     QString mResult;
     QgsPostgresFeatureSource* mSource;
 };

diff --git a/tests/src/core/testqgsfields.cpp b/tests/src/core/testqgsfields.cpp
@@ -230,7 +230,7 @@ void TestQgsFields::remove()
   fields.remove( 0 );
   QCOMPARE( fields.count(), 1 );
   QCOMPARE( fields.at( 0 ).name(), QString( "testfield2" ) );
-  QCOMPARE( fields.indexFromName(QString( "testfield2" )), 0);
+  QCOMPARE( fields.indexFromName( "testfield2" ), 0 );
 }
 
 void TestQgsFields::extend()