doxygen fixes

qgis · Aug 17, 2014 · 4f367f5 · 4f367f5
1 parent 07165ea
commit 4f367f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -382,10 +382,12 @@ namespace pal
     //if (nbp==2)
     //   beta = M_PI/2;
 
-    /*double distlabel =  unit_convert( this->distlabel,
+#if 0
+    double distlabel =  unit_convert( this->distlabel,
                                      pal::PIXEL,
                                      layer->pal->map_unit,
-                                     dpi, scale, delta_width );*/
+                                     dpi, scale, delta_width );
+#endif
 
     double lx, ly; /* label pos */
 
@@ -529,10 +531,12 @@ namespace pal
                         dpi, scale, delta_width );
 
 
-    /*double distlabel = unit_convert( this->distlabel,
+#if 0
+    double distlabel = unit_convert( this->distlabel,
                                      pal::PIXEL,
                                      layer->pal->map_unit,
-                                     dpi, scale, delta_width );*/
+                                     dpi, scale, delta_width );
+#endif
 
 
     double *d; // segments lengths distance bw pt[i] && pt[i+1]

diff --git a/src/core/pal/feature.h b/src/core/pal/feature.h
@@ -173,6 +173,7 @@ namespace pal
        * \param y y coordinates of the point
        * \param scale map scale is 1:scale
        * \param lPos pointer to an array of candidates, will be filled by generated candidates
+       * \param delta_width delta width
        * \param angle orientation of the label
        * \return the number of generated cadidates
        */
@@ -189,6 +190,7 @@ namespace pal
        * \param scale map scale is 1:scale
        * \param lPos pointer to an array of candidates, will be filled by generated candidates
        * \param mapShape a pointer to the line
+       * \param delta_width delta width
        * \return the number of generated cadidates
        */
       int setPositionForLine( double scale, LabelPosition ***lPos, PointSet *mapShape, double delta_width );
@@ -207,6 +209,7 @@ namespace pal
        * \param scale map scale is 1:scale
        * \param lPos pointer to an array of candidates, will be filled by generated candidates
        * \param mapShape a pointer to the polygon
+       * \param delta_width delta width
        * \return the number of generated cadidates
        */
       int setPositionForPolygon( double scale, LabelPosition ***lPos, PointSet *mapShape, double delta_width );

diff --git a/src/gui/qgscolorswatchgrid.h b/src/gui/qgscolorswatchgrid.h
@@ -131,7 +131,7 @@ class GUI_EXPORT QgsColorSwatchGrid: public QWidget
     void draw( QPainter &painter );
 
     /**Calculate swatch corresponding to a position within the widget
-     * @param pos position
+     * @param position position
      * @returns swatch number (starting at 0), or -1 if position is outside a swatch
      */
     int swatchForPosition( const QPoint &position ) const;