Showing with 629 additions and 658 deletions.
  1. +22 −21 debian/control.sid-oracle
  2. +1 −1 debian/rules
  3. +8 −8 python/core/qgsmaplayer.sip
  4. +97 −38 python/core/qgsvectorlayer.sip
  5. +20 −7 python/core/symbology-ng/qgsfillsymbollayerv2.sip
  6. +0 −1 src/analysis/interpolation/DualEdgeTriangulation.cc
  7. +2 −15 src/analysis/interpolation/MathUtils.cc
  8. +6 −6 src/analysis/interpolation/NormVecDecorator.cc
  9. +1 −1 src/app/composer/qgscompositionwidget.cpp
  10. +1 −1 src/app/gps/qgsgpsmarker.cpp
  11. +1 −1 src/app/legend/qgslegend.cpp
  12. +2 −2 src/app/legend/qgslegenditem.cpp
  13. +0 −1 src/app/legend/qgslegendlayer.cpp
  14. +7 −7 src/app/pluginmanager/qgspluginmanager.cpp
  15. +17 −8 src/app/qgisapp.cpp
  16. +3 −3 src/app/qgisapp.h
  17. +2 −2 src/app/qgsattributetypedialog.cpp
  18. +2 −2 src/app/qgsattributetypeloaddialog.cpp
  19. +0 −11 src/app/qgsdecorationnortharrow.cpp
  20. +0 −2 src/app/qgsdecorationscalebar.cpp
  21. +11 −11 src/app/qgsidentifyresultsdialog.cpp
  22. +2 −6 src/app/qgslabelinggui.cpp
  23. +0 −1 src/app/qgsmaptoollabel.cpp
  24. +8 −4 src/app/qgsmaptoolpinlabels.cpp
  25. +1 −1 src/app/qgsmaptoolselectutils.cpp
  26. +1 −1 src/app/qgsmaptoolselectutils.h
  27. +2 −11 src/app/qgspluginregistry.cpp
  28. +3 −3 src/app/qgsprojectproperties.cpp
  29. +1 −1 src/core/composer/qgscomposereffect.cpp
  30. +1 −1 src/core/composer/qgscomposereffect.h
  31. +1 −1 src/core/composer/qgscomposeritem.cpp
  32. +0 −6 src/core/composer/qgscomposermap.cpp
  33. +8 −8 src/core/dxf/qgsdxfexport.cpp
  34. +1 −2 src/core/pal/feature.cpp
  35. +5 −5 src/core/pal/pal.cpp
  36. +14 −16 src/core/pal/problem.cpp
  37. +6 −6 src/core/qgsapplication.cpp
  38. +6 −6 src/core/qgsapplication.h
  39. +1 −1 src/core/qgsattributeaction.cpp
  40. +4 −4 src/core/qgscoordinatereferencesystem.cpp
  41. +4 −4 src/core/qgscoordinatereferencesystem.h
  42. +18 −18 src/core/qgscoordinatetransform.cpp
  43. +2 −2 src/core/qgsexpression.cpp
  44. +2 −2 src/core/qgsexpression.h
  45. +7 −21 src/core/qgsgeometry.cpp
  46. +6 −6 src/core/qgsmaplayer.cpp
  47. +9 −9 src/core/qgsmaplayer.h
  48. +4 −4 src/core/qgsmaprenderer.cpp
  49. +2 −2 src/core/qgsmaprenderer.h
  50. +1 −4 src/core/qgsmaptopixelgeometrysimplifier.cpp
  51. +3 −7 src/core/qgsogcutils.cpp
  52. +2 −2 src/core/qgsogcutils.h
  53. +1 −3 src/core/qgspallabeling.cpp
  54. +2 −2 src/core/qgsprojectfiletransform.cpp
  55. +2 −2 src/core/qgsprojectfiletransform.h
  56. +14 −15 src/core/qgsprojectproperty.cpp
  57. +1 −1 src/core/qgsprojectproperty.h
  58. +3 −3 src/core/qgsproviderregistry.cpp
  59. +8 −8 src/core/qgsvectorlayer.cpp
  60. +7 −15 src/core/qgsvectorlayer.h
  61. +2 −2 src/core/qgsvectorlayereditbuffer.cpp
  62. +1 −1 src/core/qgsvectorlayerfeatureiterator.cpp
  63. +2 −2 src/core/raster/qgsmultibandcolorrenderer.cpp
  64. +1 −4 src/core/raster/qgssinglebandcolordatarenderer.cpp
  65. +2 −2 src/core/spatialite/spatialite.c
  66. +2 −2 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  67. +5 −5 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  68. +7 −5 src/core/symbology-ng/qgsfillsymbollayerv2.h
  69. +2 −7 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  70. +2 −2 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  71. +1 −1 src/core/symbology-ng/qgsstylev2.cpp
  72. +5 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  73. +1 −0 src/gui/qgisgui.h
  74. +6 −6 src/gui/qgsattributeeditor.cpp
  75. +2 −3 src/gui/qgscollapsiblegroupbox.cpp
  76. +3 −3 src/gui/qgsmapcanvas.cpp
  77. +1 −1 src/gui/qgsmaptoolidentify.cpp
  78. +1 −1 src/gui/qgsowssourceselect.cpp
  79. +1 −2 src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
  80. +8 −18 src/mapserver/qgis_map_serv.cpp
  81. +15 −11 src/mapserver/qgsprojectparser.cpp
  82. +4 −4 src/mapserver/qgssldparser.cpp
  83. +3 −3 src/mapserver/qgssldparser.h
  84. +2 −2 src/mapserver/qgssoaprequesthandler.cpp
  85. +16 −16 src/mapserver/qgswfsserver.cpp
  86. +7 −9 src/mapserver/qgswmsserver.cpp
  87. +2 −0 src/mapserver/qgswmsserver.h
  88. +3 −3 src/plugins/compass/qgscompassplugin.cpp
  89. +16 −22 src/plugins/dxf2shp_converter/builder.cpp
  90. +5 −6 src/plugins/evis/evis.cpp
  91. +1 −1 src/plugins/georeferencer/qgsgcplist.cpp
  92. +4 −4 src/plugins/georeferencer/qgsgeorefplugin.cpp
  93. +1 −1 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  94. +1 −1 src/plugins/georeferencer/qgsgeorefplugingui.h
  95. +4 −4 src/plugins/georeferencer/qgsgeoreftransform.cpp
  96. +2 −1 src/plugins/georeferencer/qgsimagewarper.cpp
  97. +1 −1 src/plugins/georeferencer/qgsleastsquares.cpp
  98. +1 −1 src/plugins/georeferencer/qgsmapcoordsdialog.cpp
  99. +1 −1 src/plugins/georeferencer/qgsmapcoordsdialog.h
  100. +1 −1 src/plugins/globe/globe_plugin.cpp
  101. +1 −1 src/plugins/globe/osgEarthUtil/Controls.cpp
  102. +7 −4 src/plugins/grass/qgsgrassmapcalc.cpp
  103. +3 −1 src/plugins/grass/qgsgrassmodel.cpp
  104. +0 −1 src/plugins/grass/qgsgrassmodule.cpp
  105. +9 −8 src/plugins/grass/qgsgrassplugin.cpp
  106. +1 −1 src/plugins/grass/qgsgrassplugin.h
  107. +2 −2 src/plugins/grass/qgsgrasstools.cpp
  108. +3 −4 src/plugins/heatmap/heatmap.cpp
  109. +0 −1 src/plugins/interpolation/qgsinterpolationdialog.cpp
  110. +3 −3 src/plugins/oracle_raster/qgsoracle_plugin.cpp
  111. +3 −3 src/plugins/roadgraph/roadgraphplugin.cpp
  112. +1 −1 src/plugins/spatialquery/qgsgeometrycoordinatetransform.h
  113. +1 −1 src/plugins/spatialquery/qgsreaderfeatures.cpp
  114. +2 −3 src/plugins/spatialquery/qgsspatialquery.cpp
  115. +0 −5 src/plugins/spatialquery/qgsspatialquerydialog.cpp
  116. +3 −7 src/plugins/spit/qgsspit.cpp
  117. +2 −2 src/plugins/spit/qgsspit.h
  118. +3 −3 src/plugins/spit/qgsspitplugin.cpp
  119. +3 −3 src/plugins/sqlanywhere/sqlanywhere.cpp
  120. +3 −3 src/plugins/topology/topol.cpp
  121. +0 −2 src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp
  122. +0 −1 src/providers/delimitedtext/qgsdelimitedtextfile.cpp
  123. +2 −2 src/providers/gdal/qgsgdalprovider.cpp
  124. +1 −1 src/providers/grass/qgsgrassgislib.h
  125. +4 −4 src/providers/memory/qgsmemoryfeatureiterator.cpp
  126. +6 −6 src/providers/mssql/qgsmssqldataitems.cpp
  127. +0 −1 src/providers/mssql/qgsmssqlfeatureiterator.cpp
  128. +1 −0 src/providers/mssql/qgsmssqlsourceselect.cpp
  129. +0 −1 src/providers/ogr/qgsogrprovider.cpp
  130. +1 −0 src/providers/oracle/qgsoraclecolumntypethread.cpp
  131. +2 −3 src/providers/oracle/qgsoracleprovider.cpp
  132. +2 −2 src/providers/postgres/qgspostgresfeatureiterator.cpp
  133. +2 −2 src/providers/postgres/qgspostgresprovider.cpp
  134. +6 −8 src/providers/spatialite/qgsspatialiteprovider.cpp
  135. +1 −1 src/providers/sqlanywhere/qgssqlanywherefeatureiterator.cpp
  136. +28 −30 src/providers/sqlanywhere/qgssqlanywhereprovider.cpp
  137. +3 −4 src/providers/wcs/qgswcscapabilities.cpp
  138. +1 −1 src/providers/wcs/qgswcssourceselect.cpp
  139. +2 −2 src/providers/wfs/qgswfsprovider.cpp
  140. +1 −1 src/providers/wfs/qgswfsprovider.h
  141. +3 −4 src/providers/wms/qgswmsprovider.cpp
  142. +2 −2 src/providers/wms/qgswmssourceselect.cpp
43 changes: 22 additions & 21 deletions debian/control.sid-oracle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ Build-Depends:
pyqt4-dev-tools,
python,
python-dev (>= 2.6.6-3~),
python-qt4 (>=4.1.0),
python-qt4 (>= 4.1.0),
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev,
libopenscenegraph-dev,
# libosgearth-dev,
# libopenscenegraph-dev,
git,
doxygen,
graphviz,
Expand All @@ -47,7 +47,8 @@ Homepage: http://qgis.org/
Package: qgis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe
Recommends: qgis-plugin-grass, python-qgis
#, qgis-plugin-globe
Suggests: gpsbabel
Conflicts: uim-qt3
Description: Geographic Information System (GIS)
Expand Down Expand Up @@ -207,23 +208,23 @@ Description: QGIS API documentation
.
This package contains the QGIS API documentation.

Package: qgis-plugin-globe
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: OSG globe plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This plugin enables 3D viewing using OSG globe in the QGIS.

Package: qgis-plugin-globe-common
Architecture: all
Description: OSG GLOBE plugin for QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
with the QGIS GLOBE plugin.
#Package: qgis-plugin-globe
#Architecture: any
#Depends: qgis (= ${binary:Version}), qgis-plugin-globe-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
#Description: OSG globe plugin for QGIS
# QGIS is a Geographic Information System (GIS) which manages, analyzes and
# display databases of geographic information.
# .
# This plugin enables 3D viewing using OSG globe in the QGIS.

#Package: qgis-plugin-globe-common
#Architecture: all
#Description: OSG GLOBE plugin for QGIS - architecture-independent data
# QGIS is a Geographic Information System (GIS) which manages, analyzes and
# display databases of geographic information.
# .
# This package contains architecture-independent supporting data files for use
# with the QGIS GLOBE plugin.

Package: qgis-oracle-provider
Architecture: any
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric jessie sid"))
ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric jessie sid sid-oracle"))
CMAKE_OPTS += -D WITH_GLOBE=FALSE
else
CMAKE_OPTS += -D WITH_GLOBE=TRUE
Expand Down
16 changes: 8 additions & 8 deletions python/core/qgsmaplayer.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class QgsMapLayer : QObject
virtual bool isEditable() const;

/** sets state from Dom document
@param layer_node is Dom node corresponding to ``maplayer'' tag
@param layerElement The Dom element corresponding to ``maplayer'' tag
@note

The Dom node corresponds to a Dom document project file XML element read
Expand Down Expand Up @@ -276,9 +276,9 @@ class QgsMapLayer : QObject
* @return a QString with any status messages
* @see also loadDefaultStyle ();
*/
virtual QString loadNamedStyle( const QString theURI, bool & theResultFlag /Out/ );
virtual QString loadNamedStyle( const QString &theURI, bool &theResultFlag /Out/ );

virtual bool loadNamedStyleFromDb( const QString db, const QString theURI, QString &qml /Out/ );
virtual bool loadNamedStyleFromDb( const QString &db, const QString &theURI, QString &qml /Out/ );

//TODO edit infos
/**
Expand Down Expand Up @@ -321,12 +321,12 @@ class QgsMapLayer : QObject
* @return a QString with any status messages
* @sa saveDefaultStyle()
*/
virtual QString saveNamedStyle( const QString theURI, bool & theResultFlag /Out/ );
virtual QString saveNamedStyle( const QString &theURI, bool &theResultFlag /Out/ );

virtual QString saveSldStyle( const QString theURI, bool & theResultFlag );
virtual QString loadSldStyle( const QString theURI, bool &theResultFlag );
virtual QString saveSldStyle( const QString &theURI, bool &theResultFlag );
virtual QString loadSldStyle( const QString &theURI, bool &theResultFlag );

virtual bool readSld( const QDomNode& node, QString& errorMessage );
virtual bool readSld( const QDomNode &node, QString &errorMessage );

/** Read the symbology for the current layer from the Dom node supplied.
* @param node node that will contain the symbology definition for this layer.
Expand All @@ -344,7 +344,7 @@ class QgsMapLayer : QObject
virtual bool writeSymbology( QDomNode &node, QDomDocument& doc, QString& errorMessage ) const = 0;

/** Return pointer to layer's undo stack */
QUndoStack* undoStack();
QUndoStack *undoStack();

/** Get the QImage used for caching render operations
* @note This method was added in QGIS 1.4 **/
Expand Down
135 changes: 97 additions & 38 deletions python/core/qgsvectorlayer.sip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class QgsAttributeEditorElement : QObject
{
AeTypeContainer,
AeTypeField,
AeTypeRelation,
AeTypeInvalid
};

Expand All @@ -41,6 +42,7 @@ class QgsAttributeEditorContainer : QgsAttributeEditorElement

virtual QDomElement toDomElement( QDomDocument& doc ) const;
virtual void addChildElement( QgsAttributeEditorElement *widget );
virtual bool isGroupBox() const;
QList<QgsAttributeEditorElement*> children() const;
};

Expand Down Expand Up @@ -105,19 +107,20 @@ class QgsVectorLayer : QgsMapLayer
Classification,
EditRange,
SliderRange,
CheckBox, /* added in 1.4 */
CheckBox, /**< @note added in 1.4 */
FileName,
Enumeration,
Immutable, /* The attribute value should not be changed in the attribute form */
Hidden, /* The attribute value should not be shown in the attribute form @added in 1.4 */
TextEdit, /* multiline edit @added in 1.4*/
Calendar, /* calendar widget @added in 1.5 */
DialRange, /* dial range @added in 1.5 */
ValueRelation, /* value map from an table @added in 1.8 */
UuidGenerator, /* uuid generator - readonly and automatically intialized @added in 1.9 */
Photo, /* phote widget @added in 1.9 */
WebView, /* webview widget @added in 1.9 */
Color, /* color @added in 1.9 */
Immutable, /**< The attribute value should not be changed in the attribute form */
Hidden, /**< The attribute value should not be shown in the attribute form @note added in 1.4 */
TextEdit, /**< multiline edit @note added in 1.4*/
Calendar, /**< calendar widget @note added in 1.5 */
DialRange, /**< dial range @note added in 1.5 */
ValueRelation, /**< value map from an table @note added in 1.8 */
UuidGenerator, /**< uuid generator - readonly and automatically intialized @note added in 1.9 */
Photo, /**< phote widget @note added in 1.9 */
WebView, /**< webview widget @note added in 1.9 */
Color, /**< color @note added in 1.9 */
EditorWidgetV2, /**< modularized edit widgets @note added in 2.1 */
};

/** Types of feature form suppression after feature creation
Expand Down Expand Up @@ -418,13 +421,13 @@ class QgsVectorLayer : QgsMapLayer
* @param theResultFlag will be set to true if a named style is correctly loaded
* @param loadFromLocalDb if true forces to load from local db instead of datasource one
*/
virtual QString loadNamedStyle( const QString theURI, bool &theResultFlag, bool loadFromLocalDb );
virtual QString loadNamedStyle( const QString &theURI, bool &theResultFlag, bool loadFromLocalDb );

/**
* Calls loadNamedStyle( theURI, theResultFlag, false );
* Retained for backward compatibility
*/
virtual QString loadNamedStyle( const QString theURI, bool &theResultFlag );
virtual QString loadNamedStyle( const QString &theURI, bool &theResultFlag );

virtual bool applyNamedStyle( QString namedStyle , QString errorMsg );

Expand Down Expand Up @@ -503,10 +506,12 @@ class QgsVectorLayer : QgsMapLayer
*/
bool addFeature( QgsFeature& f, bool alsoUpdateExtent = true );

/** Updates an existing feature
@param f feature to update
@return True in case of success and False in case of error
@note added in 1.8
/** Updates an existing feature. This method needs to query the datasource
on every call. Consider using {@link changeAttributeValue()} or
{@link changeGeometry()} instead.
@param f Feature to update
@return True in case of success and False in case of error
@note Added in 1.8
*/
bool updateFeature( QgsFeature &f );

Expand Down Expand Up @@ -561,6 +566,15 @@ class QgsVectorLayer : QgsMapLayer
@return 0 in case of success*/
int translateFeature( QgsFeatureId featureId, double dx, double dy );

/**Splits parts cut by the given line
* @param splitLine line that splits the layer features
* @param topologicalEditing true if topological editing is enabled
* @return
* 0 in case of success,
* 4 if there is a selection but no feature split
*/
int splitParts( const QList<QgsPoint>& splitLine, bool topologicalEditing = false );

/**Splits features cut by the given line
* @param splitLine line that splits the layer features
* @param topologicalEditing true if topological editing is enabled
Expand Down Expand Up @@ -688,26 +702,57 @@ class QgsVectorLayer : QgsMapLayer
@note added in version 1.2 */
bool addAttribute( const QgsField &field );

/**Sets an alias (a display name) for attributes to display in dialogs
@note added in version 1.2*/
/**
* Sets an alias (a display name) for attributes to display in dialogs
* @note added in version 1.2
*/
void addAttributeAlias( int attIndex, QString aliasString );

/**Adds a tab (for the attribute editor form) holding groups and fields
@note added in version 1.9*/
/**
* Adds a tab (for the attribute editor form) holding groups and fields
* @note added in version 2.0
*/
void addAttributeEditorWidget( QgsAttributeEditorElement* data );
/**Returns a list of tabs holding groups and fields
@note added in version 1.9*/

/**
* Get the id for the editor widget used to represent the field at the given index
*
* @param fieldIdx The index of the field
*
* @return The id for the editor widget or a NULL string if not applicable
*/
const QString editorWidgetV2( int fieldIdx );

/**
* Get the configuration for the editor widget used to represent the field at the given index
*
* @param fieldIdx The index of the field
*
* @return The id for the editor widget or a NULL string if not configured
*/
const QgsEditorWidgetConfig editorWidgetV2Config( int fieldIdx );

/**
* Returns a list of tabs holding groups and fields
* @note added in version 2.0
*/
QList< QgsAttributeEditorElement* > &attributeEditorElements();
/**Clears all the tabs for the attribute editor form
@note added in version 1.9*/
/**
* Clears all the tabs for the attribute editor form
* @note added in version 2.0
*/
void clearAttributeEditorWidgets();

/**Returns the alias of an attribute name or an empty string if there is no alias
@note added in version 1.2*/
/**
* Returns the alias of an attribute name or an empty string if there is no alias
* @note added in version 1.2
*/
QString attributeAlias( int attributeIndex ) const;

/**Convenience function that returns the attribute alias if defined or the field name else
@note added in version 1.2*/
/**
* Convenience function that returns the attribute alias if defined or the field name else
* @note added in version 1.2
*/
QString attributeDisplayName( int attributeIndex ) const;

const QMap< QString, QString >& attributeAliases() const;
Expand Down Expand Up @@ -771,6 +816,10 @@ class QgsVectorLayer : QgsMapLayer
/** set the active layout for the attribute editor for this layer (added in 1.9) */
void setEditorLayout( EditorLayout editorLayout );

void setEditorWidgetV2( int attrIdx, const QString& widgetType );

void setEditorWidgetV2Config( int attrIdx, const QMap<QString, QVariant>& config );

/** set string representing 'true' for a checkbox (added in 1.4) */
void setCheckedState( int idx, QString checked, QString notChecked );

Expand Down Expand Up @@ -817,6 +866,14 @@ class QgsVectorLayer : QgsMapLayer
**/
ValueRelationData &valueRelation( int idx );

/**
* Get relations, where the foreign key is on this layer
*
* @param idx Only get relations, where idx forms part of the foreign key
* @return A list of relations
*/
QList<QgsRelation> referencingRelations( int idx );

/**access date format
* @note added in 1.9
*/
Expand Down Expand Up @@ -906,7 +963,7 @@ class QgsVectorLayer : QgsMapLayer
/* Set the blending mode used for rendering each feature
* @note added in 2.0
*/
void setFeatureBlendMode( const QPainter::CompositionMode blendMode );
void setFeatureBlendMode( const QPainter::CompositionMode &blendMode );
/* Returns the current blending mode for features
* @note added in 2.0
*/
Expand All @@ -920,7 +977,12 @@ class QgsVectorLayer : QgsMapLayer
* @note added in 2.0
*/
int layerTransparency() const;


QString metadata();

/** @note not available in python bindings */
// inline QgsGeometryCache* cache();

/** Set the Map2pixel simplification threshold for fast rendering of features */
void setSimplifyDrawingTol( float simplifyDrawingTol );
/** Returns the Map2pixel simplification threshold for fast rendering of features */
Expand All @@ -942,7 +1004,7 @@ class QgsVectorLayer : QgsMapLayer
int simplifyDrawingHints() const;

/** Returns whether the VectorLayer can apply the specified simplification hint */
bool simplifyDrawingCanbeApplied( int simplifyHint ) const;
bool simplifyDrawingCanbeApplied( int simplifyHint ) const;

public slots:
/**
Expand Down Expand Up @@ -999,11 +1061,6 @@ class QgsVectorLayer : QgsMapLayer
@note added in 1.7 */
void checkJoinLayerRemove( QString theLayerId );

QString metadata();

/** @note not available in python bindings */
// QgsGeometryCache* cache();

/**
* @brief Is called when the cache image is being deleted. Overwrite and use to clean up.
* @note added in 2.0
Expand Down Expand Up @@ -1080,6 +1137,8 @@ class QgsVectorLayer : QgsMapLayer
void committedAttributeValuesChanges( const QString& layerId, const QgsChangedAttributesMap& changedAttributesValues );
void committedGeometriesChanges( const QString& layerId, const QgsGeometryMap& changedGeometries );

void saveLayerToProject();

/** Emitted when the font family defined for labeling layer is not found on system
* @note added in 1.9
*/
Expand All @@ -1089,7 +1148,7 @@ class QgsVectorLayer : QgsMapLayer
void rendererChanged();

/** Signal emitted when setFeatureBlendMode() is called */
void featureBlendModeChanged( const QPainter::CompositionMode blendMode );
void featureBlendModeChanged( const QPainter::CompositionMode &blendMode );

/** Signal emitted when setLayerTransparency() is called */
void layerTransparencyChanged( int layerTransparency );
Expand Down
Loading