commit d211a48847a30c16820bcbf449bd82149f0edabd
parent b332ead60fc8c11b893850029fc0b4f0dab8da04
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Fri, 13 Jan 2023 11:12:30 +0100
Clean includes in header files
Diffstat:
15 files changed, 12 insertions(+), 38 deletions(-)
diff --git a/src/cg_args.h b/src/cg_args.h
@@ -24,6 +24,7 @@
#include <rsys/dynamic_array.h>
struct logger;
+struct mem_allocator;
#define DARRAY_NAME catalog_filenames
#define DARRAY_DATA char*
diff --git a/src/cg_building.h b/src/cg_building.h
@@ -24,14 +24,13 @@
#include <rsys/str.h>
#include <rsys/hash_table.h>
-#include "cg_constructive_mode_0.h"
-#include "cg_constructive_mode_1.h"
-
struct scpr_polygon;
struct scad_geometry;
struct mem_allocator;
struct logger;
struct catalog;
+struct building;
+struct parsed_city_building;
/* A type to store the functors of a constructive mode */
struct constructive_mode_functors {
diff --git a/src/cg_catalog.c b/src/cg_catalog.c
@@ -18,6 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "cg.h"
+#include "cg_building.h"
#include "cg_catalog.h"
#include "cg_catalog_parsing.h"
#include "cg_constructive_mode_0.h"
diff --git a/src/cg_catalog.h b/src/cg_catalog.h
@@ -22,8 +22,6 @@
#include "cg_constructive_mode_0.h"
#include "cg_constructive_mode_1.h"
-#include "cg_constructive_mode_0_parsing_schemas.h"
-#include "cg_constructive_mode_1_parsing_schemas.h"
struct mem_allocator;
struct logger;
diff --git a/src/cg_catalog_parsing.c b/src/cg_catalog_parsing.c
@@ -20,7 +20,9 @@
#include "cg.h"
#include "cg_args.h"
#include "cg_catalog_parsing.h"
-#include "cg_constructive_modes_parsing_schemas.h"
+#include "cg_constructive_mode_0_parsing_schemas.h"
+#include "cg_constructive_mode_1_parsing_schemas.h"
+#include "cg_city_parsing_schemas.h"
#include "cg_building.h"
#include <rsys/logger.h>
diff --git a/src/cg_catalog_parsing.h b/src/cg_catalog_parsing.h
@@ -20,9 +20,6 @@
#ifndef PARSING_H
#define PARSING_H
-#include "cg_building.h"
-#include "cg_constructive_mode_0_parsing_schemas.h"
-#include "cg_constructive_mode_1_parsing_schemas.h"
#include "cg_constructive_modes_parsing_schemas.h"
#include <rsys/rsys.h>
@@ -31,7 +28,6 @@
struct logger;
struct mem_allocator;
struct cyaml_config;
-struct cyaml_schema_value;
struct darray_catalog_filenames;
struct parsed_catalog_items {
diff --git a/src/cg_city.c b/src/cg_city.c
@@ -20,6 +20,7 @@
#include "cg.h"
#include "cg_city.h"
#include "cg_constructive_mode_0.h"
+#include "cg_constructive_mode_1.h"
#include "cg_ground.h"
#include "cg_catalog_parsing.h"
#include "cg_city_parsing.h"
@@ -27,8 +28,6 @@
#include "cg_args.h"
#include "cg_city_parsing_schemas.h"
-#include <rsys/text_reader.h>
-#include <rsys/cstr.h>
#include <rsys/logger.h>
#include <rsys/mem_allocator.h>
#include <rsys/double4.h>
diff --git a/src/cg_city.h b/src/cg_city.h
@@ -20,13 +20,10 @@
#ifndef CITY_H
#define CITY_H
-#include "cg_ground.h"
-
#include <star/scad.h>
struct logger;
struct mem_allocator;
-
struct building;
struct args;
struct parsed_city;
diff --git a/src/cg_city_parsing_schemas.h b/src/cg_city_parsing_schemas.h
@@ -24,6 +24,9 @@
#include <cyaml/cyaml.h>
+struct mem_allocator;
+struct logger;
+
/********************************************************/
/* Types used for parsing and to define parsing schemas */
/********************************************************/
diff --git a/src/cg_constructive_mode.h b/src/cg_constructive_mode.h
@@ -20,9 +20,9 @@
#ifndef CONSTRUCTIVE_MODE_H__
#define CONSTRUCTIVE_MODE_H__
-#include <rsys/rsys.h>
#include "cg_city_parsing_schemas.h"
+#include <rsys/rsys.h>
#include <star/scpr.h>
static void
diff --git a/src/cg_constructive_mode_0.h b/src/cg_constructive_mode_0.h
@@ -25,7 +25,6 @@
#include <rsys/hash_table.h>
struct scad_geometry;
-
struct building;
struct mem_allocator;
struct logger;
diff --git a/src/cg_constructive_mode_0_parsing_schemas.h b/src/cg_constructive_mode_0_parsing_schemas.h
@@ -20,18 +20,8 @@
#ifndef FG_MODE0_PARSING_SCHEMAS__
#define FG_MODE0_PARSING_SCHEMAS__
-#include "cg_building.h"
-#include "cg_city_parsing_schemas.h"
-
#include <cyaml/cyaml.h>
-#include <rsys/rsys.h>
-#include <rsys/str.h>
-
-struct scpr_polygon;
-struct scad_geometry;
-struct mem_allocator;
-
struct parsed_dataset_cmode_0 {
char* name;
double wall_thickness; /* must be > 0 */
diff --git a/src/cg_constructive_mode_1.h b/src/cg_constructive_mode_1.h
@@ -26,7 +26,6 @@
#include <rsys/dynamic_array.h>
struct scad_geometry;
-
struct building;
struct mem_allocator;
struct logger;
diff --git a/src/cg_constructive_mode_1_parsing_schemas.h b/src/cg_constructive_mode_1_parsing_schemas.h
@@ -20,18 +20,10 @@
#ifndef FG_MODE1_PARSING_SCHEMAS__
#define FG_MODE1_PARSING_SCHEMAS__
-#include "cg_building.h"
-#include "cg_city_parsing_schemas.h"
-
#include <cyaml/cyaml.h>
-#include <rsys/rsys.h>
#include <rsys/str.h>
-struct scpr_polygon;
-struct scad_geometry;
-struct mem_allocator;
-
struct parsed_dataset_cmode_1 {
char* name;
size_t inter_floor_count; /* can be 0 */
diff --git a/src/cg_ground.h b/src/cg_ground.h
@@ -23,8 +23,6 @@
#include <rsys/rsys.h>
struct city;
-
-struct scad_scene;
struct scad_geometry;
struct mem_allocator;
