Replace use of deprecated std::auto_ptr with QScopedPointer

qgis · Jan 12, 2015 · 33857db · 33857db
1 parent fa903dd
commit 33857db
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -213,10 +213,10 @@ int QgsAtlasComposition::updateFeatures()
   // select all features with all attributes
   QgsFeatureIterator fit = mCoverageLayer->getFeatures();
 
-  std::auto_ptr<QgsExpression> filterExpression;
+  QScopedPointer<QgsExpression> filterExpression;
   if ( mFilterFeatures && !mFeatureFilter.isEmpty() )
   {
-    filterExpression = std::auto_ptr<QgsExpression>( new QgsExpression( mFeatureFilter ) );
+    filterExpression.reset( new QgsExpression( mFeatureFilter ) );
     if ( filterExpression->hasParserError() )
     {
       mFilterParserError = filterExpression->parserErrorString();
@@ -233,7 +233,7 @@ int QgsAtlasComposition::updateFeatures()
   int sortIdx = mCoverageLayer->fieldNameIndex( mSortKeyAttributeName );
   while ( fit.nextFeature( feat ) )
   {
-    if ( mFilterFeatures && !mFeatureFilter.isEmpty() )
+    if ( !filterExpression.isNull() )
     {
       QVariant result = filterExpression->evaluate( &feat, mCoverageLayer->pendingFields() );
       if ( filterExpression->hasEvalError() )
@@ -784,7 +784,7 @@ bool QgsAtlasComposition::updateFilenameExpression()
 
   if ( mFilenamePattern.size() > 0 )
   {
-    mFilenameExpr = std::auto_ptr<QgsExpression>( new QgsExpression( mFilenamePattern ) );
+    mFilenameExpr.reset( new QgsExpression( mFilenamePattern ) );
     // expression used to evaluate each filename
     // test for evaluation errors
     if ( mFilenameExpr->hasParserError() )
@@ -808,7 +808,7 @@ bool QgsAtlasComposition::updateFilenameExpression()
 bool QgsAtlasComposition::evalFeatureFilename()
 {
   //generate filename for current atlas feature
-  if ( mFilenamePattern.size() > 0 )
+  if ( mFilenamePattern.size() > 0 && !mFilenameExpr.isNull() )
   {
     QVariant filenameRes = mFilenameExpr->evaluate( &mCurrentFeature, mCoverageLayer->pendingFields() );
     if ( mFilenameExpr->hasEvalError() )

diff --git a/src/core/composer/qgsatlascomposition.h b/src/core/composer/qgsatlascomposition.h
@@ -334,7 +334,7 @@ class CORE_EXPORT QgsAtlasComposition : public QObject
 
     QgsFeature mCurrentFeature;
 
-    std::auto_ptr<QgsExpression> mFilenameExpr;
+    QScopedPointer<QgsExpression> mFilenameExpr;
 
     // bounding box of the current feature transformed into map crs
     QgsRectangle mTransformedFeatureBounds;

diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp
@@ -378,11 +378,11 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap> &at
   attributeMaps.clear();
 
   //prepare filter expression
-  std::auto_ptr<QgsExpression> filterExpression;
+  QScopedPointer<QgsExpression> filterExpression;
   bool activeFilter = false;
   if ( mFilterFeatures && !mFeatureFilter.isEmpty() )
   {
-    filterExpression = std::auto_ptr<QgsExpression>( new QgsExpression( mFeatureFilter ) );
+    filterExpression.reset( new QgsExpression( mFeatureFilter ) );
     if ( !filterExpression->hasParserError() )
     {
       activeFilter = true;
@@ -422,7 +422,7 @@ bool QgsComposerAttributeTable::getFeatureAttributes( QList<QgsAttributeMap> &at
   while ( fit.nextFeature( f ) && counter < mMaximumNumberOfFeatures )
   {
     //check feature against filter
-    if ( activeFilter )
+    if ( activeFilter && !filterExpression.isNull() )
     {
       QVariant result = filterExpression->evaluate( &f, mVectorLayer->pendingFields() );
       // skip this feature if the filter evaluation is false

diff --git a/src/core/composer/qgscomposerattributetablev2.cpp b/src/core/composer/qgscomposerattributetablev2.cpp
@@ -452,11 +452,11 @@ bool QgsComposerAttributeTableV2::getTableContents( QgsComposerTableContents &co
   }
 
   //prepare filter expression
-  std::auto_ptr<QgsExpression> filterExpression;
+  QScopedPointer<QgsExpression> filterExpression;
   bool activeFilter = false;
   if ( mFilterFeatures && !mFeatureFilter.isEmpty() )
   {
-    filterExpression = std::auto_ptr<QgsExpression>( new QgsExpression( mFeatureFilter ) );
+    filterExpression.reset( new QgsExpression( mFeatureFilter ) );
     if ( !filterExpression->hasParserError() )
     {
       activeFilter = true;
@@ -528,7 +528,7 @@ bool QgsComposerAttributeTableV2::getTableContents( QgsComposerTableContents &co
   while ( fit.nextFeature( f ) && counter < mMaximumNumberOfFeatures )
   {
     //check feature against filter
-    if ( activeFilter )
+    if ( activeFilter && !filterExpression.isNull() )
     {
       QVariant result = filterExpression->evaluate( &f, layer->pendingFields() );
       // skip this feature if the filter evaluation is false