diff --git a/GUI/Model/Data/RealItem.cpp b/GUI/Model/Data/RealItem.cpp
index ed98164e91dd70d228a528b85b2723229954f50e..64dff323bbfbc318b3aea5cf2374e194cb110811 100644
--- a/GUI/Model/Data/RealItem.cpp
+++ b/GUI/Model/Data/RealItem.cpp
@@ -451,15 +451,15 @@ void RealItem::copyTo(RealItem* const realdata_dst) const
// NOTE: For consistency, the DataItem's parent is set to the destination RealItem
// and its model is inherited from the destination RealItem.
if (m_dataItem) {
- realdata_dst->m_dataItem.reset(dynamic_cast<DataItem*>(
- XML::copyItem(dataItem(), realdata_dst /* parent */)));
+ realdata_dst->m_dataItem.reset(
+ dynamic_cast<DataItem*>(XML::copyItem(dataItem(), realdata_dst /* parent */)));
realdata_dst->dataItem()->setParentAndModel(realdata_dst, realdata_dst->model());
realdata_dst->dataItem()->setDatafield(dataItem()->datafield()->clone());
}
if (m_nativeDataItem) {
- realdata_dst->m_nativeDataItem.reset(dynamic_cast<DataItem*>(
- XML::copyItem(nativeData(), realdata_dst /* parent */)));
+ realdata_dst->m_nativeDataItem.reset(
+ dynamic_cast<DataItem*>(XML::copyItem(nativeData(), realdata_dst /* parent */)));
realdata_dst->nativeData()->setParentAndModel(realdata_dst, realdata_dst->model());
realdata_dst->nativeData()->setDatafield(nativeData()->datafield()->clone());
}
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index a3fcaf053e3fab5507703ef5664cd62251f3e156..a40fce38d0046d56274538421b552d3e2ce9d0b7 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -489,8 +489,7 @@ void JobItem::writeTo(QXmlStreamWriter* writer) const
// begin time
writer->writeStartElement(Tag::BeginTime);
- XML::writeAttribute(writer, Attrib::value,
- m_beginTime.toString(Qt::ISODateWithMs));
+ XML::writeAttribute(writer, Attrib::value, m_beginTime.toString(Qt::ISODateWithMs));
writer->writeEndElement();
// end time
diff --git a/GUI/Model/Model/FitParameterModel.cpp b/GUI/Model/Model/FitParameterModel.cpp
index 976dbdbac400db0bc886a6b0dbbd35484754877c..e57950d98c5b5ba0a5d12615282d3a385f3001c2 100644
--- a/GUI/Model/Model/FitParameterModel.cpp
+++ b/GUI/Model/Model/FitParameterModel.cpp
@@ -281,14 +281,14 @@ bool FitParameterModel::dropMimeData(const QMimeData* data, Qt::DropAction actio
QObject* parentItem = static_cast<QObject*>(parent.internalPointer());
if (auto* fitPar = dynamic_cast<FitParameterItem*>(parentItem)) {
ASSERT(fitPar);
- ParameterItem* parItem = reinterpret_cast<ParameterItem*>(
- data->data(XML::LinkMimeType).toULongLong());
+ ParameterItem* parItem =
+ reinterpret_cast<ParameterItem*>(data->data(XML::LinkMimeType).toULongLong());
ASSERT(parItem);
m_fitParameterContainer->addToFitParameter(parItem, fitPar->displayName());
}
} else {
- ParameterItem* parItem = reinterpret_cast<ParameterItem*>(
- data->data(XML::LinkMimeType).toULongLong());
+ ParameterItem* parItem =
+ reinterpret_cast<ParameterItem*>(data->data(XML::LinkMimeType).toULongLong());
ASSERT(parItem);
m_fitParameterContainer->createFitParameter(parItem);
}
diff --git a/GUI/Model/Model/SessionModel.cpp b/GUI/Model/Model/SessionModel.cpp
index 6f9719fc81e3ec73d79a76c2dbfbecf40a99f44f..2e7dfd5b73d5fd739bd1415e3b697b082f426c3f 100644
--- a/GUI/Model/Model/SessionModel.cpp
+++ b/GUI/Model/Model/SessionModel.cpp
@@ -217,8 +217,7 @@ bool SessionModel::canDropMimeData(const QMimeData* data, Qt::DropAction action,
if (action == Qt::IgnoreAction)
return true;
- if (action != Qt::MoveAction || column > 0 || !data
- || !data->hasFormat(XML::ItemMimeType))
+ if (action != Qt::MoveAction || column > 0 || !data || !data->hasFormat(XML::ItemMimeType))
return false;
if (!parent.isValid())
return true;
@@ -243,8 +242,7 @@ bool SessionModel::dropMimeData(const QMimeData* data, Qt::DropAction action, in
{
if (action == Qt::IgnoreAction)
return true;
- if (action != Qt::MoveAction || column > 0 || !data
- || !data->hasFormat(XML::ItemMimeType))
+ if (action != Qt::MoveAction || column > 0 || !data || !data->hasFormat(XML::ItemMimeType))
return false;
if (!canDropMimeData(data, action, row, column, parent))
return false;
diff --git a/GUI/Model/Model/SessionXML.cpp b/GUI/Model/Model/SessionXML.cpp
index 0c7b51855bd737f04de7937e23ef4e016ae5a541..e15d90875bcf91a278ab0b10c9003daa0e9f0d48 100644
--- a/GUI/Model/Model/SessionXML.cpp
+++ b/GUI/Model/Model/SessionXML.cpp
@@ -106,7 +106,7 @@ void XML::writeItemAndChildItems(QXmlStreamWriter* writer, const SessionItem* it
}
void XML::readItems(QXmlStreamReader* reader, SessionItem* parent, QString topTag,
- MessageService* messageService, const QString endTag)
+ MessageService* messageService, const QString endTag)
{
bool legacyDistributionFound = false;
ASSERT(reader);
@@ -268,9 +268,8 @@ QString XML::readProperty(QXmlStreamReader* reader, SessionItem* item)
return parameter_name;
}
-SessionItem* XML::readItemAndChildItems(QXmlStreamReader* reader,
- SessionItem* parent_item,
- const QString endTag)
+SessionItem* XML::readItemAndChildItems(QXmlStreamReader* reader, SessionItem* parent_item,
+ const QString endTag)
{
// NOTE: This function is used for the GUI refactoring 'Removal of SessionItem'
@@ -321,7 +320,7 @@ SessionItem* XML::readItemAndChildItems(QXmlStreamReader* reader,
// read the rest of the items until the end tag is reached
XML::readItems(reader, newSessionItem /* parent */, "" /* topTag */,
- nullptr /* MessageService */, endTag);
+ nullptr /* MessageService */, endTag);
return newSessionItem;
}
diff --git a/GUI/Support/Data/SimulationOptionsItem.cpp b/GUI/Support/Data/SimulationOptionsItem.cpp
index 4701162dfddc4bbd56a3472103e2888d4028ddc5..a768970006edac52da04558a702d8aaa87888ce7 100644
--- a/GUI/Support/Data/SimulationOptionsItem.cpp
+++ b/GUI/Support/Data/SimulationOptionsItem.cpp
@@ -121,8 +121,7 @@ void SimulationOptionsItem::writeContentTo(QXmlStreamWriter* writer) const
XML::writeAttribute(writer, Tag::RunImmediately, m_runImmediately);
XML::writeAttribute(writer, Tag::NumberOfThreads, m_numberOfThreads);
XML::writeAttribute(writer, Tag::Analytical, m_computationMethodAnalytical);
- XML::writeAttribute(writer, Tag::NumberOfMonteCarloPoints,
- m_numberOfMonteCarloPoints);
+ XML::writeAttribute(writer, Tag::NumberOfMonteCarloPoints, m_numberOfMonteCarloPoints);
XML::writeAttribute(writer, Tag::UseAverageMaterials, m_useAverageMaterials);
XML::writeAttribute(writer, Tag::IncludeSpecularPeak, m_includeSpecularPeak);
}
@@ -140,8 +139,7 @@ void SimulationOptionsItem::readContentFrom(QXmlStreamReader* reader)
m_runImmediately = XML::readBoolAttribute(reader, Tag::RunImmediately);
m_numberOfThreads = XML::readUIntAttribute(reader, Tag::NumberOfThreads);
m_computationMethodAnalytical = XML::readBoolAttribute(reader, Tag::Analytical);
- m_numberOfMonteCarloPoints =
- XML::readUIntAttribute(reader, Tag::NumberOfMonteCarloPoints);
+ m_numberOfMonteCarloPoints = XML::readUIntAttribute(reader, Tag::NumberOfMonteCarloPoints);
m_useAverageMaterials = XML::readBoolAttribute(reader, Tag::UseAverageMaterials);
m_includeSpecularPeak = XML::readBoolAttribute(reader, Tag::IncludeSpecularPeak);
}
diff --git a/GUI/Support/XML/Streamer.h b/GUI/Support/XML/Streamer.h
index a21f357abe0f03cc801c42638ea74cef86fbedaf..ec1ea12b4baebe4323bae64499612f45c8a6e4b9 100644
--- a/GUI/Support/XML/Streamer.h
+++ b/GUI/Support/XML/Streamer.h
@@ -27,7 +27,7 @@ constexpr auto Value("value");
constexpr auto Decimals("decimals");
constexpr auto Version("version");
} // namespace Tags
-} // namespace XML
+} // namespace StreamerXML
//! Supports serialization to or deserialization from QXmlStream.
//!
diff --git a/GUI/Support/XML/UtilXML.cpp b/GUI/Support/XML/UtilXML.cpp
index b1ee13f253dd9f5f91a2e80416932c72978e4788..6592d5970de7bc3a857b997b93901a67bd9b8901 100644
--- a/GUI/Support/XML/UtilXML.cpp
+++ b/GUI/Support/XML/UtilXML.cpp
@@ -63,7 +63,7 @@ void XML::gotoEndElementOfTag(QXmlStreamReader* reader, const QString& tag)
}
void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeName,
- const QVariant& variant)
+ const QVariant& variant)
{
ASSERT(writer);
ASSERT(variant.isValid());
@@ -92,8 +92,7 @@ void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeName,
+ QString(variant.typeName()));
}
-void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeBaseName,
- const R3& vec)
+void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeBaseName, const R3& vec)
{
writeAttribute(writer, attributeBaseName + "X", vec.x());
writeAttribute(writer, attributeBaseName + "Y", vec.y());
@@ -101,32 +100,28 @@ void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeBaseN
}
void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeBaseName,
- const complex_t& c)
+ const complex_t& c)
{
writeAttribute(writer, attributeBaseName + "Re", c.real());
writeAttribute(writer, attributeBaseName + "Im", c.imag());
}
-void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeName,
- double d)
+void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeName, double d)
{
writer->writeAttribute(attributeName, d == 0.0 ? "0" : QString::number(d, 'e', 12));
}
-void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeName,
- int d)
+void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeName, int d)
{
writer->writeAttribute(attributeName, QString::number(d));
}
-void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeName,
- bool b)
+void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeName, bool b)
{
writer->writeAttribute(attributeName, b ? "1" : "0");
}
-void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeName,
- unsigned d)
+void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeName, unsigned d)
{
writer->writeAttribute(attributeName, QString::number(d));
}
@@ -158,27 +153,23 @@ bool XML::readBoolAttribute(QXmlStreamReader* reader, const QString& attributeNa
return reader->attributes().value(attributeName).toUInt() != 0;
}
-unsigned XML::readUIntAttribute(QXmlStreamReader* reader,
- const QString& attributeName)
+unsigned XML::readUIntAttribute(QXmlStreamReader* reader, const QString& attributeName)
{
return reader->attributes().value(attributeName).toUInt();
}
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName,
- QString* s)
+void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, QString* s)
{
*s = reader->attributes().value(attributeName).toString();
}
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName,
- QColor* c)
+void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, QColor* c)
{
const QString parameter_value = reader->attributes().value(attributeName).toString();
*c = QColor(parameter_value);
}
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeBaseName,
- R3* vec)
+void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeBaseName, R3* vec)
{
double x, y, z;
readAttribute(reader, attributeBaseName + "X", &x);
@@ -187,8 +178,7 @@ void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeBaseNa
*vec = {x, y, z};
}
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeBaseName,
- complex_t* c)
+void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeBaseName, complex_t* c)
{
double r, i;
readAttribute(reader, attributeBaseName + "Re", &r);
@@ -197,14 +187,12 @@ void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeBaseNa
c->imag(i);
}
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName,
- bool* b)
+void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, bool* b)
{
*b = reader->attributes().value(attributeName).toUInt() > 0;
}
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName,
- double* d)
+void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, double* d)
{
*d = reader->attributes().value(attributeName).toDouble();
}
@@ -221,14 +209,12 @@ void XML::assertExpectedTag(QXmlStreamReader* reader, const QString& expectedTag
}
}
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName,
- int* i)
+void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, int* i)
{
*i = reader->attributes().value(attributeName).toInt();
}
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName,
- unsigned* u)
+void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, unsigned* u)
{
*u = reader->attributes().value(attributeName).toUInt();
}