Some (very minor) coverity fixes

nyalldawson · nyalldawson · commit f39fbf4ef6d5 · 2015-06-04T21:48:46.000+10:00
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -79,6 +79,7 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )
     , mAllowMapIdentification( false )
     , mOrderByValue( false )
     , mOpenFormButtonVisible( true )
+    , mChainFilters( false )
 {
   mTopLayout = new QVBoxLayout( this );
   mTopLayout->setContentsMargins( 0, 0, 0, 0 );
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -1401,7 +1401,7 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
   //However, in order to make attribute only queries via the FILTER parameter, it is allowed to skip them if the FILTER parameter is there
 
   QgsRectangle* featuresRect = 0;
-  QgsPoint* infoPoint = 0;
+  QScopedPointer<QgsPoint> infoPoint;
 
   if ( i == -1 || j == -1 )
   {
@@ -1416,8 +1416,8 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
   }
   else
   {
-    infoPoint = new QgsPoint();
-    if ( !infoPointToMapCoordinates( i, j, infoPoint, mMapRenderer ) )
+    infoPoint.reset( new QgsPoint() );
+    if ( !infoPointToMapCoordinates( i, j, infoPoint.data(), mMapRenderer ) )
     {
       return 5;
     }
@@ -1539,7 +1539,7 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
 
       if ( vectorLayer )
       {
-        if ( featureInfoFromVectorLayer( vectorLayer, infoPoint, featureCount, result, layerElement, mMapRenderer, renderContext,
+        if ( featureInfoFromVectorLayer( vectorLayer, infoPoint.data(), featureCount, result, layerElement, mMapRenderer, renderContext,
                                          version, infoFormat, featuresRect ) != 0 )
         {
           continue;
@@ -1556,11 +1556,11 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
         QgsRasterLayer* rasterLayer = dynamic_cast<QgsRasterLayer*>( currentLayer );
         if ( rasterLayer )
         {
-          if ( !infoPoint )
+          if ( !infoPoint.data() )
           {
             continue;
           }
-          QgsPoint layerInfoPoint = mMapRenderer->mapToLayerCoordinates( currentLayer, *infoPoint );
+          QgsPoint layerInfoPoint = mMapRenderer->mapToLayerCoordinates( currentLayer, *(infoPoint.data()) );
           if ( featureInfoFromRasterLayer( rasterLayer, &layerInfoPoint, result, layerElement, version, infoFormat ) != 0 )
           {
             continue;
diff --git a/tests/src/core/testqgspainteffect.cpp b/tests/src/core/testqgspainteffect.cpp
@@ -86,6 +86,10 @@ class DummyPaintEffect : public QgsPaintEffect
 class TestQgsPaintEffect: public QObject
 {
     Q_OBJECT
+
+  public:
+    TestQgsPaintEffect();
+
   private slots:
     void initTestCase();// will be called before the first testfunction is executed.
     void cleanupTestCase();// will be called after the last testfunction was executed.
@@ -121,6 +125,12 @@ class TestQgsPaintEffect: public QObject
 };
 
 
+TestQgsPaintEffect::TestQgsPaintEffect()
+   : mPicture( 0 )
+{
+
+}
+
 void TestQgsPaintEffect::initTestCase()
 {
   QgsApplication::init();
diff --git a/tests/src/core/testqgsstylev2.cpp b/tests/src/core/testqgsstylev2.cpp
@@ -80,6 +80,9 @@ class TestStyleV2 : public QObject
 
 TestStyleV2::TestStyleV2()
     : mStyle( NULL )
+    , mpPointsLayer( 0 )
+    , mpLinesLayer( 0 )
+    , mpPolysLayer( 0 )
 {
 
 }

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )`
`79`	`79`	`, mAllowMapIdentification( false )`
`80`	`80`	`, mOrderByValue( false )`
`81`	`81`	`, mOpenFormButtonVisible( true )`
	`82`	`+ , mChainFilters( false )`
`82`	`83`	`{`
`83`	`84`	`mTopLayout = new QVBoxLayout( this );`
`84`	`85`	`mTopLayout->setContentsMargins( 0, 0, 0, 0 );`
Original file line number	Diff line number	Diff line change
`@@ -1401,7 +1401,7 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )`
`1401`	`1401`	`//However, in order to make attribute only queries via the FILTER parameter, it is allowed to skip them if the FILTER parameter is there`
`1402`	`1402`
`1403`	`1403`	`QgsRectangle* featuresRect = 0;`
`1404`		`- QgsPoint* infoPoint = 0;`
	`1404`	`+ QScopedPointer<QgsPoint> infoPoint;`
`1405`	`1405`
`1406`	`1406`	`if ( i == -1 \|\| j == -1 )`
`1407`	`1407`	`{`
`@@ -1416,8 +1416,8 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )`
`1416`	`1416`	`}`
`1417`	`1417`	`else`
`1418`	`1418`	`{`
`1419`		`- infoPoint = new QgsPoint();`
`1420`		`- if ( !infoPointToMapCoordinates( i, j, infoPoint, mMapRenderer ) )`
	`1419`	`+ infoPoint.reset( new QgsPoint() );`
	`1420`	`+ if ( !infoPointToMapCoordinates( i, j, infoPoint.data(), mMapRenderer ) )`
`1421`	`1421`	`{`
`1422`	`1422`	`return 5;`
`1423`	`1423`	`}`
`@@ -1539,7 +1539,7 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )`
`1539`	`1539`
`1540`	`1540`	`if ( vectorLayer )`
`1541`	`1541`	`{`
`1542`		`- if ( featureInfoFromVectorLayer( vectorLayer, infoPoint, featureCount, result, layerElement, mMapRenderer, renderContext,`
	`1542`	`+ if ( featureInfoFromVectorLayer( vectorLayer, infoPoint.data(), featureCount, result, layerElement, mMapRenderer, renderContext,`
`1543`	`1543`	`version, infoFormat, featuresRect ) != 0 )`
`1544`	`1544`	`{`
`1545`	`1545`	`continue;`
`@@ -1556,11 +1556,11 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )`
`1556`	`1556`	`QgsRasterLayer* rasterLayer = dynamic_cast<QgsRasterLayer*>( currentLayer );`
`1557`	`1557`	`if ( rasterLayer )`
`1558`	`1558`	`{`
`1559`		`- if ( !infoPoint )`
	`1559`	`+ if ( !infoPoint.data() )`
`1560`	`1560`	`{`
`1561`	`1561`	`continue;`
`1562`	`1562`	`}`
`1563`		`- QgsPoint layerInfoPoint = mMapRenderer->mapToLayerCoordinates( currentLayer, *infoPoint );`
	`1563`	`+ QgsPoint layerInfoPoint = mMapRenderer->mapToLayerCoordinates( currentLayer, *(infoPoint.data()) );`
`1564`	`1564`	`if ( featureInfoFromRasterLayer( rasterLayer, &layerInfoPoint, result, layerElement, version, infoFormat ) != 0 )`
`1565`	`1565`	`{`
`1566`	`1566`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,9 @@ class TestStyleV2 : public QObject`
`80`	`80`
`81`	`81`	`TestStyleV2::TestStyleV2()`
`82`	`82`	`: mStyle( NULL )`
	`83`	`+ , mpPointsLayer( 0 )`
	`84`	`+ , mpLinesLayer( 0 )`
	`85`	`+ , mpPolysLayer( 0 )`
`83`	`86`	`{`
`84`	`87`
`85`	`88`	`}`