diff --git a/src/libs/3rdparty/modeling/qmt/qmt.pri b/src/libs/3rdparty/modeling/qmt/qmt.pri index 17e66059cca..09dd5ba51a2 100644 --- a/src/libs/3rdparty/modeling/qmt/qmt.pri +++ b/src/libs/3rdparty/modeling/qmt/qmt.pri @@ -125,7 +125,6 @@ HEADERS += \ $$PWD/model_widgets_ui/propertiesviewmview.h \ $$PWD/project_controller/projectcontroller.h \ $$PWD/project/project.h \ - $$PWD/serializer/diagramreferenceserializer.h \ $$PWD/serializer/diagramserializer.h \ $$PWD/serializer/infrastructureserializer.h \ $$PWD/serializer/modelserializer.h \ @@ -253,7 +252,6 @@ SOURCES += \ $$PWD/model_widgets_ui/propertiesviewmview.cpp \ $$PWD/project_controller/projectcontroller.cpp \ $$PWD/project/project.cpp \ - $$PWD/serializer/diagramreferenceserializer.cpp \ $$PWD/serializer/diagramserializer.cpp \ $$PWD/serializer/infrastructureserializer.cpp \ $$PWD/serializer/modelserializer.cpp \ diff --git a/src/libs/3rdparty/modeling/qmt/serializer/diagramreferenceserializer.cpp b/src/libs/3rdparty/modeling/qmt/serializer/diagramreferenceserializer.cpp deleted file mode 100644 index 9c72a66c35f..00000000000 --- a/src/libs/3rdparty/modeling/qmt/serializer/diagramreferenceserializer.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/*************************************************************************** -** -** Copyright (C) 2015 Jochen Becher -** Contact: http://www.qt.io/licensing -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms and -** conditions see http://www.qt.io/terms-conditions. For further information -** use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include "diagramreferenceserializer.h" - -#include "infrastructureserializer.h" - -#include "qmt/project/project.h" -#include "qmt/model/mdiagram.h" - -#include "qark/qxmloutarchive.h" -#include "qark/qxmlinarchive.h" -#include "qark/serialize.h" - -#include "qmt/infrastructure/ioexceptions.h" - -#include - - -namespace qark { - -using namespace qmt; - -QARK_REGISTER_TYPE_NAME(DiagramReferenceSerializer::Reference, "DiagramReferenceSerializer--Reference") - -template -void serialize(Archive &archive, DiagramReferenceSerializer::Reference &reference) -{ - archive || qark::tag(QStringLiteral("diagram-reference"), reference) - || qark::attr(QStringLiteral("model"), reference._model_uid) - || qark::attr(QStringLiteral("diagram"), reference._diagram_uid) - || qark::end; -} - -} - - -namespace qmt { - -DiagramReferenceSerializer::Reference::Reference() -{ -} - -DiagramReferenceSerializer::Reference::Reference(const Uid &model_uid, const Uid &diagram_uid) - : _model_uid(model_uid), - _diagram_uid(diagram_uid) -{ -} - - - -DiagramReferenceSerializer::DiagramReferenceSerializer() -{ -} - -DiagramReferenceSerializer::~DiagramReferenceSerializer() -{ -} - -void DiagramReferenceSerializer::save(const QString &file_name, const DiagramReferenceSerializer::Reference &reference) -{ - QFile file(file_name); - if (!file.open(QIODevice::WriteOnly)) { - throw FileCreationException(file_name); - } - QIODevice *xml_device = &file; - QXmlStreamWriter writer(xml_device); - write(reference, &writer); -} - -QByteArray DiagramReferenceSerializer::save(const Project *project, const MDiagram *diagram) -{ - QByteArray buffer; - - QXmlStreamWriter writer(&buffer); - write(Reference(project->getUid(), diagram->getUid()), &writer); - - return buffer; -} - -DiagramReferenceSerializer::Reference DiagramReferenceSerializer::load(const QString &file_name) -{ - QFile file(file_name); - if (!file.open(QIODevice::ReadOnly)) { - throw FileNotFoundException(file_name); - } - QIODevice *xml_device = &file; - QXmlStreamReader reader(xml_device); - return read(&reader); -} - -DiagramReferenceSerializer::Reference DiagramReferenceSerializer::load(const QByteArray &contents) -{ - QXmlStreamReader reader(contents); - return read(&reader); -} - -void DiagramReferenceSerializer::write(const Reference &reference, QXmlStreamWriter *writer) -{ - writer->setAutoFormatting(true); - writer->setAutoFormattingIndent(2); - - qark::QXmlOutArchive archive(*writer); - archive.beginDocument(); - archive << qark::tag("qmt-diagram-reference"); - archive << reference; - archive << qark::end(); - archive.endDocument(); -} - -DiagramReferenceSerializer::Reference DiagramReferenceSerializer::read(QXmlStreamReader *stream_reader) -{ - Reference reference; - - qark::QXmlInArchive archive(*stream_reader); - archive.beginDocument(); - archive >> qark::tag("qmt-diagram-reference"); - archive >> reference; - archive >> qark::end; - archive.endDocument(); - - return reference; -} - -} diff --git a/src/libs/3rdparty/modeling/qmt/serializer/diagramreferenceserializer.h b/src/libs/3rdparty/modeling/qmt/serializer/diagramreferenceserializer.h deleted file mode 100644 index cd01036cde7..00000000000 --- a/src/libs/3rdparty/modeling/qmt/serializer/diagramreferenceserializer.h +++ /dev/null @@ -1,86 +0,0 @@ -/*************************************************************************** -** -** Copyright (C) 2015 Jochen Becher -** Contact: http://www.qt.io/licensing -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms and -** conditions see http://www.qt.io/terms-conditions. For further information -** use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#ifndef QMT_DIAGRAMREFERENCESERIALIZER_H -#define QMT_DIAGRAMREFERENCESERIALIZER_H - -#include "qmt/infrastructure/uid.h" - -#include - -QT_BEGIN_NAMESPACE -class QXmlStreamReader; -class QXmlStreamWriter; -QT_END_NAMESPACE - - -namespace qmt { - -class Project; -class MDiagram; - - -class QMT_EXPORT DiagramReferenceSerializer -{ -public: - - struct Reference { - Reference(); - Reference(const Uid &model_uid, const Uid &diagram_uid); - - Uid _model_uid; - Uid _diagram_uid; - }; - -public: - DiagramReferenceSerializer(); - - ~DiagramReferenceSerializer(); - -public: - - void save(const QString &file_name, const Reference &reference); - - QByteArray save(const Project *project, const MDiagram *diagram); - - Reference load(const QString &file_name); - - Reference load(const QByteArray &contents); - -private: - - void write(const Reference &reference, QXmlStreamWriter *writer); - - Reference read(QXmlStreamReader *stream_reader); -}; - -} - -#endif // QMT_DIAGRAMREFERENCESERIALIZER_H diff --git a/src/libs/modelinglib/modelinglib.qbs b/src/libs/modelinglib/modelinglib.qbs index cfb6081227e..9caebd5d451 100644 --- a/src/libs/modelinglib/modelinglib.qbs +++ b/src/libs/modelinglib/modelinglib.qbs @@ -234,8 +234,6 @@ QtcLibrary { "project/project.h", "project_controller/projectcontroller.cpp", "project_controller/projectcontroller.h", - "serializer/diagramreferenceserializer.cpp", - "serializer/diagramreferenceserializer.h", "serializer/diagramserializer.cpp", "serializer/diagramserializer.h", "serializer/infrastructureserializer.cpp", diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp index 8a437f28e26..cbc0662e83c 100644 --- a/src/plugins/modeleditor/modelindexer.cpp +++ b/src/plugins/modeleditor/modelindexer.cpp @@ -35,7 +35,6 @@ #include "qmt/infrastructure/uid.h" #include "qmt/serializer/projectserializer.h" -#include "qmt/serializer/diagramreferenceserializer.h" #include "qmt/project/project.h" #include "qmt/model_controller/mvoidvisitor.h" diff --git a/src/plugins/modeleditor/modelsmanager.cpp b/src/plugins/modeleditor/modelsmanager.cpp index dd9d60deba8..871997b1acf 100644 --- a/src/plugins/modeleditor/modelsmanager.cpp +++ b/src/plugins/modeleditor/modelsmanager.cpp @@ -45,7 +45,6 @@ #include "qmt/model_controller/modelcontroller.h" #include "qmt/project_controller/projectcontroller.h" #include "qmt/project/project.h" -#include "qmt/serializer/diagramreferenceserializer.h" #include "qmt/stereotype/stereotypecontroller.h" #include "qmt/tasks/diagramscenecontroller.h"