fix atlas composition warnings with msvc 64bit

jef-n · jef-n · commit 618b58b05d98 · 2013-09-05T14:17:07.000+02:00
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -750,7 +750,7 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
     QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
     QApplication::setOverrideCursor( Qt::BusyCursor );
 
-    for ( size_t featureI = 0; featureI < atlasMap->numFeatures(); ++featureI )
+    for ( int featureI = 0; featureI < atlasMap->numFeatures(); ++featureI )
     {
       progress.setValue( featureI );
       // process input events in order to allow aborting
@@ -880,7 +880,7 @@ void QgsComposer::on_mActionPrint_triggered()
     }
     QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
 
-    for ( size_t i = 0; i < atlasMap->numFeatures(); ++i )
+    for ( int i = 0; i < atlasMap->numFeatures(); ++i )
     {
       progress.setValue( i );
       // process input events in order to allow cancelling
@@ -1095,7 +1095,7 @@ void QgsComposer::on_mActionExportAsImage_triggered()
 
     QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
 
-    for ( size_t feature = 0; feature < atlasMap->numFeatures(); ++feature )
+    for ( int feature = 0; feature < atlasMap->numFeatures(); ++feature )
     {
       progress.setValue( feature );
       // process input events in order to allow cancelling
@@ -1246,7 +1246,7 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
 
   mView->setPaintingEnabled( false );
 
-  size_t featureI = 0;
+  int featureI = 0;
   if ( hasAnAtlas )
   {
     try
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -153,7 +153,7 @@ void QgsAtlasComposition::beginRender()
 
     if ( mSortFeatures )
     {
-      mFeatureKeys.insert( std::make_pair( feat.id(), feat.attributes()[ mSortKeyAttributeIdx ] ) );
+      mFeatureKeys.insert( feat.id(), feat.attributes()[ mSortKeyAttributeIdx ] );
     }
   }
 
@@ -211,12 +211,12 @@ void QgsAtlasComposition::endRender()
   mComposerMap->setNewExtent( mOrigExtent );
 }
 
-size_t QgsAtlasComposition::numFeatures() const
+int QgsAtlasComposition::numFeatures() const
 {
   return mFeatureIds.size();
 }
 
-void QgsAtlasComposition::prepareForFeature( size_t featureI )
+void QgsAtlasComposition::prepareForFeature( int featureI )
 {
   if ( !mComposerMap || !mCoverageLayer )
   {
diff --git a/src/core/composer/qgsatlascomposition.h b/src/core/composer/qgsatlascomposition.h
@@ -78,19 +78,19 @@ class CORE_EXPORT QgsAtlasComposition : public QObject
     QString featureFilter() const { return mFeatureFilter; }
     void setFeatureFilter( const QString& expression ) { mFeatureFilter = expression; }
 
-    size_t sortKeyAttributeIndex() const { return mSortKeyAttributeIdx; }
-    void setSortKeyAttributeIndex( size_t idx ) { mSortKeyAttributeIdx = idx; }
+    int sortKeyAttributeIndex() const { return mSortKeyAttributeIdx; }
+    void setSortKeyAttributeIndex( int idx ) { mSortKeyAttributeIdx = idx; }
 
     /** Begins the rendering. */
     void beginRender();
     /** Ends the rendering. Restores original extent */
     void endRender();
 
     /** Returns the number of features in the coverage layer */
-    size_t numFeatures() const;
+    int numFeatures() const;
 
     /** Prepare the atlas map for the given feature. Sets the extent and context variables */
-    void prepareForFeature( size_t i );
+    void prepareForFeature( int i );
 
     /** Returns the current filename. Must be called after prepareForFeature( i ) */
     const QString& currentFilename() const;
@@ -123,12 +123,12 @@ class CORE_EXPORT QgsAtlasComposition : public QObject
     // sort direction
     bool mSortAscending;
   public:
-    typedef std::map< QgsFeatureId, QVariant > SorterKeys;
+    typedef QMap< QgsFeatureId, QVariant > SorterKeys;
   private:
     // value of field that is used for ordering of features
     SorterKeys mFeatureKeys;
     // key (attribute index) used for ordering
-    size_t mSortKeyAttributeIdx;
+    int mSortKeyAttributeIdx;
 
     // feature filtering
     bool mFilterFeatures;
diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp
@@ -153,7 +153,7 @@ void TestQgsAtlasComposition::filename()
 {
   mAtlas->setFilenamePattern( "'output_' || $feature" );
   mAtlas->beginRender();
-  for ( size_t fi = 0; fi < mAtlas->numFeatures(); ++fi )
+  for ( int fi = 0; fi < mAtlas->numFeatures(); ++fi )
   {
     mAtlas->prepareForFeature( fi );
     QString expected = QString( "output_%1" ).arg(( int )( fi + 1 ) );
@@ -170,7 +170,7 @@ void TestQgsAtlasComposition::autoscale_render()
 
   mAtlas->beginRender();
 
-  for ( size_t fit = 0; fit < 2; ++fit )
+  for ( int fit = 0; fit < 2; ++fit )
   {
     mAtlas->prepareForFeature( fit );
     mLabel1->adjustSizeToText();
@@ -191,7 +191,7 @@ void TestQgsAtlasComposition::fixedscale_render()
 
   mAtlas->beginRender();
 
-  for ( size_t fit = 0; fit < 2; ++fit )
+  for ( int fit = 0; fit < 2; ++fit )
   {
     mAtlas->prepareForFeature( fit );
     mLabel1->adjustSizeToText();
@@ -214,7 +214,7 @@ void TestQgsAtlasComposition::hiding_render()
 
   mAtlas->beginRender();
 
-  for ( size_t fit = 0; fit < 2; ++fit )
+  for ( int fit = 0; fit < 2; ++fit )
   {
     mAtlas->prepareForFeature( fit );
     mLabel1->adjustSizeToText();
@@ -240,7 +240,7 @@ void TestQgsAtlasComposition::sorting_render()
 
   mAtlas->beginRender();
 
-  for ( size_t fit = 0; fit < 2; ++fit )
+  for ( int fit = 0; fit < 2; ++fit )
   {
     mAtlas->prepareForFeature( fit );
     mLabel1->adjustSizeToText();
@@ -267,7 +267,7 @@ void TestQgsAtlasComposition::filtering_render()
 
   mAtlas->beginRender();
 
-  for ( size_t fit = 0; fit < 1; ++fit )
+  for ( int fit = 0; fit < 1; ++fit )
   {
     mAtlas->prepareForFeature( fit );
     mLabel1->adjustSizeToText();

Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ void QgsComposer::on_mActionExportAsPDF_triggered()`
`750`	`750`	`QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );`
`751`	`751`	`QApplication::setOverrideCursor( Qt::BusyCursor );`
`752`	`752`
`753`		`- for ( size_t featureI = 0; featureI < atlasMap->numFeatures(); ++featureI )`
	`753`	`+ for ( int featureI = 0; featureI < atlasMap->numFeatures(); ++featureI )`
`754`	`754`	`{`
`755`	`755`	`progress.setValue( featureI );`
`756`	`756`	`// process input events in order to allow aborting`
`@@ -880,7 +880,7 @@ void QgsComposer::on_mActionPrint_triggered()`
`880`	`880`	`}`
`881`	`881`	`QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );`
`882`	`882`
`883`		`- for ( size_t i = 0; i < atlasMap->numFeatures(); ++i )`
	`883`	`+ for ( int i = 0; i < atlasMap->numFeatures(); ++i )`
`884`	`884`	`{`
`885`	`885`	`progress.setValue( i );`
`886`	`886`	`// process input events in order to allow cancelling`
`@@ -1095,7 +1095,7 @@ void QgsComposer::on_mActionExportAsImage_triggered()`
`1095`	`1095`
`1096`	`1096`	`QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );`
`1097`	`1097`
`1098`		`- for ( size_t feature = 0; feature < atlasMap->numFeatures(); ++feature )`
	`1098`	`+ for ( int feature = 0; feature < atlasMap->numFeatures(); ++feature )`
`1099`	`1099`	`{`
`1100`	`1100`	`progress.setValue( feature );`
`1101`	`1101`	`// process input events in order to allow cancelling`
`@@ -1246,7 +1246,7 @@ void QgsComposer::on_mActionExportAsSVG_triggered()`
`1246`	`1246`
`1247`	`1247`	`mView->setPaintingEnabled( false );`
`1248`	`1248`
`1249`		`- size_t featureI = 0;`
	`1249`	`+ int featureI = 0;`
`1250`	`1250`	`if ( hasAnAtlas )`
`1251`	`1251`	`{`
`1252`	`1252`	`try`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ void QgsAtlasComposition::beginRender()`
`153`	`153`
`154`	`154`	`if ( mSortFeatures )`
`155`	`155`	`{`
`156`		`- mFeatureKeys.insert( std::make_pair( feat.id(), feat.attributes()[ mSortKeyAttributeIdx ] ) );`
	`156`	`+ mFeatureKeys.insert( feat.id(), feat.attributes()[ mSortKeyAttributeIdx ] );`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`@@ -211,12 +211,12 @@ void QgsAtlasComposition::endRender()`
`211`	`211`	`mComposerMap->setNewExtent( mOrigExtent );`
`212`	`212`	`}`
`213`	`213`
`214`		`-size_t QgsAtlasComposition::numFeatures() const`
	`214`	`+int QgsAtlasComposition::numFeatures() const`
`215`	`215`	`{`
`216`	`216`	`return mFeatureIds.size();`
`217`	`217`	`}`
`218`	`218`
`219`		`-void QgsAtlasComposition::prepareForFeature( size_t featureI )`
	`219`	`+void QgsAtlasComposition::prepareForFeature( int featureI )`
`220`	`220`	`{`
`221`	`221`	`if ( !mComposerMap \|\| !mCoverageLayer )`
`222`	`222`	`{`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ void TestQgsAtlasComposition::filename()`
`153`	`153`	`{`
`154`	`154`	`mAtlas->setFilenamePattern( "'output_' \|\| $feature" );`
`155`	`155`	`mAtlas->beginRender();`
`156`		`- for ( size_t fi = 0; fi < mAtlas->numFeatures(); ++fi )`
	`156`	`+ for ( int fi = 0; fi < mAtlas->numFeatures(); ++fi )`
`157`	`157`	`{`
`158`	`158`	`mAtlas->prepareForFeature( fi );`
`159`	`159`	`QString expected = QString( "output_%1" ).arg(( int )( fi + 1 ) );`
`@@ -170,7 +170,7 @@ void TestQgsAtlasComposition::autoscale_render()`
`170`	`170`
`171`	`171`	`mAtlas->beginRender();`
`172`	`172`
`173`		`- for ( size_t fit = 0; fit < 2; ++fit )`
	`173`	`+ for ( int fit = 0; fit < 2; ++fit )`
`174`	`174`	`{`
`175`	`175`	`mAtlas->prepareForFeature( fit );`
`176`	`176`	`mLabel1->adjustSizeToText();`
`@@ -191,7 +191,7 @@ void TestQgsAtlasComposition::fixedscale_render()`
`191`	`191`
`192`	`192`	`mAtlas->beginRender();`
`193`	`193`
`194`		`- for ( size_t fit = 0; fit < 2; ++fit )`
	`194`	`+ for ( int fit = 0; fit < 2; ++fit )`
`195`	`195`	`{`
`196`	`196`	`mAtlas->prepareForFeature( fit );`
`197`	`197`	`mLabel1->adjustSizeToText();`
`@@ -214,7 +214,7 @@ void TestQgsAtlasComposition::hiding_render()`
`214`	`214`
`215`	`215`	`mAtlas->beginRender();`
`216`	`216`
`217`		`- for ( size_t fit = 0; fit < 2; ++fit )`
	`217`	`+ for ( int fit = 0; fit < 2; ++fit )`
`218`	`218`	`{`
`219`	`219`	`mAtlas->prepareForFeature( fit );`
`220`	`220`	`mLabel1->adjustSizeToText();`
`@@ -240,7 +240,7 @@ void TestQgsAtlasComposition::sorting_render()`
`240`	`240`
`241`	`241`	`mAtlas->beginRender();`
`242`	`242`
`243`		`- for ( size_t fit = 0; fit < 2; ++fit )`
	`243`	`+ for ( int fit = 0; fit < 2; ++fit )`
`244`	`244`	`{`
`245`	`245`	`mAtlas->prepareForFeature( fit );`
`246`	`246`	`mLabel1->adjustSizeToText();`
`@@ -267,7 +267,7 @@ void TestQgsAtlasComposition::filtering_render()`
`267`	`267`
`268`	`268`	`mAtlas->beginRender();`
`269`	`269`
`270`		`- for ( size_t fit = 0; fit < 1; ++fit )`
	`270`	`+ for ( int fit = 0; fit < 1; ++fit )`
`271`	`271`	`{`
`272`	`272`	`mAtlas->prepareForFeature( fit );`
`273`	`273`	`mLabel1->adjustSizeToText();`