Add ACCEPT_USE_OF_DEPRECATED_PROJ_API_H macro for proj_api.h to work with new release of proj4.

Author: swiss-knight

src/app/qgisapp.cpp

@@ -344,6 +344,9 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
 #ifdef PROJ_HAS_INFO
 #include <proj.h>
 #endif
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif	
 #include <proj_api.h>
 
 //

src/app/qgscustomprojectiondialog.cpp

@@ -40,6 +40,9 @@
 //proj4 includes
 extern "C"
 {
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif		
 #include <proj_api.h>
 }
 

src/core/qgscoordinatereferencesystem.cpp

@@ -38,6 +38,9 @@
 #include "qgssettings.h"
 
 #include <sqlite3.h>
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif
 #include <proj_api.h>
 
 //gdal and ogr includes (needed for == operator)
@@ -46,6 +49,7 @@
 #include <cpl_conv.h>
 #include <cpl_csv.h>
 
+
 //! The length of the string "+lat_1="
 const int LAT_PREFIX_LEN = 7;
 

src/core/qgscoordinatetransform.cpp

@@ -34,6 +34,9 @@
 
 extern "C"
 {
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif
 #include <proj_api.h>
 }
 #include <sqlite3.h>

src/core/qgscoordinatetransform_p.cpp

@@ -21,6 +21,9 @@
 
 extern "C"
 {
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif	
 #include <proj_api.h>
 }
 #include <sqlite3.h>

tests/src/core/testqgscoordinatereferencesystem.cpp

@@ -24,6 +24,9 @@ Email                : sherman at mrcc dot com
 #include "qgsvectorlayer.h"
 #include "qgsproject.h"
 
+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+#endif	
 #include <proj_api.h>
 #include <gdal.h>
 #include <cpl_conv.h>