more sip fixes:

- also move enum StyleEntity in QgsStyleV2
- fix some warnings

Author: jef-n

cmake/Flex.cmake

@@ -78,5 +78,12 @@ MACRO(ADD_FLEX_FILES_PREFIX _sources prefix )
       )
 
       SET(${_sources} ${${_sources}} ${_out} )
+
+      # Disable warnings
+      IF(MSVC)
+        SET_SOURCE_FILES_PROPERTIES(${_out} PROPERTIES COMPILE_FLAGS /W0)
+      ELSE(MSVC)
+        SET_SOURCE_FILES_PROPERTIES(${_out} PROPERTIES COMPILE_FLAGS -w)
+      ENDIF(MSVC)
     ENDFOREACH (_current_FILE)
 ENDMACRO(ADD_FLEX_FILES_PREFIX)

python/CMakeLists.txt

@@ -54,6 +54,10 @@ IF(NOT WITH_TOUCH)
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_TOUCH)
 ENDIF(NOT WITH_TOUCH)
 
+IF(NOT QT_MOBILITY_LOCATION_FOUND)
+  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} MOBILITY_LOCATION)
+ENDIF(NOT QT_MOBILITY_LOCATION_FOUND)
+
 IF(PYQT4_VERSION_NUM LESS 263680)	# 0x040600
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
 ENDIF(PYQT4_VERSION_NUM LESS 263680)

python/core/core.sip

@@ -120,7 +120,7 @@
 %Include gps/qgsgpsdconnection.sip
 %Include gps/qgsgpsdetector.sip
 %Include gps/qgsnmeaconnection.sip
-// %Include gps/qgsqtlocationconnection.sip
+%Include gps/qgsqtlocationconnection.sip
 
 %Include raster/qgscliptominmaxenhancement.sip
 %Include raster/qgsfreakoutshader.sip
@@ -161,7 +161,6 @@
 %Include renderer/qgssinglesymbolrenderer.sip
 %Include renderer/qgsuniquevaluerenderer.sip
 
-%Include symbology-ng/qgsrendererv2.sip
 %Include symbology-ng/qgsstylev2.sip
 %Include symbology-ng/qgssvgcache.sip
 %Include symbology-ng/qgssymbologyv2conversion.sip
@@ -175,7 +174,8 @@
 %Include symbology-ng/qgssinglesymbolrendererv2.sip
 %Include symbology-ng/qgspointdisplacementrenderer.sip
 %Include symbology-ng/qgsrulebasedrendererv2.sip
-// %Include symbology-ng/qgsrendererv2registry.sip
+%Include symbology-ng/qgsrendererv2.sip
+%Include symbology-ng/qgsrendererv2registry.sip
 
 %Include symbology-ng/qgssymbollayerv2.sip
 %Include symbology-ng/qgssymbollayerv2utils.sip

python/core/gps/qgsqtlocationconnection.sip

@@ -1,3 +1,6 @@
+%Feature MOBILITY_LOCATION
+
+%If (MOBILITY_LOCATION)
 class QgsQtLocationConnection: QgsGPSConnection
 {
 %TypeHeaderCode
@@ -23,3 +26,4 @@ class QgsQtLocationConnection: QgsGPSConnection
     /**Called when the number of satellites in use is updated.*/
     void satellitesInUseUpdated( const QList<QGeoSatelliteInfo>& satellites );
 };
+%End

python/core/qgslabelsearchtree.sip

@@ -12,10 +12,10 @@ class QgsLabelSearchTree
     void clear();
 
     /**Returns label position(s) at a given point. QgsLabelSearchTree keeps ownership, don't delete the LabelPositions*/
-    void label( const QgsPoint& p, QList<QgsLabelPosition*>& posList );
+    // void label( const QgsPoint& p, QList<QgsLabelPosition*>& posList );
 
     /**Returns label position(s) in given rectangle. QgsLabelSearchTree keeps ownership, don't delete the LabelPositions*/
-    void labelsInRect( const QgsRectangle& r, QList<QgsLabelPosition*>& posList );
+    // void labelsInRect( const QgsRectangle& r, QList<QgsLabelPosition*>& posList );
 
     /**Inserts label position. Does not take ownership of labelPos
       @return true in case of success*/

python/core/qgsmaprenderer.sip

@@ -6,7 +6,7 @@ class QgsLabelPosition
 #include <qgsmaprenderer.h>
 %End
   public:
-    QgsLabelPosition( int id, double r, const QVector< QgsPoint >& corners, const QgsRectangle& rect, double w, double h, const QString& layer, bool upside_down );
+    QgsLabelPosition( int id, double r, const QVector< QgsPoint >& corners, const QgsRectangle& rect, double w, double h, const QString& layer, bool upside_down, bool diagram = false, bool pinned = false );
     QgsLabelPosition();
     int featureId;
     double rotation;
@@ -58,13 +58,13 @@ class QgsLabelingEngineInterface
     virtual QList<QgsLabelPosition> labelsWithinRect( const QgsRectangle& r ) = 0;
 
     //! called when passing engine among map renderers
-    virtual QgsLabelingEngineInterface* clone() = 0;
+    virtual QgsLabelingEngineInterface* clone() = 0 /Factory/;
 };
 
 
-/**
- * \class QgsMapRenderer
- * \brief Class for rendering map layer set
+
+/** \ingroup core
+ * A non GUI class for rendering a map layer set onto a QPainter.
  */
 
 class QgsMapRenderer : QObject
@@ -245,5 +245,5 @@ class QgsMapRenderer : QObject
 
     /**Creates an overlay object position manager subclass according to the current settings
     @note this method was added in version 1.1*/
-    QgsOverlayObjectPositionManager* overlayManagerFromSettings();
+    QgsOverlayObjectPositionManager* overlayManagerFromSettings() /Factory/;
 };

python/core/qgsrasterdataprovider.sip

@@ -403,7 +403,7 @@ class QgsRasterDataProvider : QgsDataProvider, QgsRasterInterface
     /** Creates a new dataset with mDataSourceURI
         @return true in case of success*/
     virtual bool create( const QString& format, int nBands,
-                         int type,
+                         QgsRasterInterface::DataType type,
                          int width, int height, double* geoTransform,
                          const QgsCoordinateReferenceSystem& crs,
                          QStringList createOptions = QStringList() /*e.v. color table*/ );

python/core/symbology-ng/qgsrendererv2registry.sip

@@ -1,8 +1,11 @@
+class QgsRendererV2Widget /External/;
+
 class QgsRendererV2AbstractMetadata
 {
 %TypeHeaderCode
 #include <qgsrendererv2registry.h>
 %End
+
   public:
     QgsRendererV2AbstractMetadata( QString name, QString visibleName, QIcon icon = QIcon() );
     virtual ~QgsRendererV2AbstractMetadata();
@@ -31,31 +34,17 @@ class QgsRendererV2Metadata : QgsRendererV2AbstractMetadata
 #include <qgsrendererv2registry.h>
 %End
   public:
-
-    /** construct metadata */
-    QgsRendererV2Metadata( QString name,
-                           QString visibleName,
-                           QgsRendererV2CreateFunc pfCreate,
-                           QIcon icon = QIcon(),
-                           QgsRendererV2WidgetFunc pfWidget = NULL );
-
-    QgsRendererV2Metadata( QString name,
-                           QString visibleName,
-                           QgsRendererV2CreateFunc pfCreate,
-                           QgsRendererV2CreateFromSldFunc pfCreateFromSld,
-                           QIcon icon = QIcon(),
-                           QgsRendererV2WidgetFunc pfWidget = NULL );
-    {}
-
     virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) /Factory/;
     virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
     virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, QGis::GeometryType geomType ) /Factory/;
 
-    QgsRendererV2CreateFunc createFunction() const;
-    QgsRendererV2WidgetFunc widgetFunction() const;
-    QgsFeatureRendererV2* (*)( QDomElement&, QGis::GeometryType geomType ) createFromSldFunction() const;
+    // QgsRendererV2CreateFunc createFunction() const;
+    // QgsRendererV2WidgetFunc widgetFunction() const;
+    // QgsFeatureRendererV2* (*)( QDomElement&, QGis::GeometryType geomType ) createFromSldFunction() const;
+    // void setWidgetFunction( QgsRendererV2WidgetFunc f );
 
-    void setWidgetFunction( QgsRendererV2WidgetFunc f );
+  private:
+    QgsRendererV2Metadata(); // pretend this is private
 };
 
 /**

python/core/symbology-ng/qgsstylev2.sip

@@ -9,6 +9,14 @@ class QgsStyleV2
     QgsStyleV2();
     ~QgsStyleV2();
 
+    //! Enum for Entities involved in a style
+    /*!
+        The enumerator is used for identifying the entity being operated on when generic
+        database functions are being run.
+        \sa group(), rename(), remove(), symbolsOfGroup(), symbolsWithTag(), symbolsOfSmartgroup()
+     */
+    enum StyleEntity { SymbolEntity, GroupEntity, TagEntity, ColorrampEntity, SmartgroupEntity };
+
     //! add color ramp to style. takes ramp's ownership
     /*!
      *  \note Adding a color ramp with the name of existing one replaces it.
@@ -85,7 +93,7 @@ class QgsStyleV2
      *  \param tags is the list of the tags that are to be applied as QStringList
      *  \return returns the success state of the operation
      */
-    bool tagSymbol( int type, QString symbol, QStringList tags );
+    bool tagSymbol( StyleEntity type, QString symbol, QStringList tags );
 
     //! detags the symbol with the given list
     /*!
@@ -95,7 +103,7 @@ class QgsStyleV2
      *  \param tags is the list of tags that are to be removed as QStringList
      *  \return returns the success state of the operation
      */
-    bool detagSymbol( int type, QString symbol, QStringList tags );
+    bool detagSymbol( StyleEntity type, QString symbol, QStringList tags );
 
     //! remove symbol from style (and delete it)
     bool removeSymbol( QString name );
@@ -135,15 +143,15 @@ class QgsStyleV2
      *  \param groupid is id of the group to which the symbols belong to, as int
      *  \return A QStringList of the symbol or colorramp names for the given group id
      */
-    QStringList symbolsOfGroup( int type, int groupid );
+    QStringList symbolsOfGroup( StyleEntity type, int groupid );
 
     //! returns the symbol names with which have the given tag
     /*!
      *  \param type is either SymbolEntity or ColorampEntity
      *  \param tagid is id of the tag which has been applied over the symbol as int
      *  \return A QStringList of the symbol or colorramp names for the given tag id
      */
-    QStringList symbolsWithTag( int type, int tagid );
+    QStringList symbolsWithTag( StyleEntity type, int tagid );
 
     //! applies the specifed group to the symbol or colorramp specified by StyleEntity
     /*!
@@ -152,22 +160,22 @@ class QgsStyleV2
      *  \param groupid is the id of the group to which the entity is assigned
      *  \return returns the success state as bool
      */
-    bool group( int type, QString name, int groupid );
+    bool group( StyleEntity type, QString name, int groupid );
 
     //! rename the given entity with the specified id
     /*!
      *  \param type is any of the style entites. Refer enum StyleEntity.
      *  \param id is the DB id of the entity which is to be renamed
      *  \param newName is the new name of the entity
      */
-    void rename( int type, int id, QString newName );
+    void rename( StyleEntity type, int id, QString newName );
 
     //! remove the specified entity from the db
     /*!
      *  \param type is any of the style entites. Refer enum StyleEntity.
      *  \param id is the DB id of the entity to be removed
      */
-    void remove( int type, int id );
+    void remove( StyleEntity type, int id );
 
     //! add the symbol to the DB with the tags
     /*!
@@ -218,7 +226,7 @@ class QgsStyleV2
      *  \param symbol is the name of the symbol or color ramp
      *  \return A QStringList of the tags that have been applied to that symbol/colorramp
      */
-    QStringList tagsOfSymbol( int type, QString symbol );
+    QStringList tagsOfSymbol( StyleEntity type, QString symbol );
 
     //! returns the smart groups map with id as key and name as value
     QMap<int, QString> smartgroupsListMap();
@@ -234,7 +242,7 @@ class QgsStyleV2
     QString smartgroupOperator( int id );
 
     //! returns the symbols for the smartgroup
-    QStringList symbolsOfSmartgroup( int type, int id );
+    QStringList symbolsOfSmartgroup( StyleEntity type, int id );
 
     //! Exports the style as a XML file
     bool exportXML( QString filename );
@@ -265,5 +273,5 @@ class QgsStyleV2
      *  \param name is the name of an existing symbol or a color ramp
      *  \return Success state of the update operation
      */
-    bool updateSymbol( int type, QString name );
+    bool updateSymbol( StyleEntity type, QString name );
 };

python/core/symbology-ng/qgssymbollayerv2registry.sip

@@ -1,9 +1,5 @@
 class QgsSymbolLayerV2Widget /External/;
 
-typedef QgsSymbolLayerV2*( *QgsSymbolLayerV2CreateFunc )( const QgsStringMap& );
-typedef QgsSymbolLayerV2Widget*( *QgsSymbolLayerV2WidgetFunc )( const QgsVectorLayer* );
-typedef QgsSymbolLayerV2*( *QgsSymbolLayerV2CreateFromSldFunc )( QDomElement& );
-
 class QgsSymbolLayerV2AbstractMetadata
 {
 %TypeHeaderCode