fix typo

qgis · Oct 19, 2015 · 4cdf05f · 4cdf05f
1 parent 4aba0f4
commit 4cdf05f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/python/core/qgsconditionalstyle.sip b/python/core/qgsconditionalstyle.sip
@@ -1,5 +1,6 @@
 typedef QList<QgsConditionalStyle> QgsConditionalStyles;
 
+
 /**
  * @brief The QgsConditionalLayerStyles class holds conditional style information
  * for a layer. This includes field styles and full row styles.
@@ -71,7 +72,7 @@ class QgsConditionalStyle
      * @brief Render a preview icon of the rule.
      * @return QPixmap preview of the style
      */
-    QPixmap renderPreview();
+    QPixmap renderPreview() const;
 
     /**
      * @brief Set the name of the style.  Names are optional but handy for display
@@ -181,19 +182,19 @@ class QgsConditionalStyle
 
     /**
      * @brief Find and return the matching styles for the value and feature.
-     * If no match is found a invalid QgsCondtionalStyle is return.
+     * If no match is found a invalid QgsConditionalStyle is return.
      *
      * @return A condtional style that matches the value and feature.
-     * Check with QgsCondtionalStyle::isValid()
+     * Check with QgsConditionalStyle::isValid()
      */
     static QList<QgsConditionalStyle> matchingConditionalStyles( const QList<QgsConditionalStyle>& styles, const QVariant& value, QgsExpressionContext& context );
 
     /**
      * @brief Find and return the matching style for the value and feature.
-     * If no match is found a invalid QgsCondtionalStyle is return.
+     * If no match is found a invalid QgsConditionalStyle is return.
      *
      * @return A condtional style that matches the value and feature.
-     * Check with QgsCondtionalStyle::isValid()
+     * Check with QgsConditionalStyle::isValid()
      */
     static QgsConditionalStyle matchingConditionalStyle( const QList<QgsConditionalStyle>& styles, const QVariant& value, QgsExpressionContext& context );
 
@@ -211,5 +212,5 @@ class QgsConditionalStyle
 
     /** Write vector conditional style specific state from layer Dom node.
      */
-    virtual bool writeXml( QDomNode & node, QDomDocument & doc );
+    virtual bool writeXml( QDomNode & node, QDomDocument & doc ) const;
 };
diff --git a/src/core/qgsconditionalstyle.h b/src/core/qgsconditionalstyle.h
@@ -60,7 +60,8 @@ class CORE_EXPORT QgsConditionalLayerStyles
     QList<QgsConditionalStyle> mRowStyles;
 };
 
-/** \class QgsFieldFormat
+/** \class QgsConditionalStyle
+ *  \ingroup core
  * Conditional styling for a rule.
  */
 class CORE_EXPORT QgsConditionalStyle
@@ -195,19 +196,19 @@ class CORE_EXPORT QgsConditionalStyle
 
     /**
      * @brief Find and return the matching styles for the value and feature.
-     * If no match is found a invalid QgsCondtionalStyle is return.
+     * If no match is found a invalid QgsConditionalStyle is return.
      *
      * @return A condtional style that matches the value and feature.
-     * Check with QgsCondtionalStyle::isValid()
+     * Check with QgsConditionalStyle::isValid()
      */
     static QList<QgsConditionalStyle> matchingConditionalStyles( const QList<QgsConditionalStyle>& styles, const QVariant& value, QgsExpressionContext& context );
 
     /**
      * @brief Find and return the matching style for the value and feature.
-     * If no match is found a invalid QgsCondtionalStyle is return.
+     * If no match is found a invalid QgsConditionalStyle is return.
      *
      * @return A condtional style that matches the value and feature.
-     * Check with QgsCondtionalStyle::isValid()
+     * Check with QgsConditionalStyle::isValid()
      */
     static QgsConditionalStyle matchingConditionalStyle( const QList<QgsConditionalStyle>& styles, const QVariant& value, QgsExpressionContext& context );
 

diff --git a/src/ui/qgsfieldconditionalformatwidget.ui b/src/ui/qgsfieldconditionalformatwidget.ui
@@ -41,7 +41,7 @@
    <item>
     <widget class="QLabel" name="label_4">
      <property name="text">
-      <string>Condtional Format Rules</string>
+      <string>Conditional Format Rules</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>