Remove unused symbols from qgis.h

Also slow down @NathanW2's build
qgis · May 5, 2017 · 67e1558 · 67e1558 · NathanW2 · May 5, 2017
1 parent 02e96a2
commit 67e1558
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 36 deletions.
diff --git a/python/core/qgis.sip b/python/core/qgis.sip
@@ -65,18 +65,6 @@ class Qgis
           QImage::Format_ARGB32_Premultiplied */        ARGB32_Premultiplied,
     };
 
-    //! User defined event types
-    enum UserEvent
-    {
-      // These first two are useful for threads to alert their parent data providers
-
-      //! The extents have been calculated by a provider of a layer
-      ProviderExtentCalcEvent,
-
-      //! The row count has been calculated by a provider of a layer
-      ProviderCountCalcEvent
-    };
-
     /** Identify search radius in mm
      *  @note added in 2.3 */
     static const double DEFAULT_SEARCH_RADIUS_MM;
@@ -151,12 +139,6 @@ const long GEOCRS_ID;
 const long GEO_EPSG_CRS_ID;
 /** Geographic coord sys from EPSG authority */
 const QString GEO_EPSG_CRS_AUTHID;
-/** The length of the string "+proj=" */
-const int PROJ_PREFIX_LEN;
-/** The length of the string "+ellps=" */
-const int ELLPS_PREFIX_LEN;
-/** The length of the string "+lat_1=" */
-const int LAT_PREFIX_LEN;
 /** Magick number that determines whether a projection crsid is a system (srs.db)
  *  or user (~/.qgis.qgis.db) defined projection. */
 const int USER_CRS_START_ID;

diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -79,18 +79,6 @@ class CORE_EXPORT Qgis
       ARGB32_Premultiplied = 13 //!< Color, alpha, red, green, blue, 4 bytes  the same as QImage::Format_ARGB32_Premultiplied
     };
 
-    //! User defined event types
-    enum UserEvent
-    {
-      // These first two are useful for threads to alert their parent data providers
-
-      //! The extents have been calculated by a provider of a layer
-      ProviderExtentCalcEvent = ( QEvent::User + 1 ),
-
-      //! The row count has been calculated by a provider of a layer
-      ProviderCountCalcEvent
-    };
-
     /** Identify search radius in mm
      *  \since QGIS 2.3 */
     static const double DEFAULT_SEARCH_RADIUS_MM;
@@ -320,12 +308,6 @@ const long GEOCRS_ID = 3452;
 const long GEO_EPSG_CRS_ID = 4326;
 //! Geographic coord sys from EPSG authority
 extern CORE_EXPORT const QString GEO_EPSG_CRS_AUTHID;
-//! The length of the string "+proj="
-const int PROJ_PREFIX_LEN = 6;
-//! The length of the string "+ellps="
-const int ELLPS_PREFIX_LEN = 7;
-//! The length of the string "+lat_1="
-const int LAT_PREFIX_LEN = 7;
 
 /** Magick number that determines whether a projection crsid is a system (srs.db)
  *  or user (~/.qgis.qgis.db) defined projection. */

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -45,6 +45,9 @@
 #include <cpl_conv.h>
 #include <cpl_csv.h>
 
+//! The length of the string "+lat_1="
+const int LAT_PREFIX_LEN = 7;
+
 CUSTOM_CRS_VALIDATION QgsCoordinateReferenceSystem::mCustomSrsValidation = nullptr;
 
 QReadWriteLock QgsCoordinateReferenceSystem::sSrIdCacheLock;