Make API more consistent

hypirion · aothms · commit e39835d25e5a · 2018-10-15T11:25:17.000+02:00
diff --git a/src/ifcconvert/IfcConvert.cpp b/src/ifcconvert/IfcConvert.cpp
@@ -499,7 +499,7 @@ int main(int argc, char** argv)
 
 		if (!default_material_filename.empty()) {
 			try {
-				IfcGeom::set_default_style(default_material_filename);
+				IfcGeom::set_default_style_file(default_material_filename);
 			} catch (const std::exception& e) {
 				std::cerr << "[Error] Could not read default material file " << default_material_filename << ":" << std::endl;
 				std::cerr << e.what() << std::endl;
diff --git a/src/ifcgeom/IfcGeomRenderStyles.cpp b/src/ifcgeom/IfcGeomRenderStyles.cpp
@@ -195,7 +195,7 @@ boost::optional<IfcGeom::SurfaceStyle::ColorComponent> read_colour_component(con
 	return IfcGeom::SurfaceStyle::ColorComponent(rgb[0], rgb[1], rgb[2]);
 }
 
-void IfcGeom::set_default_style(const std::string& json_file) {
+void IfcGeom::set_default_style_file(const std::string& json_file) {
   if (!default_materials_initialized) InitDefaultMaterials();
   default_materials.clear();
 
diff --git a/src/ifcgeom/IfcGeomRenderStyles.h b/src/ifcgeom/IfcGeomRenderStyles.h
@@ -97,7 +97,7 @@ namespace IfcGeom {
 	};
 
   IFC_GEOM_API const SurfaceStyle* get_default_style(const std::string& ifc_type);
-  IFC_GEOM_API void set_default_style(const std::string& json_file);
+	IFC_GEOM_API void set_default_style_file(const std::string& json_file);
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ boost::optional<IfcGeom::SurfaceStyle::ColorComponent> read_colour_component(con`
`195`	`195`	`return IfcGeom::SurfaceStyle::ColorComponent(rgb[0], rgb[1], rgb[2]);`
`196`	`196`	`}`
`197`	`197`
`198`		`-void IfcGeom::set_default_style(const std::string& json_file) {`
	`198`	`+void IfcGeom::set_default_style_file(const std::string& json_file) {`
`199`	`199`	`if (!default_materials_initialized) InitDefaultMaterials();`
`200`	`200`	`default_materials.clear();`
`201`	`201`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ namespace IfcGeom {`
`97`	`97`	`};`
`98`	`98`
`99`	`99`	`IFC_GEOM_API const SurfaceStyle* get_default_style(const std::string& ifc_type);`
`100`		`- IFC_GEOM_API void set_default_style(const std::string& json_file);`
	`100`	`+ IFC_GEOM_API void set_default_style_file(const std::string& json_file);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`#endif`