refactor : fix some badsmells

thomaslepoix · thomaslepoix · commit afcc7cf52128 · 2025-05-24T22:45:20.000+02:00
diff --git a/src/app/openemsh.cpp b/src/app/openemsh.cpp
@@ -83,7 +83,7 @@ void OpenEMSH::write() const {
 }
 
 //******************************************************************************
-void OpenEMSH::run(std::set<Step> const& steps) {
+void OpenEMSH::run(std::set<Step> const& steps) const {
 	auto const annotate = [](Step step) {
 		Caretaker::singleton().annotate_current_timepoint(make_unique<Annotation>(step));
 	};
@@ -129,7 +129,7 @@ void OpenEMSH::run(std::set<Step> const& steps) {
 }
 
 //******************************************************************************
-void OpenEMSH::run_all_steps() {
+void OpenEMSH::run_all_steps() const {
 	Caretaker::singleton().remember_current_timepoint();
 	run({
 		Step::DETECT_CONFLICT_EIP,
@@ -139,13 +139,13 @@ void OpenEMSH::run_all_steps() {
 		Step::SOLVE_ALL_EIP,
 		Step::SOLVE_ALL_CE,
 		Step::DETECT_AND_SOLVE_TCMLP,
-		Step::DETECT_INTERVALS,
-		Step::MESH
+		Step::DETECT_INTERVALS
+//		Step::MESH
 	});
 }
 
 //******************************************************************************
-void OpenEMSH::run_next_step() {
+void OpenEMSH::run_next_step() const {
 	auto& c = Caretaker::singleton();
 	auto* t = c.find_first_ancestor_with_annotation();
 	if(auto* a = c.get_annotation(t); a)
diff --git a/src/app/openemsh.hpp b/src/app/openemsh.hpp
@@ -61,9 +61,9 @@ class OpenEMSH {
 //	void check_x();
 
 	void parse();
-	void run(std::set<Step> const& steps);
-	void run_all_steps();
-	void run_next_step();
+	void run(std::set<Step> const& steps) const;
+	void run_all_steps() const;
+	void run_next_step() const;
 	void go_before(Step step) const;
 	void go_before_previous_step() const;
 	void write() const;
diff --git a/src/domain/board.hpp b/src/domain/board.hpp
@@ -36,7 +36,7 @@ struct BoardState final {
 	PlaneSpace<std::vector<std::shared_ptr<Polygon>>> polygons;
 	PlaneSpace<std::vector<Edge*>> edges;
 
-	BoardState(PlaneSpace<std::vector<std::shared_ptr<Polygon>>>&& polygons);
+	explicit BoardState(PlaneSpace<std::vector<std::shared_ptr<Polygon>>>&& polygons);
 };
 
 //******************************************************************************
diff --git a/src/domain/conflict_manager.cpp b/src/domain/conflict_manager.cpp
@@ -21,8 +21,8 @@ ConflictManager::ConflictManager(Timepoint* t)
 {}
 
 //******************************************************************************
-void ConflictManager::init(MeshlinePolicyManager* line_policy_manager) {
-	this->line_policy_manager = line_policy_manager;
+void ConflictManager::init(MeshlinePolicyManager* _line_policy_manager) {
+	line_policy_manager = _line_policy_manager;
 }
 
 /// @warning Allows geometrically inconsistent datas.
diff --git a/src/domain/conflict_manager.hpp b/src/domain/conflict_manager.hpp
@@ -46,7 +46,7 @@ class ConflictManager
 public:
 	explicit ConflictManager(Timepoint* t);
 
-	void init(MeshlinePolicyManager* line_policy_manager);
+	void init(MeshlinePolicyManager* _line_policy_manager);
 
 	void add_colinear_edges(Edge* a, Edge* b);
 
diff --git a/src/domain/mesh/interval.cpp b/src/domain/mesh/interval.cpp
@@ -18,7 +18,7 @@ namespace domain {
 using namespace std;
 
 //******************************************************************************
-Interval::Side::Side(MeshlinePolicy* meshline_policy, size_t lmin, double lambda, Coord h, Timepoint* t, function<double (double)> d_init)
+Interval::Side::Side(MeshlinePolicy* meshline_policy, size_t lmin, double lambda, Coord h, function<double (double)> d_init)
 : meshline_policy(meshline_policy)
 , lmin(lmin)
 , lambda(lambda)
@@ -45,7 +45,7 @@ Coord calc_h(Coord const& a, Coord const& b) noexcept {
 Interval::Interval(MeshlinePolicy* before, MeshlinePolicy* after, Axis axis, GlobalParams* global_params, Timepoint* t)
 : Originator(t, {
 	.dmax = global_params->get_current_state().dmax,
-	.before = Side(before, global_params->get_current_state().lmin, global_params->get_current_state().lambda, calc_h(before->coord, after->coord), t, [before](double d) noexcept {
+	.before = Side(before, global_params->get_current_state().lmin, global_params->get_current_state().lambda, calc_h(before->coord, after->coord), [before](double d) noexcept {
 		switch(before->policy) {
 		case MeshlinePolicy::Policy::ONELINE: return 0.0;
 		case MeshlinePolicy::Policy::HALFS: return d / 2.0;
@@ -62,7 +62,7 @@ Interval::Interval(MeshlinePolicy* before, MeshlinePolicy* after, Axis axis, Glo
 		default: unreachable();
 		}
 	}),
-	.after = Side(after, global_params->get_current_state().lmin, global_params->get_current_state().lambda, calc_h(before->coord, after->coord), t, [after](double d) noexcept {
+	.after = Side(after, global_params->get_current_state().lmin, global_params->get_current_state().lambda, calc_h(before->coord, after->coord), [after](double d) noexcept {
 		switch(after->policy) {
 		case MeshlinePolicy::Policy::ONELINE: return 0.0;
 		case MeshlinePolicy::Policy::HALFS: return d / 2.0;
diff --git a/src/domain/mesh/interval.hpp b/src/domain/mesh/interval.hpp
@@ -51,7 +51,7 @@ class Interval
 		std::function<double (double)> const d_init_;
 		std::vector<Coord> ls; // TODO avoid Coord::operator= -> double
 
-		Side(MeshlinePolicy* meshline_policy, size_t lmin, double lambda, Coord h, Timepoint* t, std::function<double (double)> d_init);
+		Side(MeshlinePolicy* meshline_policy, size_t lmin, double lambda, Coord h, std::function<double (double)> d_init);
 
 		double d_init() const;
 	};
diff --git a/src/domain/meshline_policy_manager.cpp b/src/domain/meshline_policy_manager.cpp
@@ -40,8 +40,8 @@ MeshlinePolicyManager::MeshlinePolicyManager(
 }
 
 //******************************************************************************
-void MeshlinePolicyManager::init(ConflictManager* conflict_manager) {
-	this->conflict_manager = conflict_manager;
+void MeshlinePolicyManager::init(ConflictManager* _conflict_manager) {
+	conflict_manager = _conflict_manager;
 }
 
 //******************************************************************************
diff --git a/src/domain/meshline_policy_manager.hpp b/src/domain/meshline_policy_manager.hpp
@@ -46,7 +46,7 @@ class MeshlinePolicyManager // TODO MeshlineManager
 		AxisSpace<std::vector<std::shared_ptr<MeshlinePolicy>>>&& line_policies,
 		Timepoint* t);
 
-	void init(ConflictManager* conflict_manager);
+	void init(ConflictManager* _conflict_manager);
 
 	MeshlinePolicy* add_meshline_policy(
 		std::vector<IMeshLineOrigin*> origins,
diff --git a/src/ui/qt/processing_view/processing_view.cpp b/src/ui/qt/processing_view/processing_view.cpp
@@ -30,8 +30,8 @@ ProcessingView::ProcessingView(QWidget* parent)
 }
 
 //******************************************************************************
-void ProcessingView::init(domain::Board const* board) {
-	this->board = board;
+void ProcessingView::init(domain::Board const* _board) {
+	board = _board;
 }
 //******************************************************************************
 void ProcessingView::wheelEvent(QWheelEvent* event) {
diff --git a/src/ui/qt/processing_view/processing_view.hpp b/src/ui/qt/processing_view/processing_view.hpp
@@ -27,7 +27,7 @@ class ProcessingView : public QGraphicsView {
 	Q_OBJECT
 public:
 	explicit ProcessingView(QWidget* parent = nullptr);
-	void init(domain::Board const* board);
+	void init(domain::Board const* _board);
 
 	ProcessingStyleSelector style_selector;
 	std::map<Timepoint*, ProcessingState> states;
diff --git a/src/ui/qt/structure_view/structure_view.cpp b/src/ui/qt/structure_view/structure_view.cpp
@@ -60,8 +60,8 @@ StructureView::StructureView(QWidget* parent)
 StructureView::~StructureView() = default;
 
 //******************************************************************************
-void StructureView::init(domain::Board const* board) {
-	this->board = board;
+void StructureView::init(domain::Board const* _board) {
+	board = _board;
 }
 
 //******************************************************************************
@@ -177,9 +177,9 @@ void StructureView::make_current_state() {
 		return;
 
 	domain::PlaneSpace<StructureScene*> scenes = {{
-		new StructureScene(style_selector, this),
-		new StructureScene(style_selector, this),
-		new StructureScene(style_selector, this) }};
+		std::make_unique<StructureScene>(style_selector, this).release(),
+		std::make_unique<StructureScene>(style_selector, this).release(),
+		std::make_unique<StructureScene>(style_selector, this).release() }};
 
 	populate(scenes);
 
diff --git a/src/ui/qt/structure_view/structure_view.hpp b/src/ui/qt/structure_view/structure_view.hpp
@@ -36,7 +36,7 @@ class StructureView : public QGraphicsView {
 public:
 	explicit StructureView(QWidget* parent = nullptr);
 	~StructureView() override;
-	void init(domain::Board const* board);
+	void init(domain::Board const* _board);
 
 	void fit();
 	void rotate_view(qreal angle);
diff --git a/src/utils/state_management.cpp b/src/utils/state_management.cpp
@@ -132,7 +132,7 @@ void Caretaker::redo(size_t remembered_timepoints) noexcept {
 	if(!remembered_timepoints || !can_redo())
 		return;
 
-	advance(*user_history_browser, - min(remembered_timepoints, (size_t) abs(distance(user_history.rbegin(), *user_history_browser))));
+	advance(*user_history_browser, - make_signed_t<size_t>(min(remembered_timepoints, (size_t) abs(distance(user_history.rbegin(), *user_history_browser)))));
 	current_timepoint = **user_history_browser;
 
 	if(user_history_browser == user_history.rbegin())
diff --git a/src/utils/state_management.hpp b/src/utils/state_management.hpp
@@ -86,7 +86,6 @@ class Caretaker {
 
 //******************************************************************************
 class IOriginator {
-private:
 protected:
 	friend class Caretaker;
 	virtual Caretaker& get_caretaker() const noexcept = 0;

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ ConflictManager::ConflictManager(Timepoint* t)`
`21`	`21`	`{}`
`22`	`22`
`23`	`23`	`//******************************************************************************`
`24`		`-void ConflictManager::init(MeshlinePolicyManager* line_policy_manager) {`
`25`		`- this->line_policy_manager = line_policy_manager;`
	`24`	`+void ConflictManager::init(MeshlinePolicyManager* _line_policy_manager) {`
	`25`	`+ line_policy_manager = _line_policy_manager;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/// @warning Allows geometrically inconsistent datas.`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ MeshlinePolicyManager::MeshlinePolicyManager(`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`//******************************************************************************`
`43`		`-void MeshlinePolicyManager::init(ConflictManager* conflict_manager) {`
`44`		`- this->conflict_manager = conflict_manager;`
	`43`	`+void MeshlinePolicyManager::init(ConflictManager* _conflict_manager) {`
	`44`	`+ conflict_manager = _conflict_manager;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`//******************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ ProcessingView::ProcessingView(QWidget* parent)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`//******************************************************************************`
`33`		`-void ProcessingView::init(domain::Board const* board) {`
`34`		`- this->board = board;`
	`33`	`+void ProcessingView::init(domain::Board const* _board) {`
	`34`	`+ board = _board;`
`35`	`35`	`}`
`36`	`36`	`//******************************************************************************`
`37`	`37`	`void ProcessingView::wheelEvent(QWheelEvent* event) {`