From cd47ff512d754b919a777ae7f1438e2e4de64673 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 26 Jul 2021 18:20:37 +0200
Subject: [PATCH] no 'else' after 'return'; ASSERT, not throw, in impossible
cases
---
GUI/Models/GUIObjectBuilder.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/GUI/Models/GUIObjectBuilder.cpp b/GUI/Models/GUIObjectBuilder.cpp
index d309663a18b..0ff919040ef 100644
--- a/GUI/Models/GUIObjectBuilder.cpp
+++ b/GUI/Models/GUIObjectBuilder.cpp
@@ -14,6 +14,7 @@
#include "GUI/Models/GUIObjectBuilder.h"
#include "Base/Const/Units.h"
+#include "Base/Utils/Assert.h"
#include "Core/Simulation/includeSimulations.h"
#include "GUI/Models/DocumentModel.h"
#include "GUI/Models/Error.h"
@@ -92,13 +93,12 @@ SessionItem* GUI::Model::ObjectBuilder::populateInstrumentModel(InstrumentModel*
? QString::fromStdString(simulation.instrument().getName())
: instrument_name;
- if (auto gisasSimulation = dynamic_cast<const GISASSimulation*>(&simulation)) {
+ if (auto gisasSimulation = dynamic_cast<const GISASSimulation*>(&simulation))
return createGISASInstrumentItem(p_instrument_model, *gisasSimulation, name);
- } else if (auto offSpecSimulation = dynamic_cast<const OffSpecularSimulation*>(&simulation)) {
+ if (auto offSpecSimulation = dynamic_cast<const OffSpecularSimulation*>(&simulation))
return createOffSpecularInstrumentItem(p_instrument_model, *offSpecSimulation, name);
- } else if (auto spec_simulation = dynamic_cast<const SpecularSimulation*>(&simulation)) {
+ if (auto spec_simulation = dynamic_cast<const SpecularSimulation*>(&simulation))
return createSpecularInstrumentItem(p_instrument_model, *spec_simulation, name);
- }
throw Error("GUI::Model::ObjectBuilder::populateInstrumentModel() -> Error. ISimulation is "
"not yet supported");
--
GitLab