Skip to content
Snippets Groups Projects
Commit 82a46e60 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

ctd (resolve some, deactivate some other warnings)

parent 5d5a05b1
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,7 @@ Checks: '*, ...@@ -19,6 +19,7 @@ Checks: '*,
-cppcoreguidelines-pro-type-vararg, -cppcoreguidelines-pro-type-vararg,
-fuchsia-default-arguments-calls, -fuchsia-default-arguments-calls,
-fuchsia-overloaded-operator, -fuchsia-overloaded-operator,
-fuchsia-trailing-return,
-google-build-using-namespace, -google-build-using-namespace,
-google-default-arguments, -google-default-arguments,
-google-readability-todo, -google-readability-todo,
......
...@@ -266,17 +266,16 @@ void createFitContainers(JobItem* jobItem) ...@@ -266,17 +266,16 @@ void createFitContainers(JobItem* jobItem)
{ {
SessionModel* model = jobItem->model(); SessionModel* model = jobItem->model();
SessionItem* fitSuiteItem = jobItem->getItem(JobItem::T_FIT_SUITE); SessionItem* result = jobItem->getItem(JobItem::T_FIT_SUITE);
if (fitSuiteItem != nullptr) { if (result != nullptr)
throw GUIHelpers::Error("JobModel::createFitContainers() -> Error. Attempt to create " throw GUIHelpers::Error("JobModel::createFitContainers() -> Error. Attempt to create "
"a second FitSuiteItem."); "a second FitSuiteItem.");
}
fitSuiteItem = model->insertNewItem("FitSuite", jobItem->index(), -1, JobItem::T_FIT_SUITE); fitSuiteItem = model->insertNewItem("FitSuite", jobItem->index(), -1, JobItem::T_FIT_SUITE);
SessionItem* parsContainerItem = SessionItem* result =
fitSuiteItem->getItem(FitSuiteItem::T_FIT_PARAMETERS_CONTAINER); fitSuiteItem->getItem(FitSuiteItem::T_FIT_PARAMETERS_CONTAINER);
if (parsContainerItem != nullptr) { if (result != nullptr) {
throw GUIHelpers::Error("JobModel::createFitContainers() -> Error. Attempt to create " throw GUIHelpers::Error("JobModel::createFitContainers() -> Error. Attempt to create "
"a second FitParameterContainer."); "a second FitParameterContainer.");
} }
...@@ -285,8 +284,8 @@ void createFitContainers(JobItem* jobItem) ...@@ -285,8 +284,8 @@ void createFitContainers(JobItem* jobItem)
FitSuiteItem::T_FIT_PARAMETERS_CONTAINER); FitSuiteItem::T_FIT_PARAMETERS_CONTAINER);
// Minimizer settings // Minimizer settings
SessionItem* minimizerContainerItem = fitSuiteItem->getItem(FitSuiteItem::T_MINIMIZER); SessionItem* result = fitSuiteItem->getItem(FitSuiteItem::T_MINIMIZER);
if (minimizerContainerItem != nullptr) { if (result != nullptr) {
throw GUIHelpers::Error("JobModel::createFitContainers() -> Error. Attempt to create " throw GUIHelpers::Error("JobModel::createFitContainers() -> Error. Attempt to create "
"a second MinimizerContainer."); "a second MinimizerContainer.");
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment