Workaround sip issues

qgis · Nov 2, 2019 · c796b2d · c796b2d
1 parent 614fda3
commit c796b2d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 54 deletions.
diff --git a/python/core/auto_generated/qgis.sip.in b/python/core/auto_generated/qgis.sip.in
@@ -264,50 +264,20 @@ QString qgsVsiPrefix( const QString &path );
 
 
 
-QString geoWkt();
-%Docstring
-Wkt string that represents a geographic coord sys
-\since QGIS GEOWkt
-%End
-//! PROJ4 string that represents a geographic coord sys
-QString geoProj4();
-//! Geographic coord sys from EPSG authority
-QString geoEpsgCrsAuthId();
-//! Constant that holds the string representation for "No ellips/No CRS"
-QString geoNone();
-
-//! Magic number for a geographic coord sys in POSTGIS SRID
 const long GEOSRID;
 
-//! Magic number for a geographic coord sys in QGIS srs.db tbl_srs.srs_id
 const long GEOCRS_ID;
 
-//! Magic number for a geographic coord sys in EpsgCrsId ID format
 const long GEO_EPSG_CRS_ID;
 
 const int USER_CRS_START_ID;
 
-//
-// Constants for point symbols
-//
 
-//! Magic number that determines the default point size for point symbols
 const double DEFAULT_POINT_SIZE;
 const double DEFAULT_LINE_WIDTH;
 
-//! Default snapping tolerance for segments
 const double DEFAULT_SEGMENT_EPSILON;
 
-///@cond PRIVATE
-#ifndef SIP_RUN
-
-//! Delay between the scheduling of 2 preview jobs
-const int PREVIEW_JOB_DELAY_MS;
-
-//! Maximum rendering time for a layer of a preview job
-const int MAXIMUM_LAYER_PREVIEW_TIME_MS;
-
-
 
 typedef unsigned long long qgssize;
 
@@ -318,6 +288,17 @@ typedef unsigned long long qgssize;
 
 
 
+QString geoWkt();
+%Docstring
+Wkt string that represents a geographic coord sys
+\since QGIS GEOWkt
+%End
+//! PROJ4 string that represents a geographic coord sys
+QString geoProj4();
+//! Geographic coord sys from EPSG authority
+QString geoEpsgCrsAuthId();
+//! Constant that holds the string representation for "No ellips/No CRS"
+QString geoNone();
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -635,22 +635,16 @@ constexpr QLatin1String CORE_EXPORT geoNone()
 {
   return QLatin1String( "NONE" );
 }
-#else
+///@cond PRIVATE
 
-/**
- * Wkt string that represents a geographic coord sys
- * \since QGIS GEOWkt
- */
-QString CORE_EXPORT geoWkt()
+//! Delay between the scheduling of 2 preview jobs
+const int PREVIEW_JOB_DELAY_MS = 250;
 
-//! PROJ4 string that represents a geographic coord sys
-QString CORE_EXPORT geoProj4()
+//! Maximum rendering time for a layer of a preview job
+const int MAXIMUM_LAYER_PREVIEW_TIME_MS = 250;
 
-//! Geographic coord sys from EPSG authority
-QString CORE_EXPORT geoEpsgCrsAuthId()
+///@endcond
 
-//! Constant that holds the string representation for "No ellips/No CRS"
-QString CORE_EXPORT geoNone()
 #endif
 
 //! Magic number for a geographic coord sys in POSTGIS SRID
@@ -678,18 +672,6 @@ const double DEFAULT_LINE_WIDTH = 0.26;
 //! Default snapping tolerance for segments
 const double DEFAULT_SEGMENT_EPSILON = 1e-8;
 
-///@cond PRIVATE
-#ifndef SIP_RUN
-
-//! Delay between the scheduling of 2 preview jobs
-const int PREVIEW_JOB_DELAY_MS = 250;
-
-//! Maximum rendering time for a layer of a preview job
-const int MAXIMUM_LAYER_PREVIEW_TIME_MS = 250;
-#endif
-
-///@endcond
-
 typedef QMap<QString, QString> QgsStringMap SIP_SKIP;
 
 /**
@@ -801,4 +783,21 @@ typedef unsigned long long qgssize;
 #define FINAL final
 #endif
 
+#ifdef SIP_RUN
 
+/**
+ * Wkt string that represents a geographic coord sys
+ * \since QGIS GEOWkt
+ */
+QString CORE_EXPORT geoWkt()
+
+//! PROJ4 string that represents a geographic coord sys
+QString CORE_EXPORT geoProj4()
+
+//! Geographic coord sys from EPSG authority
+QString CORE_EXPORT geoEpsgCrsAuthId()
+
+//! Constant that holds the string representation for "No ellips/No CRS"
+QString CORE_EXPORT geoNone()
+
+#endif