Disable unused code on proj 6

nyalldawson · nyalldawson · commit 0b52a37cad1a · 2019-06-05T04:01:28.000+10:00
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -2064,6 +2064,7 @@ long QgsCoordinateReferenceSystem::getRecordCount()
   return myRecordCount;
 }
 
+#if PROJ_VERSION_MAJOR<6
 // adapted from gdal/ogr/ogr_srs_dict.cpp
 bool QgsCoordinateReferenceSystem::loadWkts( QHash<int, QString> &wkts, const char *filename )
 {
@@ -2195,6 +2196,7 @@ bool QgsCoordinateReferenceSystem::loadIds( QHash<int, QString> &wkts )
 
   return true;
 }
+#endif
 
 int QgsCoordinateReferenceSystem::syncDatabase()
 {
@@ -2750,6 +2752,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()
     return updated + inserted;
 }
 
+#if PROJ_VERSION_MAJOR<6
 bool QgsCoordinateReferenceSystem::syncDatumTransform( const QString &dbPath )
 {
   const char *filename = CSVFilename( "datum_shift.csv" );
@@ -2946,6 +2949,7 @@ bool QgsCoordinateReferenceSystem::syncDatumTransform( const QString &dbPath )
 
   return true;
 }
+#endif
 
 QString QgsCoordinateReferenceSystem::geographicCrsAuthId() const
 {
diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h
@@ -787,10 +787,13 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
      */
     bool loadFromDatabase( const QString &db, const QString &expression, const QString &value );
 
+#if PROJ_VERSION_MAJOR<6 // not used for proj >= 6.0
     static bool loadIds( QHash<int, QString> &wkts );
     static bool loadWkts( QHash<int, QString> &wkts, const char *filename );
+
     //! Update datum shift definitions from GDAL data. Used by syncDb()
     static bool syncDatumTransform( const QString &dbPath );
+#endif
 
     QExplicitlySharedDataPointer<QgsCoordinateReferenceSystemPrivate> d;
 

Original file line number	Diff line number	Diff line change
`@@ -2064,6 +2064,7 @@ long QgsCoordinateReferenceSystem::getRecordCount()`
`2064`	`2064`	`return myRecordCount;`
`2065`	`2065`	`}`
`2066`	`2066`
	`2067`	`+#if PROJ_VERSION_MAJOR<6`
`2067`	`2068`	`// adapted from gdal/ogr/ogr_srs_dict.cpp`
`2068`	`2069`	`bool QgsCoordinateReferenceSystem::loadWkts( QHash<int, QString> &wkts, const char *filename )`
`2069`	`2070`	`{`
`@@ -2195,6 +2196,7 @@ bool QgsCoordinateReferenceSystem::loadIds( QHash<int, QString> &wkts )`
`2195`	`2196`
`2196`	`2197`	`return true;`
`2197`	`2198`	`}`
	`2199`	`+#endif`
`2198`	`2200`
`2199`	`2201`	`int QgsCoordinateReferenceSystem::syncDatabase()`
`2200`	`2202`	`{`
`@@ -2750,6 +2752,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()`
`2750`	`2752`	`return updated + inserted;`
`2751`	`2753`	`}`
`2752`	`2754`
	`2755`	`+#if PROJ_VERSION_MAJOR<6`
`2753`	`2756`	`bool QgsCoordinateReferenceSystem::syncDatumTransform( const QString &dbPath )`
`2754`	`2757`	`{`
`2755`	`2758`	`const char *filename = CSVFilename( "datum_shift.csv" );`
`@@ -2946,6 +2949,7 @@ bool QgsCoordinateReferenceSystem::syncDatumTransform( const QString &dbPath )`
`2946`	`2949`
`2947`	`2950`	`return true;`
`2948`	`2951`	`}`
	`2952`	`+#endif`
`2949`	`2953`
`2950`	`2954`	`QString QgsCoordinateReferenceSystem::geographicCrsAuthId() const`
`2951`	`2955`	`{`