Skip to content
Snippets Groups Projects
Commit 108aabb1 authored by Matthias Puchner's avatar Matthias Puchner
Browse files

rm obsolete code

parent 71eb0813
No related branches found
No related tags found
1 merge request!648Refactor material model
......@@ -16,11 +16,8 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Item/MaterialItem.h"
#include "GUI/Model/XML/Serializer.h"
#include "GUI/Support/Data/XML.h"
#include "GUI/Util/DeserializationException.h"
#include <QColor>
#include <QUuid>
#include <QXmlStreamWriter>
#include <random>
namespace {
......@@ -162,37 +159,6 @@ void MaterialItems::removeMaterial(MaterialItem* materialItem)
emit materialAddedOrRemoved();
}
void MaterialItems::writeContentTo(QXmlStreamWriter* writer) const
{
GUI::Session::XML::writeAttribute(writer, GUI::Session::XML::Version, int(1));
for (auto* m : m_materialItems) {
writer->writeStartElement("Material");
m->writeContentTo(writer);
writer->writeEndElement();
}
}
void MaterialItems::readContentFrom(QXmlStreamReader* reader)
{
clear();
const int version = reader->attributes().value(GUI::Session::XML::Version).toInt();
if (version < 1)
throw DeserializationException::tooOld();
if (version > 1)
throw DeserializationException::tooNew();
while (reader->readNextStartElement()) {
if (reader->name() == "Material") {
auto* m = new MaterialItem;
m->readContentFrom(reader);
addMaterial(m, false);
reader->skipCurrentElement();
}
}
}
void MaterialItems::serialize(Serializer& s)
{
if (s.isReading())
......
......@@ -19,8 +19,6 @@
#include <QVector>
class MaterialItem;
class QXmlStreamReader;
class QXmlStreamWriter;
class Serializer;
class MaterialItems : public QObject {
......@@ -55,8 +53,6 @@ public:
void removeMaterial(const QString& identifier);
void removeMaterial(MaterialItem* materialItem);
void writeContentTo(QXmlStreamWriter* writer) const;
void readContentFrom(QXmlStreamReader* reader);
void serialize(Serializer& s);
//! Copies the complete content, emitting signals for existing and changed materials
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment