misc doc changes

qgis · May 29, 2018 · 2770f6c · 2770f6c
1 parent 00b6019
commit 2770f6c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/src/core/qgstessellator.h b/src/core/qgstessellator.h
@@ -16,6 +16,8 @@
 #ifndef QGSTESSELLATOR_H
 #define QGSTESSELLATOR_H
 
+#define SIP_NO_FILE
+
 #include "qgis_core.h"
 
 class QgsPolygon;
@@ -25,7 +27,7 @@ class QgsMultiPolygon;
 #include <memory>
 
 /**
- * \ingroup 3d
+ * \ingroup core
  * Class that takes care of tessellation of polygons into triangles.
  *
  * It is expected that client code will create the tessellator object, then repeatedly call

diff --git a/src/quickgui/qgsquickfeaturelayerpair.h b/src/quickgui/qgsquickfeaturelayerpair.h
@@ -76,13 +76,13 @@ class QUICK_EXPORT QgsQuickFeatureLayerPair
      */
     QgsQuickFeatureLayerPair( const QgsFeature &feature, QgsVectorLayer *layer );
 
-    //! \copydoc QgsQuickFeature::layer
+    //! \copydoc QgsQuickFeatureLayerPair::layer
     QgsVectorLayer *layer() const;
 
-    //! \copydoc QgsQuickFeature::feature
+    //! \copydoc QgsQuickFeatureLayerPair::feature
     QgsFeature feature() const;
 
-    //! \copydoc QgsQuickFeature::isValid
+    //! \copydoc QgsQuickFeatureLayerPair::isValid
     bool isValid() const;
 
     bool operator==( const QgsQuickFeatureLayerPair &other ) const;

diff --git a/src/quickgui/qgsquickidentifykit.cpp b/src/quickgui/qgsquickidentifykit.cpp
@@ -22,6 +22,8 @@
 #include "qgsquickidentifykit.h"
 #include "qgsquickmapsettings.h"
 
+#include "qgis.h"
+
 QgsQuickIdentifyKit::QgsQuickIdentifyKit( QObject *parent )
   : QObject( parent )
 {
@@ -230,9 +232,23 @@ double QgsQuickIdentifyKit::searchRadiusMm() const
 
 void QgsQuickIdentifyKit::setSearchRadiusMm( double searchRadiusMm )
 {
-  if ( mSearchRadiusMm == searchRadiusMm )
+  if ( qgsDoubleNear( mSearchRadiusMm, searchRadiusMm ) )
     return;
 
   mSearchRadiusMm = searchRadiusMm;
   emit searchRadiusMmChanged();
 }
+
+int QgsQuickIdentifyKit::featuresLimit() const
+{
+  return mFeaturesLimit;
+}
+
+void QgsQuickIdentifyKit::setFeaturesLimit( int limit )
+{
+  if ( mFeaturesLimit == limit )
+    return;
+
+  mFeaturesLimit = limit;
+  emit featuresLimitChanged();
+}
diff --git a/src/quickgui/qgsquickidentifykit.h b/src/quickgui/qgsquickidentifykit.h
@@ -64,7 +64,7 @@ class QUICK_EXPORT QgsQuickIdentifyKit : public QObject
      *
      * Default is 100.
      */
-    Q_PROPERTY( long featuresLimit MEMBER mFeaturesLimit NOTIFY featuresLimitChanged )
+    Q_PROPERTY( int featuresLimit READ featuresLimit WRITE setFeaturesLimit NOTIFY featuresLimitChanged )
 
   public:
     //! Constructor of new identify kit.
@@ -82,6 +82,12 @@ class QUICK_EXPORT QgsQuickIdentifyKit : public QObject
     //! \copydoc QgsQuickIdentifyKit::searchRadiusMm
     void setSearchRadiusMm( double searchRadiusMm );
 
+    //! \copydoc QgsQuickIdentifyKit::featuresLimit
+    int featuresLimit() const;
+
+    //! \copydoc QgsQuickIdentifyKit::featuresLimit
+    void setFeaturesLimit( int limit );
+
     /**
       * Gets the closest feature to the point within the search radius
       *