Fix clazy fully-qualified-moc-types warnings

From the clazy docs: "Warns when a signal, slot or invokable declaration is not using fully-qualified type names, which will break old-style connects and interacting with QML."
qgis · Feb 2, 2018 · a08c05b · a08c05b
1 parent b2b500d
commit a08c05b
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 57 deletions.
diff --git a/python/core/layout/qgslayoutitempicture.sip.in b/python/core/layout/qgslayoutitempicture.sip.in
@@ -264,7 +264,7 @@ the item's frame, only the way the picture is drawn within the item.
 .. seealso:: :py:func:`pictureRotation`
 %End
 
-    void setResizeMode( ResizeMode mode );
+    void setResizeMode( QgsLayoutItemPicture::ResizeMode mode );
 %Docstring
 Sets the resize ``mode`` used for drawing the picture within the item bounds.
 

diff --git a/python/core/qgsunittypes.sip.in b/python/core/qgsunittypes.sip.in
@@ -189,12 +189,12 @@ Returns the conversion factor between the specified distance units.
 %End
 
 
-    static DistanceUnitType unitType( AreaUnit unit );
+    static DistanceUnitType unitType( QgsUnitTypes::AreaUnit unit );
 %Docstring
 Returns the type for an areal unit.
 %End
 
-    static QString encodeUnit( AreaUnit unit );
+    static QString encodeUnit( QgsUnitTypes::AreaUnit unit );
 %Docstring
 Encodes an areal unit to a string.
 
@@ -217,7 +217,7 @@ Decodes an areal unit from a string.
 .. seealso:: :py:func:`encodeUnit`
 %End
 
-    static QString toString( AreaUnit unit );
+    static QString toString( QgsUnitTypes::AreaUnit unit );
 %Docstring
 Returns a translated string representing an areal unit.
 
@@ -226,7 +226,7 @@ Returns a translated string representing an areal unit.
 .. seealso:: :py:func:`stringToAreaUnit`
 %End
 
-    static QString toAbbreviatedString( AreaUnit unit );
+    static QString toAbbreviatedString( QgsUnitTypes::AreaUnit unit );
 %Docstring
 Returns a translated abbreviation representing an areal unit.
 
@@ -247,7 +247,7 @@ Converts a translated string to an areal unit.
 .. seealso:: :py:func:`toString`
 %End
 
-    static double fromUnitToUnitFactor( AreaUnit fromUnit, AreaUnit toUnit );
+    static double fromUnitToUnitFactor( QgsUnitTypes::AreaUnit fromUnit, QgsUnitTypes::AreaUnit toUnit );
 %Docstring
 Returns the conversion factor between the specified areal units.
 
@@ -257,7 +257,7 @@ Returns the conversion factor between the specified areal units.
 :return: multiplication factor to convert between units
 %End
 
-    static AreaUnit distanceToAreaUnit( QgsUnitTypes::DistanceUnit distanceUnit );
+    static QgsUnitTypes::AreaUnit distanceToAreaUnit( QgsUnitTypes::DistanceUnit distanceUnit );
 %Docstring
 Converts a distance unit to its corresponding area unit, e.g., meters to square meters
 
@@ -267,7 +267,7 @@ Converts a distance unit to its corresponding area unit, e.g., meters to square
 %End
 
 
-    static QString encodeUnit( AngleUnit unit );
+    static QString encodeUnit( QgsUnitTypes::AngleUnit unit );
 %Docstring
 Encodes an angular unit to a string.
 
@@ -278,7 +278,7 @@ Encodes an angular unit to a string.
 .. seealso:: :py:func:`decodeAngleUnit`
 %End
 
-    static AngleUnit decodeAngleUnit( const QString &string, bool *ok /Out/ = 0 );
+    static QgsUnitTypes::AngleUnit decodeAngleUnit( const QString &string, bool *ok /Out/ = 0 );
 %Docstring
 Decodes an angular unit from a string.
 
@@ -290,14 +290,14 @@ Decodes an angular unit from a string.
 .. seealso:: :py:func:`encodeUnit`
 %End
 
-    static QString toString( AngleUnit unit );
+    static QString toString( QgsUnitTypes::AngleUnit unit );
 %Docstring
 Returns a translated string representing an angular unit.
 
 :param unit: unit to convert to string
 %End
 
-    static double fromUnitToUnitFactor( AngleUnit fromUnit, AngleUnit toUnit );
+    static double fromUnitToUnitFactor( QgsUnitTypes::AngleUnit fromUnit, QgsUnitTypes::AngleUnit toUnit );
 %Docstring
 Returns the conversion factor between the specified angular units.
 
@@ -307,7 +307,7 @@ Returns the conversion factor between the specified angular units.
 :return: multiplication factor to convert between units
 %End
 
-    static QString formatAngle( double angle, int decimals, AngleUnit unit );
+    static QString formatAngle( double angle, int decimals, QgsUnitTypes::AngleUnit unit );
 %Docstring
 Returns an angle formatted as a friendly string.
 
@@ -376,7 +376,7 @@ square kilometers
 %End
 
 
-    static QString encodeUnit( RenderUnit unit );
+    static QString encodeUnit( QgsUnitTypes::RenderUnit unit );
 %Docstring
 Encodes a render unit to a string.
 
@@ -387,7 +387,7 @@ Encodes a render unit to a string.
 .. seealso:: :py:func:`decodeRenderUnit`
 %End
 
-    static RenderUnit decodeRenderUnit( const QString &string, bool *ok /Out/ = 0 );
+    static QgsUnitTypes::RenderUnit decodeRenderUnit( const QString &string, bool *ok /Out/ = 0 );
 %Docstring
 Decodes a render unit from a string.
 
@@ -399,7 +399,7 @@ Decodes a render unit from a string.
 .. seealso:: :py:func:`encodeUnit`
 %End
 
-    static QString toString( RenderUnit unit );
+    static QString toString( QgsUnitTypes::RenderUnit unit );
 %Docstring
 Returns a translated string representing a render ``unit``.
 
@@ -408,7 +408,7 @@ Returns a translated string representing a render ``unit``.
 
 
 
-    static QString encodeUnit( LayoutUnit unit );
+    static QString encodeUnit( QgsUnitTypes::LayoutUnit unit );
 %Docstring
 Encodes a layout unit to a string.
 
@@ -421,7 +421,7 @@ Encodes a layout unit to a string.
 .. versionadded:: 3.0
 %End
 
-    static LayoutUnit decodeLayoutUnit( const QString &string, bool *ok /Out/ = 0 );
+    static QgsUnitTypes::LayoutUnit decodeLayoutUnit( const QString &string, bool *ok /Out/ = 0 );
 %Docstring
 Decodes a layout unit from a string.
 
@@ -435,21 +435,21 @@ Decodes a layout unit from a string.
 .. versionadded:: 3.0
 %End
 
-    static LayoutUnitType unitType( const LayoutUnit units );
+    static QgsUnitTypes::LayoutUnitType unitType( const QgsUnitTypes::LayoutUnit units );
 %Docstring
 Returns the type for a unit of measurement.
 
 .. versionadded:: 3.0
 %End
 
-    static QString toAbbreviatedString( LayoutUnit unit );
+    static QString toAbbreviatedString( QgsUnitTypes::LayoutUnit unit );
 %Docstring
 Returns a translated abbreviation representing a layout ``unit`` (e.g. "mm").
 
 .. versionadded:: 3.0
 %End
 
-    static QString toString( LayoutUnit unit );
+    static QString toString( QgsUnitTypes::LayoutUnit unit );
 %Docstring
 Returns a translated string representing a layout ``unit``.
 

diff --git a/python/gui/attributetable/qgsfeatureselectionmodel.sip.in b/python/gui/attributetable/qgsfeatureselectionmodel.sip.in
@@ -66,21 +66,21 @@ Views using this model should connect to and properly process this signal.
 
   public slots:
 
-    virtual void select( const QModelIndex &index, SelectionFlags command );
+    virtual void select( const QModelIndex &index, QItemSelectionModel::SelectionFlags command );
 %Docstring
 Overwritten to do NOTHING (we handle selection ourselves)
 
 .. seealso:: :py:func:`selectFeatures`
 %End
 
-    virtual void select( const QItemSelection &selection, SelectionFlags command );
+    virtual void select( const QItemSelection &selection, QItemSelectionModel::SelectionFlags command );
 %Docstring
 Overwritten to do NOTHING (we handle selection ourselves)
 
 .. seealso:: :py:func:`selectFeatures`
 %End
 
-    virtual void selectFeatures( const QItemSelection &selection, SelectionFlags command );
+    virtual void selectFeatures( const QItemSelection &selection, QItemSelectionModel::SelectionFlags command );
 %Docstring
 Select features on this table. Is to be used in favor of the stock select methods.
 

diff --git a/python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip.in b/python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip.in
@@ -222,7 +222,7 @@ Emit this signal, whenever the value changed.
 :param value: The new value
 %End
 
-    void constraintStatusChanged( const QString &constraint, const QString &desc, const QString &err, ConstraintResult status );
+    void constraintStatusChanged( const QString &constraint, const QString &desc, const QString &err, QgsEditorWidgetWrapper::ConstraintResult status );
 %Docstring
 Emit this signal when the constraint status changed.
  constraintStatusChanged

diff --git a/python/gui/qgscolorwidgets.sip.in b/python/gui/qgscolorwidgets.sip.in
@@ -95,7 +95,7 @@ Sets the color for the widget
 .. seealso:: :py:func:`color`
 %End
 
-    virtual void setComponent( const ColorComponent component );
+    virtual void setComponent( const QgsColorWidget::ColorComponent component );
 %Docstring
 Sets the color component which the widget controls
 

diff --git a/python/gui/qgsfloatingwidget.sip.in b/python/gui/qgsfloatingwidget.sip.in
@@ -105,12 +105,12 @@ to this anchor widget whenever the widget's parent is resized or moved.
 Emitted when the anchor widget changes
 %End
 
-    void anchorPointChanged( AnchorPoint point );
+    void anchorPointChanged( QgsFloatingWidget::AnchorPoint point );
 %Docstring
 Emitted when the anchor point changes
 %End
 
-    void anchorWidgetPointChanged( AnchorPoint point );
+    void anchorWidgetPointChanged( QgsFloatingWidget::AnchorPoint point );
 %Docstring
 Emitted when the anchor widget point changes
 %End

diff --git a/src/app/qgsmaptoolidentifyaction.h b/src/app/qgsmaptoolidentifyaction.h
@@ -61,7 +61,7 @@ class APP_EXPORT QgsMapToolIdentifyAction : public QgsMapToolIdentify
 
   public slots:
     void handleCopyToClipboard( QgsFeatureStore & );
-    void handleChangedRasterResults( QList<IdentifyResult> &results );
+    void handleChangedRasterResults( QList<QgsMapToolIdentify::IdentifyResult> &results );
 
   signals:
 

diff --git a/src/auth/pkipaths/qgsauthpkipathsedit.h b/src/auth/pkipaths/qgsauthpkipathsedit.h
@@ -51,7 +51,7 @@ class QgsAuthPkiPathsEdit : public QgsAuthMethodEdit, private Ui::QgsAuthPkiPath
 
   private slots:
     void clearPkiMessage( QLineEdit *lineedit );
-    void writePkiMessage( QLineEdit *lineedit, const QString &msg, Validity valid = Unknown );
+    void writePkiMessage( QLineEdit *lineedit, const QString &msg, QgsAuthPkiPathsEdit::Validity valid = Unknown );
 
     void clearPkiPathsCertPath();
     void clearPkiPathsKeyPath();

diff --git a/src/auth/pkipkcs12/qgsauthpkcs12edit.h b/src/auth/pkipkcs12/qgsauthpkcs12edit.h
@@ -51,7 +51,7 @@ class QgsAuthPkcs12Edit : public QgsAuthMethodEdit, private Ui::QgsAuthPkcs12Edi
 
   private slots:
     void clearPkiMessage( QLineEdit *lineedit );
-    void writePkiMessage( QLineEdit *lineedit, const QString &msg, Validity valid = Unknown );
+    void writePkiMessage( QLineEdit *lineedit, const QString &msg, QgsAuthPkcs12Edit::Validity valid = Unknown );
 
     void clearPkcs12BundlePath();
     void clearPkcs12BundlePass();

diff --git a/src/core/layout/qgslayoutitempicture.h b/src/core/layout/qgslayoutitempicture.h
@@ -245,7 +245,7 @@ class CORE_EXPORT QgsLayoutItemPicture: public QgsLayoutItem
      * \param mode ResizeMode to use for image file
      * \see resizeMode
      */
-    void setResizeMode( ResizeMode mode );
+    void setResizeMode( QgsLayoutItemPicture::ResizeMode mode );
 
     /**
      * Recalculates the source image (if using an expression for picture's source)