rename GUI/Model/Mini/MinimizerItem.cpp -> GUI/Model/Mini/MinimizerItems.cpp

GUI/Model/Mini/MinimizerItem.cpp → GUI/Model/Mini/MinimizerItems.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Mini/MinimizerItem.cpp
+//! @file      GUI/Model/Mini/MinimizerItems.cpp
 //! @brief     Implements class MinimizerItem and children.
 //!
 //! @homepage  http://www.bornagainproject.org

GUI/Model/Util/UtilXML.cpp

@@ -92,34 +92,29 @@ void XML::writeAttribute(QXmlStreamWriter* writer, const QString& attributeBaseN
 
 // ------------ read atribute ------------
 
-unsigned XML::readUInt(QXmlStreamReader* reader, const QString& attributeName)
+bool XML::readBool(QXmlStreamReader* reader, const QString& attributeName)
 {
-    return reader->attributes().value(attributeName).toUInt();
+    return reader->attributes().value(attributeName).toUInt() > 0;
 }
 
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, bool* b)
+void XML::readInt(QXmlStreamReader* reader, const QString& attributeName)
 {
-    *b = reader->attributes().value(attributeName).toUInt() > 0;
+    return reader->attributes().value(attributeName).toInt();
 }
 
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, int* i)
-{
-    *i = reader->attributes().value(attributeName).toInt();
-}
-
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, size_t* i)
+unsigned XML::readUInt(QXmlStreamReader* reader, const QString& attributeName)
 {
-    *i = reader->attributes().value(attributeName).toULong();
+    return reader->attributes().value(attributeName).toUInt();
 }
 
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, unsigned* u)
+size_t XML::readSize(QXmlStreamReader* reader, const QString& attributeName)
 {
-    *u = readUInt(reader, attributeName);
+    return reader->attributes().value(attributeName).toULong();
 }
 
-void XML::readAttribute(QXmlStreamReader* reader, const QString& attributeName, double* d)
+double XML::readDouble(QXmlStreamReader* reader, const QString& attributeName)
 {
-    *d = reader->attributes().value(attributeName).toDouble();
+    return reader->attributes().value(attributeName).toDouble();
 }
 
 QString XML::readString(QXmlStreamReader* reader, const QString& attributeName)

GUI/Model/Util/UtilXML.h

@@ -56,13 +56,12 @@ void writeAttribute(QXmlStreamWriter* writer, const QString& attributeName, T d)
     writer->writeAttribute(attributeName, QString::number(d));
 };
 
-unsigned readUInt(QXmlStreamReader* reader, const QString& attributeName);
 
-void readAttribute(QXmlStreamReader* reader, const QString& attributeName, bool* b);
-void readAttribute(QXmlStreamReader* reader, const QString& attributeName, int* i);
-void readAttribute(QXmlStreamReader* reader, const QString& attributeName, size_t* i);
-void readAttribute(QXmlStreamReader* reader, const QString& attributeName, unsigned* u);
-void readAttribute(QXmlStreamReader* reader, const QString& attributeName, double* d);
+bool readBool(QXmlStreamReader* reader, const QString& attributeName);
+int readInt(QXmlStreamReader* reader, const QString& attributeName);
+unsigned readUInt(QXmlStreamReader* reader, const QString& attributeName);
+size_t readSize(QXmlStreamReader* reader, const QString& attributeName);
+double readDouble(QXmlStreamReader* reader, const QString& attributeName);
 QString readString(QXmlStreamReader* reader, const QString& attributeName);
 QColor readColor(QXmlStreamReader* reader, const QString& attributeName);