Fix some deprecated warnings

qgis · May 20, 2015 · 9076ff8 · 9076ff8
1 parent 267d952
commit 9076ff8
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 27 deletions.
diff --git a/src/app/qgsclipboard.cpp b/src/app/qgsclipboard.cpp
@@ -171,7 +171,7 @@ QgsFeatureList QgsClipboard::copyOf( const QgsFields &fields )
 
     QgsFeature feature;
     if ( !fields.isEmpty() )
-      feature.setFields( &fields, true );
+      feature.setFields( fields, true );
 
     feature.setGeometry( geometry );
     features.append( feature );

diff --git a/src/core/qgsfeaturestore.cpp b/src/core/qgsfeaturestore.cpp
@@ -42,13 +42,13 @@ void QgsFeatureStore::setFields( const QgsFields & fields )
   mFields = fields;
   foreach ( QgsFeature feature, mFeatures )
   {
-    feature.setFields( &mFields );
+    feature.setFields( mFields );
   }
 }
 
 void QgsFeatureStore::addFeature( const QgsFeature& feature )
 {
   QgsFeature f( feature );
-  f.setFields( &mFields );
+  f.setFields( mFields );
   mFeatures.append( f );
 }
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -4129,7 +4129,7 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
       {
         if ( QString( dit.key() + "d" ) == layerName )
         {
-          feature.setFields( &dit.value().fields );
+          feature.setFields( dit.value().fields );
           palGeometry->feature( feature );
 
           //calculate top-left point for diagram

diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -211,7 +211,7 @@ bool QgsVectorLayerFeatureIterator::fetchFeature( QgsFeature& f )
       continue;
 
     // TODO[MD]: just one resize of attributes
-    f.setFields( &mSource->mFields );
+    f.setFields( mSource->mFields );
 
     // update attributes
     if ( mSource->mHasEditBuffer )
@@ -297,7 +297,7 @@ void QgsVectorLayerFeatureIterator::useAddedFeature( const QgsFeature& src, QgsF
 {
   f.setFeatureId( src.id() );
   f.setValid( true );
-  f.setFields( &mSource->mFields );
+  f.setFields( mSource->mFields );
 
   if ( src.constGeometry() && !( mRequest.flags() & QgsFeatureRequest::NoGeometry ) )
   {
@@ -381,7 +381,7 @@ void QgsVectorLayerFeatureIterator::useChangedAttributeFeature( QgsFeatureId fid
 {
   f.setFeatureId( fid );
   f.setValid( true );
-  f.setFields( &mSource->mFields );
+  f.setFields( mSource->mFields );
 
   if ( !( mRequest.flags() & QgsFeatureRequest::NoGeometry ) )
   {

diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -279,7 +279,7 @@ void QgsAttributeForm::onAttributeAdded( int idx )
     QgsAttributes attrs = mFeature.attributes();
     Q_ASSERT( attrs.size() == idx );
     attrs.append( QVariant( layer()->pendingFields()[idx].type() ) );
-    mFeature.setFields( &layer()->pendingFields() );
+    mFeature.setFields( layer()->pendingFields() );
     mFeature.setAttributes( attrs );
   }
   init();
@@ -292,7 +292,7 @@ void QgsAttributeForm::onAttributeDeleted( int idx )
   {
     QgsAttributes attrs = mFeature.attributes();
     attrs.remove( idx );
-    mFeature.setFields( &layer()->pendingFields() );
+    mFeature.setFields( layer()->pendingFields() );
     mFeature.setAttributes( attrs );
   }
   init();

diff --git a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
@@ -306,7 +306,7 @@ bool QgsDelimitedTextFeatureIterator::nextFeatureInternal( QgsFeature& feature )
     // At this point the current feature values are valid
 
     feature.setValid( true );
-    feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+    feature.setFields( mSource->mFields ); // allow name-based attribute lookups
     feature.setFeatureId( fid );
     feature.initAttributes( mSource->mFields.count() );
 

diff --git a/src/providers/gpx/qgsgpxfeatureiterator.cpp b/src/providers/gpx/qgsgpxfeatureiterator.cpp
@@ -190,7 +190,7 @@ bool QgsGPXFeatureIterator::readWaypoint( const QgsWaypoint& wpt, QgsFeature& fe
   }
   feature.setFeatureId( wpt.id );
   feature.setValid( true );
-  feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+  feature.setFields( mSource->mFields ); // allow name-based attribute lookups
   feature.initAttributes( mSource->mFields.count() );
 
   readAttributes( feature, wpt );
@@ -233,7 +233,7 @@ bool QgsGPXFeatureIterator::readRoute( const QgsRoute& rte, QgsFeature& feature
   }
   feature.setFeatureId( rte.id );
   feature.setValid( true );
-  feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+  feature.setFields( mSource->mFields ); // allow name-based attribute lookups
   feature.initAttributes( mSource->mFields.count() );
 
   readAttributes( feature, rte );
@@ -275,7 +275,7 @@ bool QgsGPXFeatureIterator::readTrack( const QgsTrack& trk, QgsFeature& feature
   }
   feature.setFeatureId( trk.id );
   feature.setValid( true );
-  feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+  feature.setFields( mSource->mFields ); // allow name-based attribute lookups
   feature.initAttributes( mSource->mFields.count() );
 
   readAttributes( feature, trk );

diff --git a/src/providers/memory/qgsmemoryfeatureiterator.cpp b/src/providers/memory/qgsmemoryfeatureiterator.cpp
@@ -118,7 +118,7 @@ bool QgsMemoryFeatureIterator::nextFeatureUsingList( QgsFeature& feature )
     close();
 
   if ( hasFeature )
-    feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+    feature.setFields( mSource->mFields ); // allow name-based attribute lookups
 
   return hasFeature;
 }
@@ -167,7 +167,7 @@ bool QgsMemoryFeatureIterator::nextFeatureTraverseAll( QgsFeature& feature )
     feature = mSelectIterator.value();
     ++mSelectIterator;
     feature.setValid( true );
-    feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+    feature.setFields( mSource->mFields ); // allow name-based attribute lookups
   }
   else
     close();

diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -157,7 +157,7 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature )
   if ( mQuery->next() )
   {
     feature.initAttributes( mSource->mFields.count() );
-    feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+    feature.setFields( mSource->mFields ); // allow name-based attribute lookups
 
     for ( int i = 0; i < mAttributesToFetch.count(); i++ )
     {

diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -277,7 +277,7 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )
 {
   feature.setFeatureId( OGR_F_GetFID( fet ) );
   feature.initAttributes( mSource->mFields.count() );
-  feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+  feature.setFields( mSource->mFields ); // allow name-based attribute lookups
 
   bool useIntersect = mRequest.flags() & QgsFeatureRequest::ExactIntersect;
   bool geometryTypeFilter = mSource->mOgrGeometryTypeFilter != wkbUnknown;

diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -161,7 +161,7 @@ bool QgsPostgresFeatureIterator::fetchFeature( QgsFeature& feature )
   mFetched++;
 
   feature.setValid( true );
-  feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+  feature.setFields( mSource->mFields ); // allow name-based attribute lookups
 
   return true;
 }

diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
@@ -312,7 +312,7 @@ bool QgsSpatiaLiteFeatureIterator::getFeature( sqlite3_stmt *stmt, QgsFeature &f
   }
 
   feature.initAttributes( mSource->mFields.count() );
-  feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+  feature.setFields( mSource->mFields ); // allow name-based attribute lookups
 
   int ic;
   int n_columns = sqlite3_column_count( stmt );

diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp
@@ -143,7 +143,7 @@ void QgsWFSFeatureIterator::copyFeature( const QgsFeature* f, QgsFeature& featur
   //id and valid
   feature.setValid( true );
   feature.setFeatureId( f->id() );
-  feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
+  feature.setFields( mSource->mFields ); // allow name-based attribute lookups
 }
 
 

diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -596,7 +596,7 @@ class TestQgsExpression: public QObject
       QgsFields fields;
       fields.append( QgsField( "col1" ) );
       fields.append( QgsField( "second_column", QVariant::Int ) );
-      f.setFields( &fields, true );
+      f.setFields( fields, true );
       f.setAttribute( QString( "col1" ), QString( "test value" ) );
       f.setAttribute( QString( "second_column" ), 5 );
       QgsExpression exp( "attribute($currentfeature,'col1')" );

diff --git a/tests/src/core/testqgsfeature.cpp b/tests/src/core/testqgsfeature.cpp
@@ -257,12 +257,14 @@ void TestQgsFeature::geometry()
   QCOMPARE( *feature.constGeometry()->asWkb(), *mGeometry.data()->asWkb() );
 
   //geometryAndOwnership
+Q_NOWARN_DEPRECATED_PUSH
   copy = feature;
   QCOMPARE( *copy.constGeometry()->asWkb(), *mGeometry.data()->asWkb() );
   QgsGeometry* geom1 = copy.geometryAndOwnership();
   QCOMPARE( *geom1->asWkb(), *mGeometry->asWkb() );
   QgsGeometry* geom2 = feature.geometryAndOwnership();
   QCOMPARE( *geom2->asWkb(), *mGeometry->asWkb() );
+Q_NOWARN_DEPRECATED_POP
   delete geom1;
   delete geom2;
 }
@@ -285,15 +287,15 @@ void TestQgsFeature::fields()
 {
   QgsFeature original;
   QVERIFY( original.fields()->isEmpty() );
-  original.setFields( &mFields );
+  original.setFields( mFields );
   QCOMPARE( *original.fields(), mFields );
   QgsFeature copy( original );
   QCOMPARE( *copy.fields(), *original.fields() );
 
   //test detach
   QgsFields newFields( mFields );
   newFields.remove( 2 );
-  copy.setFields( &newFields );
+  copy.setFields( newFields );
   QCOMPARE( *copy.fields(), newFields );
   QCOMPARE( *original.fields(), mFields );
 
@@ -303,7 +305,7 @@ void TestQgsFeature::fields()
   copy.setAttribute( 0, 1 );
   copy.setAttribute( 1, 2 );
   copy.setAttribute( 2, 3 );
-  copy.setFields( &mFields, false );
+  copy.setFields( mFields, false );
   QCOMPARE( *copy.fields(), mFields );
   //should be 3 invalid attributes
   QCOMPARE( copy.attributes().count(), 3 );
@@ -317,7 +319,7 @@ void TestQgsFeature::fields()
   copy.setAttribute( 0, 1 );
   copy.setAttribute( 1, 2 );
   copy.setAttribute( 2, 3 );
-  copy.setFields( &mFields, true );
+  copy.setFields( mFields, true );
   QCOMPARE( *copy.fields(), mFields );
   //should be 3 invalid attributes
   QCOMPARE( copy.attributes().count(), 3 );
@@ -328,7 +330,7 @@ void TestQgsFeature::fields()
 
   //test fieldNameIndex
   copy = original;
-  copy.setFields( &mFields );
+  copy.setFields( mFields );
   QCOMPARE( copy.fieldNameIndex( "bad" ), -1 );
   QCOMPARE( copy.fieldNameIndex( "field1" ), 0 );
   QCOMPARE( copy.fieldNameIndex( "field2" ), 1 );
@@ -337,7 +339,7 @@ void TestQgsFeature::fields()
 void TestQgsFeature::attributeUsingField()
 {
   QgsFeature feature;
-  feature.setFields( &mFields, true );
+  feature.setFields( mFields, true );
   feature.setAttribute( 0, QString( "attr1" ) );
   feature.setAttribute( 1, QString( "attr2" ) );
   feature.setAttribute( 2, QString( "attr3" ) );