Fix doxygen and build warnings

nyalldawson · nyalldawson · commit 97805b64d046 · 2014-09-22T18:58:58.000+10:00
diff --git a/src/core/composer/qgscomposerattributetablev2.h b/src/core/composer/qgscomposerattributetablev2.h
@@ -194,7 +194,7 @@ class CORE_EXPORT QgsComposerAttributeTableV2: public QgsComposerTableV2
     QList<QPair<int, bool> > sortAttributes() const;
 
     /**Queries the attribute table's vector layer for attributes to show in the table.
-     * @param content table content
+     * @param contents table content
      * @returns true if attributes were successfully fetched
      * @note not available in python bindings
      */
diff --git a/src/gui/attributetable/qgsattributetabledelegate.cpp b/src/gui/attributetable/qgsattributetabledelegate.cpp
@@ -97,7 +97,7 @@ void QgsAttributeTableDelegate::setModelData( QWidget *editor, QAbstractItemMode
 
   newValue = eww->value();
 
-  if ( oldValue != newValue && newValue.isValid() || oldValue.isNull() != newValue.isNull() )
+  if (( oldValue != newValue && newValue.isValid() ) || oldValue.isNull() != newValue.isNull() )
   {
     vl->beginEditCommand( tr( "Attribute changed" ) );
     vl->changeAttributeValue( fid, fieldIdx, newValue, oldValue );
diff --git a/src/gui/qgscolorwidgets.h b/src/gui/qgscolorwidgets.h
@@ -558,8 +558,8 @@ class GUI_EXPORT QgsColorTextWidget : public QgsColorWidget
      */
     enum ColorTextFormat
     {
-      HexRgb = 0, /*!< #RRGGBB in hexadecimal */
-      HexRgbA, /*!< #RRGGBBAA in hexadecimal, with alpha */
+      HexRgb = 0, /*!< \#RRGGBB in hexadecimal */
+      HexRgbA, /*!< \#RRGGBBAA in hexadecimal, with alpha */
       Rgb, /*!< rgb( r, g, b ) format */
       Rgba /*!< rgba( r, g, b, a ) format, with alpha */
     };

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ void QgsAttributeTableDelegate::setModelData( QWidget *editor, QAbstractItemMode`
`97`	`97`
`98`	`98`	`newValue = eww->value();`
`99`	`99`
`100`		`- if ( oldValue != newValue && newValue.isValid() \|\| oldValue.isNull() != newValue.isNull() )`
	`100`	`+ if (( oldValue != newValue && newValue.isValid() ) \|\| oldValue.isNull() != newValue.isNull() )`
`101`	`101`	`{`
`102`	`102`	`vl->beginEditCommand( tr( "Attribute changed" ) );`
`103`	`103`	`vl->changeAttributeValue( fid, fieldIdx, newValue, oldValue );`