From 841c255ee442218815f1c63d567d15c1a76cc7fe Mon Sep 17 00:00:00 2001 From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de> Date: Wed, 9 Nov 2022 11:54:11 +0100 Subject: [PATCH] readFrom: rm {} --- GUI/Model/Data/DataItem.cpp | 3 +-- GUI/Model/Data/RealItem.cpp | 3 +-- GUI/Model/Device/AxesItems.cpp | 3 +-- .../Device/SpecularBeamInclinationItem.cpp | 3 +-- GUI/Model/Job/FitParameterContainerItem.cpp | 3 +-- GUI/Model/Job/FitParameterItem.cpp | 9 +++------ GUI/Model/Job/FitParameterLinkItem.cpp | 6 ++---- GUI/Model/Job/MinimizerItem.cpp | 18 ++++++------------ GUI/Model/Model/JobModel.cpp | 1 + GUI/Util/ComboProperty.cpp | 3 +-- 10 files changed, 18 insertions(+), 34 deletions(-) diff --git a/GUI/Model/Data/DataItem.cpp b/GUI/Model/Data/DataItem.cpp index eba2e7723a2..81899124e03 100644 --- a/GUI/Model/Data/DataItem.cpp +++ b/GUI/Model/Data/DataItem.cpp @@ -318,7 +318,6 @@ void DataItem::readBasicTags(QXmlStreamReader* reader) m_yAxis->readFrom(reader); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::YAxis); - } else { + } else reader->skipCurrentElement(); - } } diff --git a/GUI/Model/Data/RealItem.cpp b/GUI/Model/Data/RealItem.cpp index e819495330c..38a450a43d2 100644 --- a/GUI/Model/Data/RealItem.cpp +++ b/GUI/Model/Data/RealItem.cpp @@ -432,9 +432,8 @@ void RealItem::readFrom(QXmlStreamReader* reader) GUI::Session::XML::readAttribute(reader, Attrib::value, &m_nativeDataUnits); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::NativeDataUnits); - } else { + } else reader->skipCurrentElement(); - } } } diff --git a/GUI/Model/Device/AxesItems.cpp b/GUI/Model/Device/AxesItems.cpp index a0aa490dfe0..e57cc32f29e 100644 --- a/GUI/Model/Device/AxesItems.cpp +++ b/GUI/Model/Device/AxesItems.cpp @@ -173,9 +173,8 @@ void BasicAxisItem::readBasicTags(QXmlStreamReader* reader) GUI::Session::XML::readAttribute(reader, Attrib::value, &m_title); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Title); - } else { + } else reader->skipCurrentElement(); - } } // ---------------------------------------------------------------------------------------------- // diff --git a/GUI/Model/Device/SpecularBeamInclinationItem.cpp b/GUI/Model/Device/SpecularBeamInclinationItem.cpp index 45ce8cd90ec..77796118e9b 100644 --- a/GUI/Model/Device/SpecularBeamInclinationItem.cpp +++ b/GUI/Model/Device/SpecularBeamInclinationItem.cpp @@ -128,9 +128,8 @@ void SpecularBeamInclinationItem::readFrom(QXmlStreamReader* reader) m_pointwiseAlphaAxis->readFrom(reader); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::PointwiseAxis); - } else { + } else reader->skipCurrentElement(); - } } } diff --git a/GUI/Model/Job/FitParameterContainerItem.cpp b/GUI/Model/Job/FitParameterContainerItem.cpp index a0a8ad4bf4e..4db4a667185 100644 --- a/GUI/Model/Job/FitParameterContainerItem.cpp +++ b/GUI/Model/Job/FitParameterContainerItem.cpp @@ -208,9 +208,8 @@ void FitParameterContainerItem::readFrom(QXmlStreamReader* reader) this); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::FitParameters); - } else { + } else reader->skipCurrentElement(); - } } } diff --git a/GUI/Model/Job/FitParameterItem.cpp b/GUI/Model/Job/FitParameterItem.cpp index da7db0b7c08..9e30a35a30b 100644 --- a/GUI/Model/Job/FitParameterItem.cpp +++ b/GUI/Model/Job/FitParameterItem.cpp @@ -77,9 +77,8 @@ void FitTypeItem::readFrom(QXmlStreamReader* reader) m_type.readFrom(reader); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Type); - } else { + } else reader->skipCurrentElement(); - } } } @@ -148,9 +147,8 @@ void FitDoubleItem::readBasicTags(QXmlStreamReader* reader) GUI::Session::XML::readAttribute(reader, Attrib::value, &m_value); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Value); - } else { + } else reader->skipCurrentElement(); - } } //------------------------------------------------------------------------------------------------ @@ -465,9 +463,8 @@ void FitParameterItem::readFrom(QXmlStreamReader* reader) GUI::Session::XML::readVectorClass(reader, Tag::FitLinkItem, m_links, this); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::FitLinkItems); - } else { + } else reader->skipCurrentElement(); - } } } diff --git a/GUI/Model/Job/FitParameterLinkItem.cpp b/GUI/Model/Job/FitParameterLinkItem.cpp index a40d405d724..77b359cbd8a 100644 --- a/GUI/Model/Job/FitParameterLinkItem.cpp +++ b/GUI/Model/Job/FitParameterLinkItem.cpp @@ -68,9 +68,8 @@ void LinkItem::readFrom(QXmlStreamReader* reader) GUI::Session::XML::readAttribute(reader, Attrib::value, &m_link); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Link); - } else { + } else reader->skipCurrentElement(); - } } } @@ -136,8 +135,7 @@ void FitParameterLinkItem::readFrom(QXmlStreamReader* reader) m_linkItem->readFrom(reader); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::LinkItem); - } else { + } else reader->skipCurrentElement(); - } } } diff --git a/GUI/Model/Job/MinimizerItem.cpp b/GUI/Model/Job/MinimizerItem.cpp index 7182bcfd73a..261137bb2e1 100644 --- a/GUI/Model/Job/MinimizerItem.cpp +++ b/GUI/Model/Job/MinimizerItem.cpp @@ -401,9 +401,8 @@ void MinimizerContainerItem::readFrom(QXmlStreamReader* reader) m_GSLLMAMinimizer->readFrom(reader); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::GSLLMAMinimizer); - } else { + } else reader->skipCurrentElement(); - } } } @@ -562,9 +561,8 @@ void MinuitMinimizerItem::readFrom(QXmlStreamReader* reader) GUI::Session::XML::readAttribute(reader, Attrib::value, &m_maxFuncCalls); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::MaxFuncCalls); - } else { + } else reader->skipCurrentElement(); - } } } @@ -634,9 +632,8 @@ void GSLMultiMinimizerItem::readFrom(QXmlStreamReader* reader) GUI::Session::XML::readAttribute(reader, Attrib::value, &m_maxIterations); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::MaxIterations); - } else { + } else reader->skipCurrentElement(); - } } } @@ -750,9 +747,8 @@ void GeneticMinimizerItem::readFrom(QXmlStreamReader* reader) GUI::Session::XML::readAttribute(reader, Attrib::value, &m_randomSeed); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::RandomSeed); - } else { + } else reader->skipCurrentElement(); - } } } @@ -932,9 +928,8 @@ void SimAnMinimizerItem::readFrom(QXmlStreamReader* reader) GUI::Session::XML::readAttribute(reader, Attrib::value, &m_boltzmann_T_min); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Tmin); - } else { + } else reader->skipCurrentElement(); - } } } @@ -1004,8 +999,7 @@ void GSLLMAMinimizerItem::readFrom(QXmlStreamReader* reader) GUI::Session::XML::readAttribute(reader, Attrib::value, &m_maxIterations); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::MaxIterations); - } else { + } else reader->skipCurrentElement(); - } } } diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp index 7e677c7de50..1386101c8f2 100644 --- a/GUI/Model/Model/JobModel.cpp +++ b/GUI/Model/Model/JobModel.cpp @@ -164,6 +164,7 @@ void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService if (reader->name() == Tag::Job) { createJobItem()->readFrom(reader); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Job); + } else reader->skipCurrentElement(); } diff --git a/GUI/Util/ComboProperty.cpp b/GUI/Util/ComboProperty.cpp index 300d4359792..b6ab89cc506 100644 --- a/GUI/Util/ComboProperty.cpp +++ b/GUI/Util/ComboProperty.cpp @@ -316,8 +316,7 @@ void ComboProperty::readFrom(QXmlStreamReader* reader) GUI::Session::XML::readVector(reader, Tag::Index, m_selected_indices); GUI::Session::XML::gotoEndElementOfTag(reader, Tag::SelectedIndices); - } else { + } else reader->skipCurrentElement(); - } } } -- GitLab