Remove proj_api.h

Removes proj_api.h from the public API. The contents of the header file has been moved to proj_internal.h verbatim and any references to proj_api.h has been changed to proj_internal.h. The documentation of proj_api.h has been removed. The only exception to this is the API migration guides which still mention the old API. Fixes OSGeo#837
kbevers · Nov 1, 2020 · 1efb8ea · 1efb8ea
1 parent cccd65e
commit 1efb8ea
Show file tree

Hide file tree

Showing 18 changed files with 164 additions and 527 deletions.
diff --git a/docs/source/development/index.rst b/docs/source/development/index.rst
@@ -39,9 +39,8 @@ are maintained in a `separate git repository <https://github.com/OSGeo/proj-datu
 .. attention::
 
     The ``proj_api.h`` header and the functions related to it is
-    considered deprecated from version 5.0.0 and onwards. The header will be
-    removed from PROJ in version 7.0.0 scheduled for release March 1st
-    2020.
+    considered deprecated from version 5.0.0 and onwards. The header has been
+    removed in version 8.0.0 released March 1st 2021.
 
 .. attention::
 

diff --git a/docs/source/development/reference/deprecated.rst b/docs/source/development/reference/deprecated.rst
diff --git a/docs/source/development/reference/index.rst b/docs/source/development/reference/index.rst
@@ -10,4 +10,3 @@ Reference
    datatypes
    functions
    cpp/index.rst
-   deprecated
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS =	-DPROJ_LIB=\"$(pkgdatadir)\" \
 		-DMUTEX_@MUTEX_SETTING@ -I$(top_srcdir)/include @SQLITE3_CFLAGS@ @TIFF_CFLAGS@ @TIFF_ENABLED_FLAGS@ @CURL_CFLAGS@ @CURL_ENABLED_FLAGS@
 AM_CXXFLAGS =    @CXX_WFLAGS@ @FLTO_FLAG@
 
-include_HEADERS = proj.h proj_experimental.h proj_constants.h proj_api.h geodesic.h \
+include_HEADERS = proj.h proj_experimental.h proj_constants.h geodesic.h \
 	 proj_symbol_rename.h
 
 EXTRA_DIST = bin_cct.cmake bin_gie.cmake bin_cs2cs.cmake \

diff --git a/src/apps/emess.cpp b/src/apps/emess.cpp
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "proj_api.h"
+#include "proj_internal.h"
 #include "proj_config.h"
 #define EMESS_ROUTINE
 #include "emess.h"

diff --git a/src/iso19111/datum.cpp b/src/iso19111/datum.cpp
@@ -43,7 +43,6 @@
 // clang-format off
 #include "proj.h"
 #include "proj_internal.h"
-#include "proj_api.h"
 // clang-format on
 
 #include "proj_json_streaming_writer.hpp"

diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
@@ -65,7 +65,6 @@
 // clang-format off
 #include "proj.h"
 #include "proj_internal.h"
-#include "proj_api.h"
 // clang-format on
 
 #include <sqlite3.h>

diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
@@ -70,7 +70,6 @@
 // clang-format off
 #include "proj.h"
 #include "proj_internal.h"
-#include "proj_api.h"
 // clang-format on
 
 using namespace NS_PROJ::common;

diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake
@@ -275,7 +275,6 @@ set(SRC_LIBPROJ_CORE
 )
 
 set(HEADERS_LIBPROJ
-  proj_api.h
   proj.h
   proj_experimental.h
   proj_constants.h

diff --git a/src/mutex.cpp b/src/mutex.cpp
@@ -34,11 +34,6 @@
 #ifndef _WIN32
 #include "proj_config.h"
 #include "proj_internal.h"
-#else
-#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-#endif
-#include "proj_api.h"
 #endif
 
 /* on win32 we always use win32 mutexes, even if pthreads are available */

diff --git a/src/proj.h b/src/proj.h
@@ -119,10 +119,6 @@
 
 #include <stddef.h>  /* For size_t */
 
-#ifdef PROJ_API_H
-#error proj.h must be included before proj_api.h
-#endif
-
 #ifdef PROJ_RENAME_SYMBOLS
 #include "proj_symbol_rename.h"
 #endif