merge r9805 from trunk

git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@9806 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

python/core/qgsrasterlayer.sip

@@ -489,7 +489,7 @@ public:
     bool readXml( QDomNode & layer_node );
 
     /** \brief Write the symbology for the layer into the docment provided */
-    bool writeSymbology( QDomNode&, QDomDocument& doc, QString& errorMessage );
+    bool writeSymbology( QDomNode&, QDomDocument& doc, QString& errorMessage ) const;
 
     /** \brief Write layer specific state to project file Dom node */
     bool writeXml( QDomNode & layer_node, QDomDocument & doc );

python/core/qgsvectorlayer.sip

@@ -130,7 +130,7 @@ public:
    * @param errorMessage reference to string that will be updated with any error messages
    *  @return true in case of success.
    */
-  bool writeSymbology(QDomNode&, QDomDocument& doc, QString& errorMessage);
+  bool writeSymbology(QDomNode&, QDomDocument& doc, QString& errorMessage) const;
 
   /**
    * Number of features in the layer. This is necessary if features are