From 6a1c2808d49c26373fa992a27de0088eab33a396 Mon Sep 17 00:00:00 2001
From: Hugo Mercier <hugo.mercier@oslandia.com>
Date: Mon, 24 Sep 2012 09:46:11 +0200
Subject: [PATCH] Clean up the last commit

---
 src/app/composer/qgscomposermapwidget.cpp | 1 -
 src/core/composer/qgscomposeritem.h       | 3 +--
 src/core/composer/qgscomposition.cpp      | 6 +++---
 src/core/composer/qgscomposition.h        | 6 ++++++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
index 45ad6f66c19..74eb16b6925 100644
--- a/src/app/composer/qgscomposermapwidget.cpp
+++ b/src/app/composer/qgscomposermapwidget.cpp
@@ -977,7 +977,6 @@ void QgsComposerMapWidget::on_mIsAtlasCheckBox_stateChanged( int state )
       composition->setAtlasMap( 0 );
     }
   }
-  // TODO: warn
 }
 
 void QgsComposerMapWidget::on_mAtlasCoverageLayerComboBox_currentIndexChanged( int index )
diff --git a/src/core/composer/qgscomposeritem.h b/src/core/composer/qgscomposeritem.h
index 1f9d85babc0..d5c096d6948 100644
--- a/src/core/composer/qgscomposeritem.h
+++ b/src/core/composer/qgscomposeritem.h
@@ -53,8 +53,7 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
       ComposerTable,
       ComposerAttributeTable,
       ComposerTextTable,
-      ComposerFrame,
-      ComposerAtlasMap
+      ComposerFrame
     };
 
     /**Describes the action (move or resize in different directon) to be done during mouse move*/
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
index 1c11b6a8d9d..38d3c37d08c 100644
--- a/src/core/composer/qgscomposition.cpp
+++ b/src/core/composer/qgscomposition.cpp
@@ -46,6 +46,9 @@
 #include <QSettings>
 #include <QDir>
 
+/**
+ * Private members of the QgsAtlasRendering class
+ */
 struct QgsAtlasRendering::QgsAtlasRenderingImpl
 {
   QgsComposition* composition;
@@ -139,7 +142,6 @@ void QgsAtlasRendering::prepareForFeature( size_t featureI )
 	throw std::runtime_error( "Filename eval error: " + impl->filenameExpr->evalErrorString().toStdString() );
       }
 
-      // FIXME resolve labels
       impl->currentFilename = filenameRes.toString();
     }
 
@@ -179,8 +181,6 @@ void QgsAtlasRendering::prepareForFeature( size_t featureI )
       // auto scale
       
       double geom_ratio = geom_rect.width() / geom_rect.height();
-      //      QRectF map_rect = mAtlasMap->boundingRect();
-      //      double map_ratio = map_rect.width() / map_rect.height();
       double map_ratio = impl->origExtent.width() / impl->origExtent.height();
       
       // geometry height is too big
diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
index 223de4f8af5..f249484ae8f 100644
--- a/src/core/composer/qgscomposition.h
+++ b/src/core/composer/qgscomposition.h
@@ -49,6 +49,11 @@ class QgsComposerAttributeTable;
 class QgsComposerMultiFrame;
 class QgsComposerMultiFrameCommand;
 
+/** \ingroup MapComposer
+ * Class used to render an Atlas, iterating over geometry features.
+ * prepareForFeature() modifies the atlas map's extent to zoom on the given feature.
+ * This class is used for printing, exporting to PDF and images.
+ * */
 class QgsAtlasRendering
 {
  public:
@@ -62,6 +67,7 @@ class QgsAtlasRendering
   QString currentFilename() const;
 
  private:
+  // Use the PImpl idiom for private members.
   struct QgsAtlasRenderingImpl;
   std::auto_ptr<QgsAtlasRenderingImpl> impl;
 };