sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-06-19 00:02:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

SIP QgsVectorLayer: fix signatures for output parameter

Browse Source 
saveStyleToDatabase() and getStyleFromDatabase() should define errMsg as
output parameter
And loadNamedStyle() also for theResultFlag.
This commit is contained in:
Even Rouault 2016-10-18 22:29:07 +02:00
parent af236c4ef8
commit e237963274
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/api_break.dox
View File

@ -1438,6 +1438,9 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.</li>
<li>Removed fieldNameIndex(), use fields().lookupField() or fields().indexFromName() instead <li>Removed fieldNameIndex(), use fields().lookupField() or fields().indexFromName() instead
<li>Renamed addAttributeAlias() to setFieldAlias() <li>Renamed addAttributeAlias() to setFieldAlias()
<li>Renamed remAttributeAlias() to removeFieldAlias() <li>Renamed remAttributeAlias() to removeFieldAlias()
<li>saveStyleToDatabase(): msgError argument is correctly declared as output argument
<li>getStyleFromDatabase(): msgError argument is correctly declared as output argument
<li>loadNamedStyle(): theResultFlag argument is correctly declared as output argument
</ul> </ul>
\subsection qgis_api_break_3_0_QgsVectorLayerEditBuffer QgsVectorLayerEditBuffer \subsection qgis_api_break_3_0_QgsVectorLayerEditBuffer QgsVectorLayerEditBuffer

10
python/core/qgsvectorlayer.sip
View File

@ -662,11 +662,11 @@ class QgsVectorLayer : QgsMapLayer
* @param description * @param description
* @param useAsDefault * @param useAsDefault
* @param uiFileContent * @param uiFileContent
* @param msgError * @param msgError (out)
*/ */
virtual void saveStyleToDatabase( const QString& name, const QString& description, virtual void saveStyleToDatabase( const QString& name, const QString& description,
bool useAsDefault, const QString& uiFileContent, bool useAsDefault, const QString& uiFileContent,
QString &msgError ); QString &msgError /Out/ );
/** /**
* Lists all the style in db split into related to the layer and not related to * Lists all the style in db split into related to the layer and not related to
@ -682,7 +682,7 @@ class QgsVectorLayer : QgsMapLayer
/** /**
* Will return the named style corresponding to style id provided * Will return the named style corresponding to style id provided
*/ */
virtual QString getStyleFromDatabase( const QString& styleId, QString &msgError ); virtual QString getStyleFromDatabase( const QString& styleId, QString &msgError /Out/ );
/** /**
* Load a named style from file/local db/datasource db * Load a named style from file/local db/datasource db
@ -690,13 +690,13 @@ class QgsVectorLayer : QgsMapLayer
* @param theResultFlag will be set to true if a named style is correctly loaded * @param theResultFlag will be set to true if a named style is correctly loaded
* @param loadFromLocalDb if true forces to load from local db instead of datasource one * @param loadFromLocalDb if true forces to load from local db instead of datasource one
*/ */
virtual QString loadNamedStyle( const QString &theURI, bool &theResultFlag, bool loadFromLocalDb ); virtual QString loadNamedStyle( const QString &theURI, bool &theResultFlag /Out/, bool loadFromLocalDb );
/** /**
* Calls loadNamedStyle( theURI, theResultFlag, false ); * Calls loadNamedStyle( theURI, theResultFlag, false );
* Retained for backward compatibility * Retained for backward compatibility
*/ */
virtual QString loadNamedStyle( const QString &theURI, bool &theResultFlag ); virtual QString loadNamedStyle( const QString &theURI, bool &theResultFlag /Out/ );
/** Read the symbology for the current layer from the Dom node supplied. /** Read the symbology for the current layer from the Dom node supplied.
* @param node node that will contain the symbology definition for this layer. * @param node node that will contain the symbology definition for this layer.