sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Nyall Dawson 2015-08-26 06:52:02 +10:00
parent 05b8a985a5
commit e04f4018d1
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/core/qgsconditionalstyle.sip
View File

@ -24,6 +24,7 @@ class QgsConditionalLayerStyles
/**
* @brief Set the conditional styles for the field UI properties.
* @param fieldName name of field
* @param styles
*/
void setFieldStyles( QString fieldName, QList<QgsConditionalStyle> styles );
@ -36,11 +37,11 @@ class QgsConditionalLayerStyles
/** Reads field ui properties specific state from Dom node.
*/
virtual bool readXml( const QDomNode& node );
bool readXml( const QDomNode& node );
/** Write field ui properties specific state from Dom node.
*/
virtual bool writeXml( QDomNode & node, QDomDocument & doc ) const;
bool writeXml( QDomNode & node, QDomDocument & doc ) const;
};
/** \class QgsConditionalStyle

2
python/core/qgsvectorlayer.sip
View File

@ -1245,7 +1245,7 @@ class QgsVectorLayer : QgsMapLayer
/**
* @brief Return the conditional styles that are set for this layer. Style information is
* used to render conditional formatting in the attribute table.
* @return Return a \class QgsConditionalLayerStyles object holding the conditional attribute
* @return Return a QgsConditionalLayerStyles object holding the conditional attribute
* style information. Style information is generic and can be used for anything.
* @note added in QGIS 2.12
*/

2
src/core/qgsconditionalstyle.cpp
View File

@ -119,12 +119,12 @@ QgsConditionalStyle::QgsConditionalStyle( QString rule )
QgsConditionalStyle::QgsConditionalStyle( const QgsConditionalStyle &other )
: mValid( other.mValid )
, mName( other.mName )
, mRule( other.mRule )
, mFont( other.mFont )
, mBackColor( other.mBackColor )
, mTextColor( other.mTextColor )
, mIcon( other.mIcon )
, mName( other.mName )
{
if ( other.mSymbol.data() )
mSymbol.reset( other.mSymbol->clone() );

5
src/core/qgsconditionalstyle.h
View File

@ -36,6 +36,7 @@ class CORE_EXPORT QgsConditionalLayerStyles
/**
* @brief Set the conditional styles for the field UI properties.
* @param fieldName name of field
* @param styles
*/
void setFieldStyles( QString fieldName, QList<QgsConditionalStyle> styles );
@ -48,11 +49,11 @@ class CORE_EXPORT QgsConditionalLayerStyles
/** Reads field ui properties specific state from Dom node.
*/
virtual bool readXml( const QDomNode& node );
bool readXml( const QDomNode& node );
/** Write field ui properties specific state from Dom node.
*/
virtual bool writeXml( QDomNode & node, QDomDocument & doc ) const;
bool writeXml( QDomNode & node, QDomDocument & doc ) const;
private:
QHash<QString, QgsConditionalStyles> mFieldStyles;

2
src/core/qgsvectorlayer.h
View File

@ -1768,7 +1768,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
/**
* @brief Return the conditional styles that are set for this layer. Style information is
* used to render conditional formatting in the attribute table.
* @return Return a \class QgsConditionalLayerStyles object holding the conditional attribute
* @return Return a QgsConditionalLayerStyles object holding the conditional attribute
* style information. Style information is generic and can be used for anything.
* @note added in QGIS 2.12
*/