Merge pull request #5229 from m-kuhn/cleanCode

m-kuhn · web-flow · commit 06dc9660a345 · 2017-09-21T11:32:34.000+02:00
Clean code
diff --git a/python/gui/qgsmaplayerconfigwidgetfactory.sip b/python/gui/qgsmaplayerconfigwidgetfactory.sip
@@ -69,6 +69,7 @@ Constructor
     virtual bool supportsStyleDock() const;
 %Docstring
  Flag if widget is supported for use in style dock.
+ The default implementation returns false.
  :return: True if supported
  :rtype: bool
 %End
@@ -82,6 +83,7 @@ Constructor
     virtual bool supportLayerPropertiesDialog() const;
 %Docstring
  Flag if widget is supported for use in layer properties dialog.
+ The default implementation returns false.
  :return: True if supported
  :rtype: bool
 %End
diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -59,17 +59,27 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
     QgsVectorLayerProperties( QgsVectorLayer *lyr = nullptr, QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
 
     //! Returns the display name entered in the dialog
-    QString displayName();
-    void setRendererDirty( bool ) {}
+    QString displayName()
+    {
+      return txtDisplayName->text();
+    }
 
-    /** Adds an attribute to the table (but does not commit it yet)
-    \param field the field to add
-    \returns false in case of a name conflict, true in case of success */
+    /**
+     * Adds an attribute to the layer.
+     * The layer will need to be in edit mode. It will only be added to the provider when the edit buffer
+     * is committed.
+     * \param field the field to add
+     * \returns false in case of a name conflict, true in case of success
+     */
     bool addAttribute( const QgsField &field );
 
-    /** Deletes an attribute (but does not commit it)
-      \param name attribute name
-      \returns false in case of a non-existing attribute.*/
+    /**
+     * Deletes an attribute.
+     * The layer will need to be in edit mode. It will only be added to the provider when the edit buffer
+     * is committed.
+     * \param name attribute name
+     * \returns false in case of a non-existing attribute.
+     */
     bool deleteAttribute( int attr );
 
     //! Adds a properties page factory to the vector layer properties dialog.
@@ -206,8 +216,5 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
     void openPanel( QgsPanelWidget *panel );
 };
 
-inline QString QgsVectorLayerProperties::displayName()
-{
-  return txtDisplayName->text();
-}
+
 #endif
diff --git a/src/gui/qgsmaplayerconfigwidgetfactory.h b/src/gui/qgsmaplayerconfigwidgetfactory.h
@@ -70,6 +70,7 @@ class GUI_EXPORT QgsMapLayerConfigWidgetFactory
 
     /**
      * Flag if widget is supported for use in style dock.
+     * The default implementation returns false.
      * \returns True if supported
      */
     virtual bool supportsStyleDock() const { return false; }
@@ -82,6 +83,7 @@ class GUI_EXPORT QgsMapLayerConfigWidgetFactory
 
     /**
      * Flag if widget is supported for use in layer properties dialog.
+     * The default implementation returns false.
      * \returns True if supported
      */
     virtual bool supportLayerPropertiesDialog() const { return false; }
