Rename proj_obj_XXX as proj_XXX and PJ_OBJ_XXX as PJ_XXX

1 files changed, 21 insertions, 21 deletions

diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp
index e7f43c76..1e8fb474 100644
--- a/src/apps/cs2cs.cpp
+++ b/src/apps/cs2cs.cpp
@@ -213,7 +213,7 @@ static PJ *instanciate_crs(const std::string &definition,
                                const char *const *optionsImportCRS,
                                bool &isGeog, double &toRadians,
                                bool &isLatFirst) {
-    PJ *crs = proj_obj_create_from_user_input(nullptr, definition.c_str(),
+    PJ *crs = proj_create_from_user_input(nullptr, definition.c_str(),
                                                   optionsImportCRS);
     if (!crs) {
         return nullptr;
@@ -223,21 +223,21 @@ static PJ *instanciate_crs(const std::string &definition,
     toRadians = 0.0;
     isLatFirst = false;
 
-    auto type = proj_obj_get_type(crs);
-    if (type == PJ_OBJ_TYPE_BOUND_CRS) {
-        auto base = proj_obj_get_source_crs(nullptr, crs);
+    auto type = proj_get_type(crs);
+    if (type == PJ_TYPE_BOUND_CRS) {
+        auto base = proj_get_source_crs(nullptr, crs);
         proj_destroy(crs);
         crs = base;
-        type = proj_obj_get_type(crs);
+        type = proj_get_type(crs);
     }
-    if (type == PJ_OBJ_TYPE_GEOGRAPHIC_2D_CRS ||
-        type == PJ_OBJ_TYPE_GEOGRAPHIC_3D_CRS) {
-        auto cs = proj_obj_crs_get_coordinate_system(nullptr, crs);
+    if (type == PJ_TYPE_GEOGRAPHIC_2D_CRS ||
+        type == PJ_TYPE_GEOGRAPHIC_3D_CRS) {
+        auto cs = proj_crs_get_coordinate_system(nullptr, crs);
         assert(cs);
 
         isGeog = true;
         const char *axisName = "";
-        proj_obj_cs_get_axis_info(nullptr, cs, 0,
+        proj_cs_get_axis_info(nullptr, cs, 0,
                                   &axisName, // name,
                                   nullptr,   // abbrev
                                   nullptr,   // direction
@@ -263,32 +263,32 @@ static PJ *instanciate_crs(const std::string &definition,
 static std::string get_geog_crs_proj_string_from_proj_crs(PJ *src,
                                                           double &toRadians,
                                                           bool &isLatFirst) {
-    auto srcType = proj_obj_get_type(src);
-    if (srcType == PJ_OBJ_TYPE_BOUND_CRS) {
-        auto base = proj_obj_get_source_crs(nullptr, src);
+    auto srcType = proj_get_type(src);
+    if (srcType == PJ_TYPE_BOUND_CRS) {
+        auto base = proj_get_source_crs(nullptr, src);
         assert(base);
         proj_destroy(src);
         src = base;
-        srcType = proj_obj_get_type(src);
+        srcType = proj_get_type(src);
     }
-    if (srcType != PJ_OBJ_TYPE_PROJECTED_CRS) {
+    if (srcType != PJ_TYPE_PROJECTED_CRS) {
         return std::string();
     }
 
-    auto base = proj_obj_get_source_crs(nullptr, src);
+    auto base = proj_get_source_crs(nullptr, src);
     assert(base);
-    auto baseType = proj_obj_get_type(base);
-    if (baseType != PJ_OBJ_TYPE_GEOGRAPHIC_2D_CRS &&
-        baseType != PJ_OBJ_TYPE_GEOGRAPHIC_3D_CRS) {
+    auto baseType = proj_get_type(base);
+    if (baseType != PJ_TYPE_GEOGRAPHIC_2D_CRS &&
+        baseType != PJ_TYPE_GEOGRAPHIC_3D_CRS) {
         proj_destroy(base);
         return std::string();
     }
 
-    auto cs = proj_obj_crs_get_coordinate_system(nullptr, base);
+    auto cs = proj_crs_get_coordinate_system(nullptr, base);
     assert(cs);
 
     const char *axisName = "";
-    proj_obj_cs_get_axis_info(nullptr, cs, 0,
+    proj_cs_get_axis_info(nullptr, cs, 0,
                               &axisName, // name,
                               nullptr,   // abbrev
                               nullptr,   // direction
@@ -302,7 +302,7 @@ static std::string get_geog_crs_proj_string_from_proj_crs(PJ *src,
 
     proj_destroy(cs);
 
-    auto retCStr = proj_obj_as_proj_string(nullptr, base, PJ_PROJ_5, nullptr);
+    auto retCStr = proj_as_proj_string(nullptr, base, PJ_PROJ_5, nullptr);
     std::string ret(retCStr ? retCStr : "");
     proj_destroy(base);
     return ret;