Skip to content

Commit

Permalink
Sipify
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jun 11, 2020
1 parent 84ec481 commit ae42850
Show file tree
Hide file tree
Showing 12 changed files with 156 additions and 156 deletions.
20 changes: 10 additions & 10 deletions python/core/auto_generated/geometry/qgsgeometry.sip.in
Expand Up @@ -510,7 +510,7 @@ This algorithm is an approximation to the standard Hausdorff distance. This appr
subset of useful cases. Examples of these are:

- computing distance between Linestrings that are roughly parallel to each other,
and roughly equal in length. This occurs in matching linear networks.
and roughly equal in length. This occurs in matching linear networks.
- Testing similarity of geometries.

If the default approximate provided by this method is insufficient, use hausdorffDistanceDensify() instead.
Expand Down Expand Up @@ -1570,9 +1570,9 @@ Attempts to coerce this geometry into the specified destination ``type``.
This method will do anything possible to force the current geometry into the specified type. E.g.

- lines or polygons will be converted to points by return either a single multipoint geometry or multiple
single point geometries.
single point geometries.
- polygons will be converted to lines by extracting their exterior and interior rings, returning
either a multilinestring or multiple single line strings as dictated by ``type``.
either a multilinestring or multiple single line strings as dictated by ``type``.
- lines will be converted to polygon rings if ``type`` is a polygon type
- curved geometries will be segmented if ``type`` is non-curved.
- multi geometries will be converted to a list of single geometries
Expand Down Expand Up @@ -2124,13 +2124,13 @@ The 2 types should match.

:return: ``True`` if objects are

- polylines and have the same number of points and all
points are equal within the specified tolerance
- polygons and have the same number of points and all
points are equal within the specified tolerance
- multipolygons and have the same number of polygons, the polygons have the same number
of rings, and each ring has the same number of points and all points are equal
within the specified tolerance
- polylines and have the same number of points and all
points are equal within the specified tolerance
- polygons and have the same number of points and all
points are equal within the specified tolerance
- multipolygons and have the same number of polygons, the polygons have the same number
of rings, and each ring has the same number of points and all points are equal
within the specified tolerance

.. versionadded:: 2.9
%End
Expand Down
2 changes: 1 addition & 1 deletion python/core/auto_generated/qgsdefaultvalue.sip.in
Expand Up @@ -23,7 +23,7 @@ Usual values for such an expression are

- `now()` for a timestamp for a record
- `@some_variable` to insert a project or application level variable like
the username of the one digitizing a feature
the username of the one digitizing a feature
- `$length` to insert a derived attribute of a geometry

QgsDefaultValue also has a `applyOnUpdate` flag which will indicate that a
Expand Down
16 changes: 8 additions & 8 deletions python/core/auto_generated/qgsprovidermetadata.sip.in
Expand Up @@ -230,14 +230,14 @@ Breaks a provider data source URI into its component paths (e.g. file path, laye

:return: map containing components. Standard components may include:

- "path": file path
- "layerName"
- "url": base URL, for online services
- "referer": referrer string, for HTTP requests
- "host": hostname, for database services
- "bounds": hardcoded layer bounds (as a QgsRectangle)
- "crs": CRS definition
- "authcfg": authentication configuration ID
- "path": file path
- "layerName"
- "url": base URL, for online services
- "referer": referrer string, for HTTP requests
- "host": hostname, for database services
- "bounds": hardcoded layer bounds (as a QgsRectangle)
- "crs": CRS definition
- "authcfg": authentication configuration ID

.. note::

Expand Down
8 changes: 4 additions & 4 deletions python/core/auto_generated/qgssettings.sip.in
Expand Up @@ -18,7 +18,7 @@ This class is a composition of two QSettings instances:

- the main QSettings instance is the standard User Settings and
- the second one (Global Settings) is meant to provide read-only
pre-configuration and defaults to the first one.
pre-configuration and defaults to the first one.

For a given settings key, the function call to value(key, default) will return
the first existing setting in the order specified below:
Expand Down Expand Up @@ -123,10 +123,10 @@ If format is QSettings.IniFormat, fileName is the name of an INI file.
other programs. In particular, be aware of the following limitations:

- QgsSettings provides no way of reading INI "path" entries, i.e., entries with unescaped slash characters.
(This is because these entries are ambiguous and cannot be resolved automatically.)
(This is because these entries are ambiguous and cannot be resolved automatically.)
- In INI files, QSettings uses the @ character as a metacharacter in some contexts, to encode
Qt-specific data types (e.g., \@Rect), and might therefore misinterpret it when it occurs
in pure INI files.
Qt-specific data types (e.g., \@Rect), and might therefore misinterpret it when it occurs
in pure INI files.
%End

explicit QgsSettings( QObject *parent = 0 );
Expand Down

0 comments on commit ae42850

Please sign in to comment.