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

swiss-knight · nyalldawson · commit b5ad33f6390f · 2018-11-27T08:44:42.000+10:00
(cherry picked from commit 6a7e951)
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -349,6 +349,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>
 
 //
diff --git a/src/app/qgscustomprojectiondialog.cpp b/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>
 }
 
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/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;
 
diff --git a/src/core/qgscoordinatetransform.cpp b/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>
diff --git a/src/core/qgscoordinatetransform_p.cpp b/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>
diff --git a/src/native/mac/qgsmacnative.mm b/src/native/mac/qgsmacnative.mm
@@ -122,12 +122,15 @@ - ( BOOL )userNotificationCenter:( NSUserNotificationCenter * )center shouldPres
 bool QgsMacNative::hasDarkTheme()
 {
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_14
-  if ([NSApp respondsToSelector:@selector(effectiveAppearance)]) {
+  if ( [NSApp respondsToSelector:@selector( effectiveAppearance )] )
+  {
     // compiled on macos 10.14+ AND running on macos 10.14+
     // check the settings of effective appearance of the user
     NSAppearanceName appearanceName = [NSApp.effectiveAppearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]];
-    return ([appearanceName isEqualToString:NSAppearanceNameDarkAqua]);
-  } else {
+    return ( [appearanceName isEqualToString:NSAppearanceNameDarkAqua] );
+  }
+  else
+  {
     // compiled on macos 10.14+ BUT running on macos 10.13-
     // DarkTheme was introduced in MacOS 10.14, fallback to light theme
     return false;
diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/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>

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,9 @@`
`40`	`40`	`//proj4 includes`
`41`	`41`	`extern "C"`
`42`	`42`	`{`
	`43`	`+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H`
	`44`	`+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H`
	`45`	`+#endif`
`43`	`46`	`#include <proj_api.h>`
`44`	`47`	`}`
`45`	`48`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@`
`34`	`34`
`35`	`35`	`extern "C"`
`36`	`36`	`{`
	`37`	`+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H`
	`38`	`+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H`
	`39`	`+#endif`
`37`	`40`	`#include <proj_api.h>`
`38`	`41`	`}`
`39`	`42`	`#include <sqlite3.h>`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@`
`21`	`21`
`22`	`22`	`extern "C"`
`23`	`23`	`{`
	`24`	`+#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H`
	`25`	`+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H`
	`26`	`+#endif`
`24`	`27`	`#include <proj_api.h>`
`25`	`28`	`}`
`26`	`29`	`#include <sqlite3.h>`