[QGIS Commit] r15185 - in trunk/qgis/src/core: . composer

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-17 14:33:13 -0800 (Thu, 17 Feb 2011)
New Revision: 15185

Modified:
   trunk/qgis/src/core/composer/qgscomposerlegenditem.h
   trunk/qgis/src/core/qgsproject.cpp
   trunk/qgis/src/core/qgsvectorlayer.h
   trunk/qgis/src/core/qgsvectorlayerjoinbuffer.h
Log:
doxygen fixes

Modified: trunk/qgis/src/core/composer/qgscomposerlegenditem.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerlegenditem.h	2011-02-17 12:58:09 UTC (rev 15184)
+++ trunk/qgis/src/core/composer/qgscomposerlegenditem.h	2011-02-17 22:33:13 UTC (rev 15185)
@@ -43,6 +43,7 @@
 
     virtual void writeXML( QDomElement& elem, QDomDocument& doc ) const = 0;
     /**Read item content from xml
+      @param itemElem item to read from
       @param xServerAvailable Read item icons if true (QIcon needs x-server)*/
     virtual void readXML( const QDomElement& itemElem, bool xServerAvailable = true ) = 0;
 

Modified: trunk/qgis/src/core/qgsproject.cpp
===================================================================
--- trunk/qgis/src/core/qgsproject.cpp	2011-02-17 12:58:09 UTC (rev 15184)
+++ trunk/qgis/src/core/qgsproject.cpp	2011-02-17 22:33:13 UTC (rev 15185)
@@ -763,7 +763,7 @@
 
 
 /**
-   @note it's presumed that the caller has already reset the map canvas, map registry, and legend
+   it's presumed that the caller has already reset the map canvas, map registry, and legend
  */
 bool QgsProject::read()
 {

Modified: trunk/qgis/src/core/qgsvectorlayer.h
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.h	2011-02-17 12:58:09 UTC (rev 15184)
+++ trunk/qgis/src/core/qgsvectorlayer.h	2011-02-17 22:33:13 UTC (rev 15185)
@@ -758,7 +758,7 @@
       @param joinFieldName name of the (source) join Field
       @param joinValue lookup value for join
       @param attributes (join layer) attribute indices to add
-      @param attributeOffset index offset to get from join layer attribute index to layer index*/
+      @param attributeIndexOffset index offset to get from join layer attribute index to layer index*/
     void addJoinedFeatureAttributes( QgsFeature& f, const QgsVectorJoinInfo& joinInfo, const QString& joinFieldName, const QVariant& joinValue,
                                      const QgsAttributeList& attributes, int attributeIndexOffset );
 

Modified: trunk/qgis/src/core/qgsvectorlayerjoinbuffer.h
===================================================================
--- trunk/qgis/src/core/qgsvectorlayerjoinbuffer.h	2011-02-17 12:58:09 UTC (rev 15184)
+++ trunk/qgis/src/core/qgsvectorlayerjoinbuffer.h	2011-02-17 22:33:13 UTC (rev 15185)
@@ -32,8 +32,7 @@
     ~QgsVectorLayerJoinBuffer();
 
     /**Joins another vector layer to this layer
-      @param joinInfo join object containing join layer id, target and source field
-      @param cacheInMemory if true: caches the content of the join layer in virtual memory*/
+      @param joinInfo join object containing join layer id, target and source field */
     void addJoin( QgsVectorJoinInfo joinInfo );
 
     /**Removes  a vector layer join*/
@@ -89,7 +88,7 @@
       @param joinFieldName name of the (source) join Field
       @param joinValue lookup value for join
       @param attributes (join layer) attribute indices to add
-      @param attributeOffset index offset to get from join layer attribute index to layer index*/
+      @param attributeIndexOffset index offset to get from join layer attribute index to layer index*/
     void addJoinedFeatureAttributes( QgsFeature& f, const QgsVectorJoinInfo& joinInfo, const QString& joinFieldName, const QVariant& joinValue,
                                      const QgsAttributeList& attributes, int attributeIndexOffset );