Fix warnings, missing docs+bindings

qgis · Jun 6, 2016 · c5b8060 · c5b8060 · NathanW2 · Jun 6, 2016
1 parent 4e10c5b
commit c5b8060
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/python/gui/effects/qgseffectstackpropertieswidget.sip b/python/gui/effects/qgseffectstackpropertieswidget.sip
@@ -68,10 +68,16 @@ class QgsEffectStackPropertiesWidget : QWidget
 
   signals:
     /**
-     * Emiited when something in the widget changes.
+     * Emitted when something in the widget changes.
      */
     void widgetChanged();
 
+    /** Emitted when a panel is shown in the widget.
+     * @param widget widget panel which was shown
+     * @note added in QGIS 2.16
+     */
+    void showPanel( QgsRendererWidgetContainer* widget );
+
   protected:
 
     /** Refreshes the widget to reflect the current state of the stack.

diff --git a/python/gui/symbology-ng/qgsrendererv2widget.sip b/python/gui/symbology-ng/qgsrendererv2widget.sip
@@ -54,10 +54,10 @@ class QgsRendererV2Widget : QWidget
     void widgetChanged();
 
     /** Shows a panel widget inside the renderer widget.
-     * @param container widget panel to show
+     * @param widget widget panel to show
      * @note added in QGIS 2.16
      */
-    void panelOpened( bool opened );
+    void showPanel( QgsRendererWidgetContainer* widget );
 
   protected:
     /** Subclasses may provide the capability of changing multiple symbols at once by implementing the following two methods

diff --git a/src/gui/effects/qgseffectstackpropertieswidget.h b/src/gui/effects/qgseffectstackpropertieswidget.h
@@ -237,6 +237,10 @@ class GUI_EXPORT QgsEffectStackCompactWidget: public QWidget
      */
     void changed();
 
+    /** Emitted when a panel is shown in the widget.
+     * @param widget widget panel which was shown
+     * @note added in QGIS 2.16
+     */
     void showPanel( QgsRendererWidgetContainer* widget );
 
   private slots:

diff --git a/src/gui/qgsexternalresourcewidget.cpp b/src/gui/qgsexternalresourcewidget.cpp
@@ -184,6 +184,7 @@ QString QgsExternalResourceWidget::resolvePath( const QString& path )
       return QDir( mDefaultRoot ).filePath( path );
       break;
   }
+  return QString(); // avoid warnings
 }
 
 QString QgsExternalResourceWidget::defaultRoot() const

diff --git a/src/gui/symbology-ng/qgsrendererv2widget.h b/src/gui/symbology-ng/qgsrendererv2widget.h
@@ -93,7 +93,7 @@ class GUI_EXPORT QgsRendererV2Widget : public QWidget
     void widgetChanged();
 
     /** Shows a panel widget inside the renderer widget.
-     * @param container widget panel to show
+     * @param widget widget panel to show
      * @note added in QGIS 2.16
      */
     void showPanel( QgsRendererWidgetContainer* widget );