Remove deprecated .h headers

equinor · Aug 7, 2024 · b32c294 · b32c294
1 parent 9a7d855
commit b32c294
Show file tree

Hide file tree

Showing 284 changed files with 891 additions and 1,587 deletions.
diff --git a/applications/resdata/convert.c b/applications/resdata/convert.c
@@ -21,12 +21,12 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <ert/util/util.h>
+#include <ert/util/util.hpp>
 
-#include <resdata/rd_kw.h>
+#include <resdata/rd_kw.hpp>
 #include <resdata/fortio.h>
-#include <resdata/rd_util.h>
-#include <resdata/rd_endian_flip.h>
+#include <resdata/rd_util.hpp>
+#include <resdata/rd_endian_flip.hpp>
 
 void file_convert(const char *src_file, const char *target_file,
                   rd_file_enum file_type, bool fmt_src) {

diff --git a/applications/resdata/grdecl_grid.c b/applications/resdata/grdecl_grid.c
@@ -19,11 +19,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <ert/util/util.h>
+#include <ert/util/util.hpp>
 
-#include <resdata/rd_kw.h>
-#include <resdata/rd_grid.h>
-#include <resdata/rd_kw_magic.h>
+#include <resdata/rd_kw.hpp>
+#include <resdata/rd_grid.hpp>
+#include <resdata/rd_kw_magic.hpp>
 
 int main(int argc, char **argv) {
     FILE *stream = util_fopen(argv[1], "r");

diff --git a/applications/resdata/grdecl_test.c b/applications/resdata/grdecl_test.c
@@ -19,8 +19,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <ert/util/util.h>
-#include <resdata/rd_kw.h>
+#include <ert/util/util.hpp>
+#include <resdata/rd_kw.hpp>
 
 int main(int argc, char **argv) {
     FILE *stream = util_fopen(argv[1], "r");

diff --git a/applications/resdata/grid_dump.c b/applications/resdata/grid_dump.c
@@ -19,9 +19,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <ert/util/util.h>
+#include <ert/util/util.hpp>
 
-#include <resdata/rd_grid.h>
+#include <resdata/rd_grid.hpp>
 
 int main(int argc, char **argv) {
     if (argc < 2) {

diff --git a/applications/resdata/grid_dump_ascii.c b/applications/resdata/grid_dump_ascii.c
@@ -19,9 +19,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <ert/util/util.h>
+#include <ert/util/util.hpp>
 
-#include <resdata/rd_grid.h>
+#include <resdata/rd_grid.hpp>
 
 int main(int argc, char **argv) {
     if (argc < 2) {

diff --git a/applications/resdata/grid_info.c b/applications/resdata/grid_info.c
@@ -19,9 +19,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <ert/util/util.h>
+#include <ert/util/util.hpp>
 
-#include <resdata/rd_grid.h>
+#include <resdata/rd_grid.hpp>
 
 int main(int argc, char **argv) {
     if (argc < 2) {

diff --git a/applications/resdata/kw_extract.cpp b/applications/resdata/kw_extract.cpp
@@ -2,16 +2,16 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <ert/util/util.h>
-#include <ert/util/hash.h>
-#include <ert/util/stringlist.h>
+#include <ert/util/util.hpp>
+#include <ert/util/hash.hpp>
+#include <ert/util/stringlist.hpp>
 
-#include <resdata/rd_kw.h>
+#include <resdata/rd_kw.hpp>
 #include <resdata/fortio.h>
-#include <resdata/rd_util.h>
-#include <resdata/rd_sum.h>
-#include <resdata/rd_grid.h>
-#include <resdata/rd_endian_flip.h>
+#include <resdata/rd_util.hpp>
+#include <resdata/rd_sum.hpp>
+#include <resdata/rd_grid.hpp>
+#include <resdata/rd_endian_flip.hpp>
 
 /**
    This file will extract all occurences of kw1,kw2,...,kwn from the

diff --git a/applications/resdata/kw_list.c b/applications/resdata/kw_list.c
@@ -21,10 +21,10 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <resdata/rd_kw.h>
+#include <resdata/rd_kw.hpp>
 #include <resdata/fortio.h>
-#include <resdata/rd_util.h>
-#include <resdata/rd_endian_flip.h>
+#include <resdata/rd_util.hpp>
+#include <resdata/rd_endian_flip.hpp>
 
 void kw_list(const char *filename) {
     fortio_type *fortio;

diff --git a/applications/resdata/load_test.c b/applications/resdata/load_test.c
@@ -20,8 +20,8 @@
 #include <stdio.h>
 #include <stdbool.h>
 
-#include <resdata/rd_grid.h>
-#include <resdata/rd_file.h>
+#include <resdata/rd_grid.hpp>
+#include <resdata/rd_file.hpp>
 
 void test_case(const char *base, bool load_all) {
     char *grid_file = rd_alloc_filename(NULL, base, RD_EGRID_FILE, false, 0);

diff --git a/applications/resdata/make_grid.c b/applications/resdata/make_grid.c
@@ -19,9 +19,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <ert/util/util.h>
+#include <ert/util/util.hpp>
 
-#include <resdata/rd_grid.h>
+#include <resdata/rd_grid.hpp>
 
 int main(int argc, char **argv) {
     if (argc != 5) {

diff --git a/applications/resdata/rd_pack.c b/applications/resdata/rd_pack.c
@@ -18,13 +18,13 @@
 
 #include <stdlib.h>
 
-#include <ert/util/util.h>
-#include <ert/util/stringlist.h>
+#include <ert/util/util.hpp>
+#include <ert/util/stringlist.hpp>
 
-#include <resdata/rd_file.h>
-#include <resdata/rd_util.h>
-#include <resdata/rd_endian_flip.h>
-#include <resdata/rd_type.h>
+#include <resdata/rd_file.hpp>
+#include <resdata/rd_util.hpp>
+#include <resdata/rd_endian_flip.hpp>
+#include <resdata/rd_type.hpp>
 
 int main(int argc, char **argv) {
     int num_files = argc - 1;

diff --git a/applications/resdata/rd_unpack.c b/applications/resdata/rd_unpack.c
@@ -18,13 +18,13 @@
 
 #include <stdbool.h>
 
-#include <ert/util/util.h>
+#include <ert/util/util.hpp>
 
-#include <resdata/rd_file.h>
-#include <resdata/rd_util.h>
-#include <resdata/rd_kw.h>
-#include <resdata/rd_endian_flip.h>
-#include <resdata/rd_kw_magic.h>
+#include <resdata/rd_file.hpp>
+#include <resdata/rd_util.hpp>
+#include <resdata/rd_kw.hpp>
+#include <resdata/rd_endian_flip.hpp>
+#include <resdata/rd_kw_magic.hpp>
 
 void unpack_file(const char *filename) {
     rd_file_enum target_type = RD_OTHER_FILE;

diff --git a/applications/resdata/select_test.c b/applications/resdata/select_test.c
@@ -19,10 +19,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <ert/util/util.h>
-#include <ert/util/stringlist.h>
+#include <ert/util/util.hpp>
+#include <ert/util/stringlist.hpp>
 
-#include <resdata/rd_kw.h>
+#include <resdata/rd_kw.hpp>
 
 int main(int argc, char **argv) {
     const char *path = argv[1];

diff --git a/applications/resdata/sum_write.cpp b/applications/resdata/sum_write.cpp
@@ -1,12 +1,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ert/util/util.h>
-#include <ert/util/vector.h>
+#include <ert/util/util.hpp>
+#include <ert/util/vector.hpp>
 
-#include <resdata/rd_kw.h>
-#include <resdata/rd_sum.h>
-#include <resdata/smspec_node.h>
+#include <resdata/rd_kw.hpp>
+#include <resdata/rd_sum.hpp>
+#include <resdata/smspec_node.hpp>
 
 /*
   The summary data is stored in two different files:

diff --git a/applications/resdata/view_summary.cpp b/applications/resdata/view_summary.cpp
@@ -2,13 +2,13 @@
 #include <string.h>
 #include <signal.h>
 
-#include <ert/util/ert_api_config.h>
+#include <ert/util/ert_api_config.hpp>
 
 #ifdef ERT_HAVE_GETOPT
 #include <getopt.h>
 #endif
 
-#include <ert/util/util.h>
+#include <ert/util/util.hpp>
 #include <ert/util/stringlist.hpp>
 
 #include <resdata/rd_kw.hpp>

diff --git a/applications/well/ri_well_test.c b/applications/well/ri_well_test.c
@@ -16,9 +16,9 @@
    for more details.
 */
 
-#include <resdata/rd_grid.h>
-#include <resdata/well/well_state.h>
-#include <resdata/well/well_info.h>
+#include <resdata/rd_grid.hpp>
+#include <resdata/well/well_state.hpp>
+#include <resdata/well/well_info.hpp>
 
 /*
   This is a small test program which will load the well information in

diff --git a/applications/well/segment_info.c b/applications/well/segment_info.c
@@ -19,19 +19,19 @@
 #include <stdbool.h>
 #include <math.h>
 
-#include <ert/util/stringlist.h>
-#include <ert/util/test_util.h>
-
-#include <resdata/rd_util.h>
-#include <resdata/rd_file.h>
-#include <resdata/rd_rsthead.h>
-#include <resdata/rd_kw_magic.h>
-#include <resdata/rd_grid.h>
-
-#include <resdata/well/well_conn_collection.h>
-#include <resdata/well/well_segment.h>
-#include <resdata/well/well_const.h>
-#include <resdata/well/well_segment_collection.h>
+#include <ert/util/stringlist.hpp>
+#include <ert/util/test_util.hpp>
+
+#include <resdata/rd_util.hpp>
+#include <resdata/rd_file.hpp>
+#include <resdata/rd_rsthead.hpp>
+#include <resdata/rd_kw_magic.hpp>
+#include <resdata/rd_grid.hpp>
+
+#include <resdata/well/well_conn_collection.hpp>
+#include <resdata/well/well_segment.hpp>
+#include <resdata/well/well_const.hpp>
+#include <resdata/well/well_segment_collection.hpp>
 
 int main(int argc, char **argv) {
     const char *Xfile = argv[1];

diff --git a/applications/well/well_CF_dump.c b/applications/well/well_CF_dump.c
@@ -16,9 +16,9 @@
    for more details.
 */
 
-#include <resdata/rd_grid.h>
-#include <resdata/well/well_state.h>
-#include <resdata/well/well_info.h>
+#include <resdata/rd_grid.hpp>
+#include <resdata/well/well_state.hpp>
+#include <resdata/well/well_info.hpp>
 
 int main(int argc, char **argv) {
     char *grid_file = argv[1];

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -25,7 +25,6 @@ endif()
 foreach(type int double long time_t float)
   set(TYPE ${type})
   set(SIGNED_TYPE true)
-  configure_file(vector_template.h.in include/ert/util/${type}_vector.h)
   configure_file(vector_template.hpp.in include/ert/util/${type}_vector.hpp)
   configure_file(util/vector_template.cpp.in ${type}_vector.cpp)
   list(APPEND opt_srcs ${CMAKE_CURRENT_BINARY_DIR}/${type}_vector.cpp)
@@ -34,7 +33,6 @@ endforeach()
 foreach(type bool size_t)
   set(TYPE ${type})
   set(SIGNED_TYPE false)
-  configure_file(vector_template.h.in include/ert/util/${type}_vector.h)
   configure_file(vector_template.hpp.in include/ert/util/${type}_vector.hpp)
   configure_file(util/vector_template.cpp.in ${type}_vector.cpp)
   list(APPEND opt_srcs ${CMAKE_CURRENT_BINARY_DIR}/${type}_vector.cpp)
@@ -44,8 +42,6 @@ if(ZLIB_FOUND)
   list(APPEND opt_srcs util/util_zlib.cpp)
 endif()
 
-configure_file(build_config.h.in include/ert/util/build_config.h)
-configure_file(ert_api_config.h.in include/ert/util/ert_api_config.h)
 configure_file(build_config.hpp.in include/ert/util/build_config.hpp)
 configure_file(ert_api_config.hpp.in include/ert/util/ert_api_config.hpp)
 

diff --git a/lib/build_config.h.in b/lib/build_config.h.in