Small renaming of typedef / member variable

qgis · Jun 10, 2014 · c547aba · c547aba
1 parent ec310a0
commit c547aba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
@@ -69,7 +69,7 @@ void QgsInvertedPolygonRenderer::startRender( QgsRenderContext& context, const Q
     return;
   }
 
-  mFeaturesCategoryMap.clear();
+  mFeaturesCategories.clear();
   mFeatureDecorations.clear();
   mFields = fields;
 
@@ -177,11 +177,11 @@ bool QgsInvertedPolygonRenderer::renderFeature( QgsFeature& feature, QgsRenderCo
     // store the first feature
     cFeat.feature = feature;
     mSymbolCategories.insert( catId, mSymbolCategories.count() );
-    mFeaturesCategoryMap.append( cFeat );
+    mFeaturesCategories.append( cFeat );
   }
 
   // update the geometry
-  CombinedFeature& cFeat = mFeaturesCategoryMap[ mSymbolCategories[catId] ];
+  CombinedFeature& cFeat = mFeaturesCategories[ mSymbolCategories[catId] ];
   QgsMultiPolygon multi;
   QgsGeometry* geom = feature.geometry();
   if ( !geom )
@@ -265,7 +265,7 @@ void QgsInvertedPolygonRenderer::stopRender( QgsRenderContext& context )
     return;
   }
 
-  for ( FeatureCategoryMap::iterator cit = mFeaturesCategoryMap.begin(); cit != mFeaturesCategoryMap.end(); ++cit )
+  for ( FeatureCategoryVector::iterator cit = mFeaturesCategories.begin(); cit != mFeaturesCategories.end(); ++cit )
   {
     QgsFeature feat( cit->feature );
     if ( !mPreprocessingEnabled )
@@ -293,7 +293,7 @@ void QgsInvertedPolygonRenderer::stopRender( QgsRenderContext& context )
   // warning: when sub renderers have more than one possible symbols,
   // there is no way to choose a correct one, because there is no attribute here
   // in that case, nothing will be rendered
-  if ( mFeaturesCategoryMap.isEmpty() )
+  if ( mFeaturesCategories.isEmpty() )
   {
     // empty feature with default attributes
     QgsFeature feat( mFields );

diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.h b/src/core/symbology-ng/qgsinvertedpolygonrenderer.h
@@ -133,9 +133,9 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2
       QgsMultiPolygon multiPolygon; //< the final combined geometry
       QgsFeature feature;           //< one feature (for attriute-based rendering)
     };
-    typedef QVector<CombinedFeature> FeatureCategoryMap;
+    typedef QVector<CombinedFeature> FeatureCategoryVector;
     /** where features are stored, based on the index of their symbol category @see mSymbolCategories */
-    FeatureCategoryMap mFeaturesCategoryMap;
+    FeatureCategoryVector mFeaturesCategories;
 
     /** maps a category to an index */
     QMap<QByteArray, int> mSymbolCategories;