Layout fixes

qgis · Dec 20, 2019 · b7a4409 · b7a4409
1 parent 6490a17
commit b7a4409
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/python/core/auto_generated/qgscoordinatereferencesystem.sip.in b/python/core/auto_generated/qgscoordinatereferencesystem.sip.in
@@ -216,9 +216,7 @@ Constructor a CRS object using a PostGIS SRID, an EPSG code or an internal QGIS
 :param type: One of the types described in CrsType
 
 .. deprecated::
-   We encourage you to use EPSG codes or WKT to describe CRSes in your code
-wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile,
-and Proj strings are a lossy format.
+   We encourage you to use EPSG codes or WKT to describe CRSes in your code wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile, and Proj strings are a lossy format.
 %End
 
     QgsCoordinateReferenceSystem( const QgsCoordinateReferenceSystem &srs );
@@ -329,9 +327,7 @@ Sets this CRS by lookup of the given ID in the CRS database.
 :return: ``True`` on success else ``False``
 
 .. deprecated::
-   We encourage you to use EPSG code or WKT to describe CRSes in your code
-wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile,
-and Proj strings are a lossy format.
+   We encourage you to use EPSG code or WKT to describe CRSes in your code wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile, and Proj strings are a lossy format.
 %End
 
 
@@ -362,9 +358,7 @@ Sets this CRS by lookup of the given PostGIS SRID in the CRS database.
 :return: ``True`` on success else ``False``
 
 .. deprecated::
-   Use alternative methods for SRS construction instead -- this
-method was specifically created for use by the postgres provider alone,
-and using it elsewhere will lead to subtle bugs.
+   Use alternative methods for SRS construction instead -- this method was specifically created for use by the postgres provider alone, and using it elsewhere will lead to subtle bugs.
 %End
 
     bool createFromWkt( const QString &wkt );

diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h
@@ -251,9 +251,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
      * and proj strings are a lossy format.
      * \param id The ID valid for the chosen CRS ID type
      * \param type One of the types described in CrsType
-     * \deprecated We encourage you to use EPSG codes or WKT to describe CRSes in your code
-     * wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile,
-     * and Proj strings are a lossy format.
+     * \deprecated We encourage you to use EPSG codes or WKT to describe CRSes in your code wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile, and Proj strings are a lossy format.
      */
     Q_DECL_DEPRECATED explicit QgsCoordinateReferenceSystem( long id, CrsType type = PostgisCrsId ) SIP_DEPRECATED;
 
@@ -341,9 +339,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
     /**
      * Sets this CRS by lookup of the given ID in the CRS database.
      * \returns TRUE on success else FALSE
-     * \deprecated We encourage you to use EPSG code or WKT to describe CRSes in your code
-     * wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile,
-     * and Proj strings are a lossy format.
+     * \deprecated We encourage you to use EPSG code or WKT to describe CRSes in your code wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile, and Proj strings are a lossy format.
      */
     Q_DECL_DEPRECATED bool createFromId( long id, CrsType type = PostgisCrsId ) SIP_DEPRECATED;
 
@@ -368,9 +364,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
      * \param srid The PostGIS SRID for the desired spatial reference system.
      * \returns TRUE on success else FALSE
      *
-     * \deprecated Use alternative methods for SRS construction instead -- this
-     * method was specifically created for use by the postgres provider alone,
-     * and using it elsewhere will lead to subtle bugs.
+     * \deprecated Use alternative methods for SRS construction instead -- this method was specifically created for use by the postgres provider alone, and using it elsewhere will lead to subtle bugs.
      */
     Q_DECL_DEPRECATED bool createFromSrid( long srid ) SIP_DEPRECATED;
 

diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -1507,7 +1507,7 @@ void TestQgsCoordinateReferenceSystem::displayIdentifier()
   // non registered custom CRS
   crs = QgsCoordinateReferenceSystem::fromProj( QStringLiteral( "+proj=sterea +lat_0=47.9860018439082 +lon_0=19.0491441390302 +k=1 +x_0=500000 +y_0=500000 +ellps=bessel +towgs84=595.75,121.09,515.50,8.2270,-1.5193,5.5971,-2.6729 +units=m +vunits=m +no_defs" ) );
 #if PROJ_VERSION_MAJOR>=6
-  QCOMPARE( crs.userFriendlyIdentifier(), QStringLiteral( "Unknown CRS: COMPD_CS[\"unknown\",PROJCS[\"unknown\",GEOGCS[\"unknow%1" ).arg( QString( QChar( 0x2026 ) ) ) );
+  QCOMPARE( crs.userFriendlyIdentifier(), QStringLiteral( "Unknown CRS: COMPD_CS[\"unknown\",PROJCS[\"unknown\",GEOGCS[\"unknow%1" ).arg( QString( QChar( 0x2026 ) ) ) );  //#spellok
 #else
   QCOMPARE( crs.userFriendlyIdentifier(), QStringLiteral( "Unknown CRS: PROJCS[\"unnamed\",GEOGCS[\"Bessel 1841\",DATUM[\"unkno%1" ).arg( QString( QChar( 0x2026 ) ) ) );
 #endif