Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix warnings
  • Loading branch information
nyalldawson committed Aug 25, 2015
1 parent 05b8a98 commit e04f401
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
5 changes: 3 additions & 2 deletions python/core/qgsconditionalstyle.sip
Expand Up @@ -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 );
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/core/qgsvectorlayer.sip
Expand Up @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsconditionalstyle.cpp
Expand Up @@ -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() );
Expand Down
5 changes: 3 additions & 2 deletions src/core/qgsconditionalstyle.h
Expand Up @@ -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 );
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectorlayer.h
Expand Up @@ -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
*/
Expand Down

2 comments on commit e04f401

@NathanW2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@nyalldawson
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Please sign in to comment.