Skip to content
Permalink
Browse files

Fix warnings

  • Loading branch information
nyalldawson committed Aug 25, 2015
1 parent 05b8a98 commit e04f4018d1c7bfd3c1a621fbdf65819164f5fe87
@@ -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
@@ -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
*/
@@ -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() );
@@ -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;
@@ -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
*/

2 comments on commit e04f401

@NathanW2

This comment has been minimized.

Copy link
Member

@NathanW2 NathanW2 replied Aug 25, 2015

Sorry about that. Was planning on fixing them first thing this morning.

@nyalldawson

This comment has been minimized.

Copy link
Collaborator Author

@nyalldawson nyalldawson replied Aug 25, 2015

@NathanW2 no worries... Just wanted to make sure my fixes last night hadn't also caused breakage!

Please sign in to comment.
You can’t perform that action at this time.