From 108aabb15e8a7d88976feffc490d6545f262f894 Mon Sep 17 00:00:00 2001
From: Matthias Puchner <github@mpuchner.de>
Date: Sun, 6 Feb 2022 18:18:46 +0100
Subject: [PATCH] rm obsolete code
---
GUI/Model/Item/MaterialItems.cpp | 34 --------------------------------
GUI/Model/Item/MaterialItems.h | 4 ----
2 files changed, 38 deletions(-)
diff --git a/GUI/Model/Item/MaterialItems.cpp b/GUI/Model/Item/MaterialItems.cpp
index babcbab4ac6..d21d7989e0c 100644
--- a/GUI/Model/Item/MaterialItems.cpp
+++ b/GUI/Model/Item/MaterialItems.cpp
@@ -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())
diff --git a/GUI/Model/Item/MaterialItems.h b/GUI/Model/Item/MaterialItems.h
index be627e5d4cf..a37aeeb495f 100644
--- a/GUI/Model/Item/MaterialItems.h
+++ b/GUI/Model/Item/MaterialItems.h
@@ -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
--
GitLab