Remove all previously autoconnected slots from public API

These are implementation details only, and should not be
part of the stable API.

We need the flexibility to change these at any stage without
being bound by any API contract.

python/gui/qgserrordialog.sip

@@ -31,10 +31,6 @@ class QgsErrorDialog: QDialog
  \param fl widget flags
 %End
 
-  public slots:
-    void mDetailPushButton_clicked();
-    void mDetailCheckBox_stateChanged( int state );
-
 };
 
 /************************************************************************

python/gui/qgsnewvectorlayerdialog.sip

@@ -60,19 +60,6 @@ Returns the file format for storage
 .. seealso:: crs()
 %End
 
-  protected slots:
-    void mAddAttributeButton_clicked();
-    void mRemoveAttributeButton_clicked();
-    void mFileFormatComboBox_currentIndexChanged( int index );
-    void mTypeBox_currentIndexChanged( int index );
-
-    void showHelp();
-%Docstring
-Open the associated help
-%End
-    void nameChanged( const QString & );
-    void selectionChanged();
-
 };
 
 /************************************************************************

python/gui/qgsowssourceselect.sip

@@ -48,63 +48,15 @@ Constructor
 Triggered when the provider's connections need to be refreshed
 %End
 
-    void mNewButton_clicked();
-%Docstring
-Opens the create connection dialog to build a new connection
-%End
-    void mEditButton_clicked();
-%Docstring
-Opens a dialog to edit an existing connection
-%End
-    void mDeleteButton_clicked();
-%Docstring
-Deletes the selected connection
-%End
-    void mSaveButton_clicked();
-%Docstring
-Saves connections to the file
-%End
-    void mLoadButton_clicked();
-%Docstring
-Loads connections from the file
-%End
-
-    void mConnectButton_clicked();
-%Docstring
- Connects to the database using the stored connection parameters.
- Once connected, available layers are displayed.
-%End
-
-    void searchFinished();
-
-    void mChangeCRSButton_clicked();
-%Docstring
-Opens the Spatial Reference System dialog.
-%End
-
-    virtual void mLayersTreeWidget_itemSelectionChanged();
-%Docstring
-Signaled when a layer selection is changed.
-%End
-
-    void showStatusMessage( const QString &message );
-%Docstring
-Set status message to theMessage
-%End
-
+  protected slots:
     void showError( const QString &title, const QString &format, const QString &error );
 %Docstring
 show whatever error is exposed.
 %End
 
-    void mConnectionsComboBox_activated( int );
+    void showStatusMessage( const QString &message );
 %Docstring
-Stores the selected datasource whenerver it is changed
-%End
-
-    void mAddDefaultButton_clicked();
-%Docstring
-Add some default wms servers to the list
+Set status message to theMessage
 %End
 
   protected:
@@ -245,7 +197,6 @@ Returns currently selected cache load control
 
 
 
-
 };
 
 /************************************************************************

python/gui/qgsquerybuilder.sip

@@ -39,34 +39,18 @@ class QgsQueryBuilder : QDialog
     virtual void showEvent( QShowEvent *event );
 
 
+    QString sql();
+%Docstring
+ :rtype: str
+%End
+    void setSql( const QString &sqlStatement );
+
   public slots:
     virtual void accept();
 
     virtual void reject();
 
     void clear();
-    void btnEqual_clicked();
-    void btnLessThan_clicked();
-    void btnGreaterThan_clicked();
-    void btnPct_clicked();
-    void btnIn_clicked();
-    void btnNotIn_clicked();
-    void btnLike_clicked();
-    void btnILike_clicked();
-    QString sql();
-%Docstring
- :rtype: str
-%End
-    void setSql( const QString &sqlStatement );
-    void lstFields_clicked( const QModelIndex &index );
-    void lstFields_doubleClicked( const QModelIndex &index );
-    void lstValues_doubleClicked( const QModelIndex &index );
-    void btnLessEqual_clicked();
-    void btnGreaterEqual_clicked();
-    void btnNotEqual_clicked();
-    void btnAnd_clicked();
-    void btnNot_clicked();
-    void btnOr_clicked();
 
     void test();
 %Docstring
@@ -76,19 +60,6 @@ class QgsQueryBuilder : QDialog
  statement.
 %End
 
-    void btnGetAllValues_clicked();
-%Docstring
- Get all distinct values for the field. Values are inserted
- into the value list box
-%End
-
-    void btnSampleValues_clicked();
-%Docstring
- Get sample distinct values for the selected field. The sample size is
- limited to an arbitrary value (currently set to 25). The values
- are inserted into the values list box.
-%End
-
     void setDatasourceDescription( const QString &uri );
 
 };

python/gui/qgssearchquerybuilder.sip

@@ -39,44 +39,6 @@ change search string shown in text field
 %End
 
   public slots:
-    void btnEqual_clicked();
-    void on_btnOk_clicked();
-    void btnLessThan_clicked();
-    void btnGreaterThan_clicked();
-    void btnLike_clicked();
-    void btnILike_clicked();
-    void btnPct_clicked();
-    void btnIn_clicked();
-    void btnNotIn_clicked();
-
-    void lstFields_doubleClicked( const QModelIndex &index );
-    void lstValues_doubleClicked( const QModelIndex &index );
-    void btnLessEqual_clicked();
-    void btnGreaterEqual_clicked();
-    void btnNotEqual_clicked();
-    void btnAnd_clicked();
-    void btnNot_clicked();
-    void btnOr_clicked();
-    void btnClear_clicked();
-
-    void btnTest_clicked();
-%Docstring
- Test the constructed search string to see if it's correct.
- The number of rows that would be returned is displayed in a message box.
-%End
-
-    void btnGetAllValues_clicked();
-%Docstring
- Get all distinct values for the field. Values are inserted
- into the value list box
-%End
-
-    void btnSampleValues_clicked();
-%Docstring
- Get sample distinct values for the selected field. The sample size is
- limited to an arbitrary value (currently set to 25). The values
- are inserted into the values list box.
-%End
 
     void saveQuery();
     void loadQuery();

python/gui/raster/qgsrasterhistogramwidget.sip

@@ -60,10 +60,6 @@ Apply a histoActionTriggered() event.
     void refreshHistogram();
 %Docstring
  slot executed when user wishes to refresh raster histogramwidget
-%End
-    void mSaveAsImageButton_clicked();
-%Docstring
-This slot lets you save the histogram as an image to disk
 %End
 
     virtual void apply();

python/gui/symbology/qgsgraduatedsymbolrendererwidget.sip

@@ -60,8 +60,6 @@ Toggle the link between classes boundaries
 
     void rowsMoved();
     void modelDataChanged();
-    void mSizeUnitWidget_changed();
-    void methodComboBox_currentIndexChanged( int );
     void refreshRanges( bool reset = false );
 
   protected:

python/gui/symbology/qgssmartgroupeditordialog.sip

@@ -103,9 +103,8 @@ function to create a new ConditionBox and update UI
 slot to remove the condition with id int
 %End
 
-    void buttonBox_accepted();
-
   protected:
+
 };
 
 /************************************************************************

python/gui/symbology/qgsstylemanagerdialog.sip

@@ -36,7 +36,6 @@ open add color ramp dialog, return color ramp's name if the ramp has been added
     void exportItems();
     void importItems();
 
-    void tabItemType_currentChanged( int );
     void populateList();
 %Docstring
 adds symbols of some type to list
@@ -228,6 +227,7 @@ sets the text of the item with bold font
 
 
 
+
 };
 
 /************************************************************************

python/gui/symbology/qgssymbollayerwidget.sip

@@ -101,18 +101,6 @@ class QgsSimpleLineSymbolLayerWidget : QgsSymbolLayerWidget
     virtual void setSymbolLayer( QgsSymbolLayer *layer );
     virtual QgsSymbolLayer *symbolLayer();
 
-  public slots:
-    void penWidthChanged();
-    void colorChanged( const QColor &color );
-    void penStyleChanged();
-    void offsetChanged();
-    void mCustomCheckBox_stateChanged( int state );
-    void mChangePatternButton_clicked();
-    void mPenWidthUnitWidget_changed();
-    void mOffsetUnitWidget_changed();
-    void mDashPatternUnitWidget_changed();
-    void mDrawInsideCheckBox_stateChanged( int state );
-
   protected:
 
     void updatePatternIcon();
@@ -143,16 +131,6 @@ class QgsSimpleMarkerSymbolLayerWidget : QgsSymbolLayerWidget
 
     void setColorStroke( const QColor &color );
     void setColorFill( const QColor &color );
-    void setSize();
-    void setAngle();
-    void setOffset();
-    void mSizeUnitWidget_changed();
-    void mOffsetUnitWidget_changed();
-    void mStrokeWidthUnitWidget_changed();
-    void mStrokeStyleComboBox_currentIndexChanged( int index );
-    void mStrokeWidthSpinBox_valueChanged( double d );
-    void mHorizontalAnchorComboBox_currentIndexChanged( int index );
-    void mVerticalAnchorComboBox_currentIndexChanged( int index );
 
   protected:
 
@@ -181,14 +159,9 @@ class QgsSimpleFillSymbolLayerWidget : QgsSymbolLayerWidget
   public slots:
     void setColor( const QColor &color );
     void setStrokeColor( const QColor &color );
-    void setBrushStyle();
-    void strokeWidthChanged();
-    void strokeStyleChanged();
-    void offsetChanged();
-    void mStrokeWidthUnitWidget_changed();
-    void mOffsetUnitWidget_changed();
 
   protected:
+
 };
 
 
@@ -256,17 +229,12 @@ class QgsGradientFillSymbolLayerWidget : QgsSymbolLayerWidget
 %Docstring
  Applies the color ramp passed on by the color ramp button
 %End
-
     void setGradientType( int index );
     void setCoordinateMode( int index );
     void setGradientSpread( int index );
-    void offsetChanged();
-    void referencePointChanged();
-    void mOffsetUnitWidget_changed();
-    void colorModeChanged();
-    void mSpinAngle_valueChanged( double value );
 
   protected:
+
 };
 
 
@@ -292,17 +260,9 @@ class QgsShapeburstFillSymbolLayerWidget : QgsSymbolLayerWidget
   public slots:
     void setColor( const QColor &color );
     void setColor2( const QColor &color );
-    void colorModeChanged();
-    void mSpinBlurRadius_valueChanged( int value );
-    void mSpinMaxDistance_valueChanged( double value );
-    void mDistanceUnitWidget_changed();
-    void mRadioUseWholeShape_toggled( bool value );
-    void applyColorRamp();
-    void offsetChanged();
-    void mOffsetUnitWidget_changed();
-    void mIgnoreRingsCheckBox_stateChanged( int state );
 
   protected:
+
 };
 
 
@@ -329,15 +289,10 @@ class QgsMarkerLineSymbolLayerWidget : QgsSymbolLayerWidget
 
     void setInterval( double val );
     void setOffsetAlongLine( double val );
-    void setRotate();
-    void setOffset();
-    void setPlacement();
-    void mIntervalUnitWidget_changed();
-    void mOffsetUnitWidget_changed();
-    void mOffsetAlongLineUnitWidget_changed();
 
   protected:
 
+
 };
 
 
@@ -361,21 +316,6 @@ class QgsSvgMarkerSymbolLayerWidget : QgsSymbolLayerWidget
     virtual void setSymbolLayer( QgsSymbolLayer *layer );
     virtual QgsSymbolLayer *symbolLayer();
 
-  public slots:
-    void setName( const QModelIndex &idx );
-    void populateIcons( const QModelIndex &idx );
-    void mFileToolButton_clicked();
-    void mFileLineEdit_textEdited( const QString &text );
-    void mFileLineEdit_editingFinished();
-    void mChangeColorButton_colorChanged( const QColor &color );
-    void mChangeStrokeColorButton_colorChanged( const QColor &color );
-    void mStrokeWidthSpinBox_valueChanged( double d );
-    void mSizeUnitWidget_changed();
-    void mStrokeWidthUnitWidget_changed();
-    void mOffsetUnitWidget_changed();
-    void mHorizontalAnchorComboBox_currentIndexChanged( int index );
-    void mVerticalAnchorComboBox_currentIndexChanged( int index );
-
   protected:
 
     void populateList();
@@ -520,13 +460,6 @@ class QgsFontMarkerSymbolLayerWidget : QgsSymbolLayerWidget
     void setSize( double size );
     void setAngle( double angle );
     void setCharacter( QChar chr );
-    void setOffset();
-    void mSizeUnitWidget_changed();
-    void mOffsetUnitWidget_changed();
-    void mStrokeWidthUnitWidget_changed();
-    void mStrokeWidthSpinBox_valueChanged( double d );
-    void mHorizontalAnchorComboBox_currentIndexChanged( int index );
-    void mVerticalAnchorComboBox_currentIndexChanged( int index );
 
   protected:
 

python/gui/symbology/qgssymbolslistwidget.sip

@@ -59,13 +59,10 @@ class QgsSymbolsListWidget : QWidget
 
     void symbolAddedToStyle( const QString &name, QgsSymbol *symbol );
 
-    void mSymbolUnitWidget_changed();
-
     void populateGroups();
 %Docstring
 Pupulates the groups combo box with available tags and smartgroups
 %End
-    void groupsCombo_currentIndexChanged( int index );
 
     void openStyleManager();
     void clipFeaturesToggled( bool checked );

src/gui/qgserrordialog.h

@@ -48,7 +48,7 @@ class GUI_EXPORT QgsErrorDialog: public QDialog, private Ui::QgsErrorDialogBase
      */
     static void show( const QgsError &error, const QString &title, QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags );
 
-  public slots:
+  private slots:
     void mDetailPushButton_clicked();
     void mDetailCheckBox_stateChanged( int state );
 

src/gui/qgsnewvectorlayerdialog.h

@@ -64,7 +64,7 @@ class GUI_EXPORT QgsNewVectorLayerDialog: public QDialog, private Ui::QgsNewVect
      */
     void setCrs( const QgsCoordinateReferenceSystem &crs );
 
-  protected slots:
+  private slots:
     void mAddAttributeButton_clicked();
     void mRemoveAttributeButton_clicked();
     void mFileFormatComboBox_currentIndexChanged( int index );

src/gui/qgsowssourceselect.h

@@ -71,42 +71,12 @@ class GUI_EXPORT QgsOWSSourceSelect : public QgsAbstractDataSourceWidget, protec
     //! Triggered when the provider's connections need to be refreshed
     void refresh() override;
 
-    //! Opens the create connection dialog to build a new connection
-    void mNewButton_clicked();
-    //! Opens a dialog to edit an existing connection
-    void mEditButton_clicked();
-    //! Deletes the selected connection
-    void mDeleteButton_clicked();
-    //! Saves connections to the file
-    void mSaveButton_clicked();
-    //! Loads connections from the file
-    void mLoadButton_clicked();
-
-    /**
-     * Connects to the database using the stored connection parameters.
-     * Once connected, available layers are displayed.
-     */
-    void mConnectButton_clicked();
-
-    void searchFinished();
-
-    //! Opens the Spatial Reference System dialog.
-    void mChangeCRSButton_clicked();
-
-    //! Signaled when a layer selection is changed.
-    virtual void mLayersTreeWidget_itemSelectionChanged();
-
-    //! Set status message to theMessage
-    void showStatusMessage( const QString &message );
-
+  protected slots:
     //! show whatever error is exposed.
     void showError( const QString &title, const QString &format, const QString &error );
 
-    //! Stores the selected datasource whenerver it is changed
-    void mConnectionsComboBox_activated( int );
-
-    //! Add some default wms servers to the list
-    void mAddDefaultButton_clicked();
+    //! Set status message to theMessage
+    void showStatusMessage( const QString &message );
 
   protected:
 
@@ -218,6 +188,39 @@ class GUI_EXPORT QgsOWSSourceSelect : public QgsAbstractDataSourceWidget, protec
     //! URI for selected connection
     QgsDataSourceUri mUri;
 
+  private slots:
+
+    //! Opens the create connection dialog to build a new connection
+    void mNewButton_clicked();
+    //! Opens a dialog to edit an existing connection
+    void mEditButton_clicked();
+    //! Deletes the selected connection
+    void mDeleteButton_clicked();
+    //! Saves connections to the file
+    void mSaveButton_clicked();
+    //! Loads connections from the file
+    void mLoadButton_clicked();
+
+    /**
+     * Connects to the database using the stored connection parameters.
+     * Once connected, available layers are displayed.
+     */
+    void mConnectButton_clicked();
+
+    void searchFinished();
+
+    //! Opens the Spatial Reference System dialog.
+    void mChangeCRSButton_clicked();
+
+    //! Signaled when a layer selection is changed.
+    virtual void mLayersTreeWidget_itemSelectionChanged();
+
+    //! Stores the selected datasource whenerver it is changed
+    void mConnectionsComboBox_activated( int );
+
+    //! Add some default wms servers to the list
+    void mAddDefaultButton_clicked();
+
 
   private:
     //! Selected CRS

src/gui/qgsquerybuilder.h

@@ -58,10 +58,25 @@ class GUI_EXPORT QgsQueryBuilder : public QDialog, private Ui::QgsQueryBuilderBa
 
     void showEvent( QShowEvent *event ) override;
 
+    QString sql();
+    void setSql( const QString &sqlStatement );
+
   public slots:
     void accept() override;
     void reject() override;
     void clear();
+
+    /**
+     * Test the constructed sql statement to see if the vector layer data provider likes it.
+     * The number of rows that would be returned is displayed in a message box.
+     * The test uses a "select count(*) from ..." query to test the SQL
+     * statement.
+     */
+    void test();
+
+    void setDatasourceDescription( const QString &uri );
+
+  private slots:
     void btnEqual_clicked();
     void btnLessThan_clicked();
     void btnGreaterThan_clicked();
@@ -70,8 +85,6 @@ class GUI_EXPORT QgsQueryBuilder : public QDialog, private Ui::QgsQueryBuilderBa
     void btnNotIn_clicked();
     void btnLike_clicked();
     void btnILike_clicked();
-    QString sql();
-    void setSql( const QString &sqlStatement );
     void lstFields_clicked( const QModelIndex &index );
     void lstFields_doubleClicked( const QModelIndex &index );
     void lstValues_doubleClicked( const QModelIndex &index );
@@ -82,14 +95,6 @@ class GUI_EXPORT QgsQueryBuilder : public QDialog, private Ui::QgsQueryBuilderBa
     void btnNot_clicked();
     void btnOr_clicked();
 
-    /**
-     * Test the constructed sql statement to see if the vector layer data provider likes it.
-     * The number of rows that would be returned is displayed in a message box.
-     * The test uses a "select count(*) from ..." query to test the SQL
-     * statement.
-     */
-    void test();
-
     /**
      * Get all distinct values for the field. Values are inserted
      * into the value list box
@@ -103,8 +108,6 @@ class GUI_EXPORT QgsQueryBuilder : public QDialog, private Ui::QgsQueryBuilderBa
      */
     void btnSampleValues_clicked();
 
-    void setDatasourceDescription( const QString &uri );
-
   private:
 
     /**

src/gui/qgssearchquerybuilder.h

@@ -50,6 +50,11 @@ class GUI_EXPORT QgsSearchQueryBuilder : public QDialog, private Ui::QgsQueryBui
     void setSearchString( const QString &searchString );
 
   public slots:
+
+    void saveQuery();
+    void loadQuery();
+
+  private slots:
     void btnEqual_clicked();
     void on_btnOk_clicked();
     void btnLessThan_clicked();
@@ -89,9 +94,6 @@ class GUI_EXPORT QgsSearchQueryBuilder : public QDialog, private Ui::QgsQueryBui
      */
     void btnSampleValues_clicked();
 
-    void saveQuery();
-    void loadQuery();
-
   private:
 
     /**

src/gui/raster/qgsrasterhistogramwidget.h

@@ -66,12 +66,12 @@ class GUI_EXPORT QgsRasterHistogramWidget : public QgsMapLayerConfigWidget, priv
   public slots:
     //! \brief slot executed when user wishes to refresh raster histogramwidget
     void refreshHistogram();
-    //! This slot lets you save the histogram as an image to disk
-    void mSaveAsImageButton_clicked();
 
     void apply() override;
 
   private slots:
+    //! This slot lets you save the histogram as an image to disk
+    void mSaveAsImageButton_clicked();
     //! Used when the histogram band selector changes, or when tab is loaded.
     void cboHistoBand_currentIndexChanged( int );
     //! Applies the selected min/max values to the renderer widget.

src/gui/symbology/qgsgraduatedsymbolrendererwidget.h

@@ -120,11 +120,11 @@ class GUI_EXPORT QgsGraduatedSymbolRendererWidget : public QgsRendererWidget, pr
 
     void rowsMoved();
     void modelDataChanged();
-    void mSizeUnitWidget_changed();
-    void methodComboBox_currentIndexChanged( int );
     void refreshRanges( bool reset = false );
 
   private slots:
+    void mSizeUnitWidget_changed();
+    void methodComboBox_currentIndexChanged( int );
     void cleanUpSymbolSelector( QgsPanelWidget *container );
     void updateSymbolsFromWidget();
     void toggleMethodWidgets( int idx );

src/gui/symbology/qgssmartgroupeditordialog.h

@@ -107,8 +107,6 @@ class GUI_EXPORT QgsSmartGroupEditorDialog : public QDialog, private Ui::QgsSmar
     //! slot to remove the condition with id int
     void removeCondition( int );
 
-    void buttonBox_accepted();
-
   protected:
     QgsStyle *mStyle = nullptr;
     // layout of the mConditionsBox
@@ -117,6 +115,10 @@ class GUI_EXPORT QgsSmartGroupEditorDialog : public QDialog, private Ui::QgsSmar
     int mCondCount;
     // map tracking the condition widget and the ids
     QMap<int, QgsSmartGroupCondition *> mConditionMap;
+
+  private slots:
+
+    void buttonBox_accepted();
 };
 
 #endif // QGSSMARTGROUPEDITORDIALOG_H

src/gui/symbology/qgsstylemanagerdialog.h

@@ -52,7 +52,6 @@ class GUI_EXPORT QgsStyleManagerDialog : public QDialog, private Ui::QgsStyleMan
     void exportItems();
     void importItems();
 
-    void tabItemType_currentChanged( int );
     //! adds symbols of some type to list
     void populateList();
 
@@ -174,6 +173,10 @@ class GUI_EXPORT QgsStyleManagerDialog : public QDialog, private Ui::QgsStyleMan
 
     //! Menu for the "Add item" toolbutton when in colorramp mode
     QMenu *mMenuBtnAddItemColorRamp = nullptr;
+
+  private slots:
+
+    void tabItemType_currentChanged( int );
 };
 
 #endif

src/gui/symbology/qgssymbollayerwidget.h

@@ -128,7 +128,15 @@ class GUI_EXPORT QgsSimpleLineSymbolLayerWidget : public QgsSymbolLayerWidget, p
     virtual void setSymbolLayer( QgsSymbolLayer *layer ) override;
     virtual QgsSymbolLayer *symbolLayer() override;
 
-  public slots:
+  protected:
+    QgsSimpleLineSymbolLayer *mLayer = nullptr;
+
+    //creates a new icon for the 'change pattern' button
+    void updatePatternIcon();
+
+  private slots:
+
+    void updateAssistantSymbol();
     void penWidthChanged();
     void colorChanged( const QColor &color );
     void penStyleChanged();
@@ -140,16 +148,6 @@ class GUI_EXPORT QgsSimpleLineSymbolLayerWidget : public QgsSymbolLayerWidget, p
     void mDashPatternUnitWidget_changed();
     void mDrawInsideCheckBox_stateChanged( int state );
 
-  protected:
-    QgsSimpleLineSymbolLayer *mLayer = nullptr;
-
-    //creates a new icon for the 'change pattern' button
-    void updatePatternIcon();
-
-  private slots:
-
-    void updateAssistantSymbol();
-
   private:
 
     std::shared_ptr< QgsLineSymbol > mAssistantPreviewSymbol;
@@ -183,6 +181,11 @@ class GUI_EXPORT QgsSimpleMarkerSymbolLayerWidget : public QgsSymbolLayerWidget,
 
     void setColorStroke( const QColor &color );
     void setColorFill( const QColor &color );
+
+  protected:
+    QgsSimpleMarkerSymbolLayer *mLayer = nullptr;
+
+  private slots:
     void setSize();
     void setAngle();
     void setOffset();
@@ -193,11 +196,6 @@ class GUI_EXPORT QgsSimpleMarkerSymbolLayerWidget : public QgsSymbolLayerWidget,
     void mStrokeWidthSpinBox_valueChanged( double d );
     void mHorizontalAnchorComboBox_currentIndexChanged( int index );
     void mVerticalAnchorComboBox_currentIndexChanged( int index );
-
-  protected:
-    QgsSimpleMarkerSymbolLayer *mLayer = nullptr;
-
-  private slots:
     void setShape();
     void updateAssistantSymbol();
     void penJoinStyleChanged();
@@ -233,6 +231,11 @@ class GUI_EXPORT QgsSimpleFillSymbolLayerWidget : public QgsSymbolLayerWidget, p
   public slots:
     void setColor( const QColor &color );
     void setStrokeColor( const QColor &color );
+
+  protected:
+    QgsSimpleFillSymbolLayer *mLayer = nullptr;
+
+  private slots:
     void setBrushStyle();
     void strokeWidthChanged();
     void strokeStyleChanged();
@@ -240,8 +243,6 @@ class GUI_EXPORT QgsSimpleFillSymbolLayerWidget : public QgsSymbolLayerWidget, p
     void mStrokeWidthUnitWidget_changed();
     void mOffsetUnitWidget_changed();
 
-  protected:
-    QgsSimpleFillSymbolLayer *mLayer = nullptr;
 };
 
 
@@ -331,18 +332,20 @@ class GUI_EXPORT QgsGradientFillSymbolLayerWidget : public QgsSymbolLayerWidget,
      * Applies the color ramp passed on by the color ramp button
      */
     void applyColorRamp();
-
     void setGradientType( int index );
     void setCoordinateMode( int index );
     void setGradientSpread( int index );
+
+  protected:
+    QgsGradientFillSymbolLayer *mLayer = nullptr;
+
+  private slots:
     void offsetChanged();
     void referencePointChanged();
     void mOffsetUnitWidget_changed();
     void colorModeChanged();
     void mSpinAngle_valueChanged( double value );
 
-  protected:
-    QgsGradientFillSymbolLayer *mLayer = nullptr;
 };
 
 ///////////
@@ -371,6 +374,11 @@ class GUI_EXPORT QgsShapeburstFillSymbolLayerWidget : public QgsSymbolLayerWidge
   public slots:
     void setColor( const QColor &color );
     void setColor2( const QColor &color );
+
+  protected:
+    QgsShapeburstFillSymbolLayer *mLayer = nullptr;
+
+  private slots:
     void colorModeChanged();
     void mSpinBlurRadius_valueChanged( int value );
     void mSpinMaxDistance_valueChanged( double value );
@@ -380,9 +388,6 @@ class GUI_EXPORT QgsShapeburstFillSymbolLayerWidget : public QgsSymbolLayerWidge
     void offsetChanged();
     void mOffsetUnitWidget_changed();
     void mIgnoreRingsCheckBox_stateChanged( int state );
-
-  protected:
-    QgsShapeburstFillSymbolLayer *mLayer = nullptr;
 };
 
 ///////////
@@ -412,6 +417,12 @@ class GUI_EXPORT QgsMarkerLineSymbolLayerWidget : public QgsSymbolLayerWidget, p
 
     void setInterval( double val );
     void setOffsetAlongLine( double val );
+
+  protected:
+
+    QgsMarkerLineSymbolLayer *mLayer = nullptr;
+
+  private slots:
     void setRotate();
     void setOffset();
     void setPlacement();
@@ -419,9 +430,6 @@ class GUI_EXPORT QgsMarkerLineSymbolLayerWidget : public QgsSymbolLayerWidget, p
     void mOffsetUnitWidget_changed();
     void mOffsetAlongLineUnitWidget_changed();
 
-  protected:
-
-    QgsMarkerLineSymbolLayer *mLayer = nullptr;
 };
 
 
@@ -448,7 +456,15 @@ class GUI_EXPORT QgsSvgMarkerSymbolLayerWidget : public QgsSymbolLayerWidget, pr
     virtual void setSymbolLayer( QgsSymbolLayer *layer ) override;
     virtual QgsSymbolLayer *symbolLayer() override;
 
-  public slots:
+  protected:
+
+    void populateList();
+    //update gui for svg file (insert new path, update activation of gui elements for svg params)
+    void setGuiForSvg( const QgsSvgMarkerSymbolLayer *layer );
+
+    QgsSvgMarkerSymbolLayer *mLayer = nullptr;
+
+  private slots:
     void setName( const QModelIndex &idx );
     void populateIcons( const QModelIndex &idx );
     void mFileToolButton_clicked();
@@ -462,16 +478,6 @@ class GUI_EXPORT QgsSvgMarkerSymbolLayerWidget : public QgsSymbolLayerWidget, pr
     void mOffsetUnitWidget_changed();
     void mHorizontalAnchorComboBox_currentIndexChanged( int index );
     void mVerticalAnchorComboBox_currentIndexChanged( int index );
-
-  protected:
-
-    void populateList();
-    //update gui for svg file (insert new path, update activation of gui elements for svg params)
-    void setGuiForSvg( const QgsSvgMarkerSymbolLayer *layer );
-
-    QgsSvgMarkerSymbolLayer *mLayer = nullptr;
-
-  private slots:
     void setWidth();
     void setHeight();
     void lockAspectRatioChanged( const bool locked );
@@ -680,6 +686,12 @@ class GUI_EXPORT QgsFontMarkerSymbolLayerWidget : public QgsSymbolLayerWidget, p
     void setSize( double size );
     void setAngle( double angle );
     void setCharacter( QChar chr );
+
+  protected:
+    QgsFontMarkerSymbolLayer *mLayer = nullptr;
+    CharacterWidget *widgetChar = nullptr;
+
+  private slots:
     void setOffset();
     void mSizeUnitWidget_changed();
     void mOffsetUnitWidget_changed();
@@ -687,13 +699,6 @@ class GUI_EXPORT QgsFontMarkerSymbolLayerWidget : public QgsSymbolLayerWidget, p
     void mStrokeWidthSpinBox_valueChanged( double d );
     void mHorizontalAnchorComboBox_currentIndexChanged( int index );
     void mVerticalAnchorComboBox_currentIndexChanged( int index );
-
-  protected:
-    QgsFontMarkerSymbolLayer *mLayer = nullptr;
-    CharacterWidget *widgetChar = nullptr;
-
-  private slots:
-
     void penJoinStyleChanged();
     void updateAssistantSymbol();
 

src/gui/symbology/qgssymbolslistwidget.h

@@ -76,11 +76,8 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW
 
     void symbolAddedToStyle( const QString &name, QgsSymbol *symbol );
 
-    void mSymbolUnitWidget_changed();
-
     //! Pupulates the groups combo box with available tags and smartgroups
     void populateGroups();
-    void groupsCombo_currentIndexChanged( int index );
 
     void openStyleManager();
     void clipFeaturesToggled( bool checked );
@@ -93,7 +90,8 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW
     void changed();
 
   private slots:
-
+    void mSymbolUnitWidget_changed();
+    void groupsCombo_currentIndexChanged( int index );
     void updateAssistantSymbol();
     void opacityChanged( double value );