# HG changeset patch # User Teemu Piippo # Date 1654764702 -10800 # Node ID c93e4a1eaadb0efef31727df98613b045e722382 # Parent 930928b760a2f4c7dd4955c77ca08cf276f201d2 remove more dead code diff -r 930928b760a2 -r c93e4a1eaadb CMakeLists.txt --- a/CMakeLists.txt Wed Jun 08 23:14:55 2022 +0300 +++ b/CMakeLists.txt Thu Jun 09 11:51:42 2022 +0300 @@ -26,7 +26,6 @@ src/document.cpp src/documentmanager.cpp src/geometry.cpp - src/header.cpp src/ldrawalgorithm.cpp src/libraries.cpp src/invert.cpp @@ -64,7 +63,6 @@ src/documentmanager.h src/functional.h src/geometry.h - src/header.h src/invert.h src/ldrawalgorithm.h src/libraries.h diff -r 930928b760a2 -r c93e4a1eaadb src/header.cpp --- a/src/header.cpp Wed Jun 08 23:14:55 2022 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -/* - * LDForge: LDraw parts authoring CAD - * Copyright (C) 2013 - 2020 Teemu Piippo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "header.h" - -const QString LDHeader::caLicenseString = "0 !LICENSE Redistributable under CCAL version 2.0"; -const QString LDHeader::nonCaLicenseString = "0 !LICENSE Not redistributable"; - -static const QMap typeStrings = { - {"Part", LDHeader::Part}, - {"Subpart", LDHeader::Subpart}, - {"Shortcut", LDHeader::Shortcut}, - {"Primitive", LDHeader::Primitive}, - {"8_Primitive", LDHeader::Primitive_8}, - {"48_Primitive", LDHeader::Primitive_48}, - {"Configuration", LDHeader::Configuration}, -}; - -QString headerTypeToString(const LDHeader::FileType fileType) -{ - QMapIterator it{::typeStrings}; - while (it.hasNext()) - { - it.next(); - if (it.value() == fileType) - { - return it.key(); - } - } - return "Part"; -} - -LDHeader::FileType headerTypeFromString(const QString& string) -{ - return ::typeStrings.value(string, LDHeader::Part); -} - -QString headerToString(const LDHeader& header) -{ - QString result; - result += "0 " + header.description + "\r\n"; - result += "Name: " + header.name + "\r\n"; - result += "Author: " + header.author + "\r\n"; - if (header.type != LDHeader::NoHeader) - { - result += "0 !LDRAW Unofficial_" + headerTypeToString(header.type) + "\r\n"; - } - switch (header.license) - { - case LDHeader::UnspecifiedLicense: - break; - case LDHeader::CaLicense: - result += LDHeader::caLicenseString + "\r\n"; - break; - case LDHeader::NonCaLicense: - result += LDHeader::nonCaLicenseString + "\r\n"; - break; - } - if (not header.help.isEmpty()) - { - result += "\r\n"; - for (const QString& helpLine : header.help.split("\n")) - { - result += "0 !HELP " + helpLine + "\r\n"; - } - } - result += "\r\n"; - // FIXME: continue - return result; -} diff -r 930928b760a2 -r c93e4a1eaadb src/header.h --- a/src/header.h Wed Jun 08 23:14:55 2022 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -/* - * LDForge: LDraw parts authoring CAD - * Copyright (C) 2013 - 2020 Teemu Piippo - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once -#include -#include "basics.h" - -struct LDHeader -{ - static const QString caLicenseString; - static const QString nonCaLicenseString; - struct HistoryEntry - { - QDate date; - QString author; - QString description; - }; - enum FileType - { - NoHeader, - Part, - Subpart, - Shortcut, - Primitive, - Primitive_8, - Primitive_48, - Configuration, - } type = NoHeader; - enum Qualifier - { - Alias = 1 << 0, - PhysicalColour = 1 << 1, - FlexibleSection = 1 << 2, - }; - QFlags qualfiers; - QString description; - QString name; - QString author; - QString category; - QString cmdline; - QString help; - QString keywords; - QVector history; - enum - { - UnspecifiedLicense, - CaLicense, - NonCaLicense - } license = UnspecifiedLicense; - static decltype(license) defaultLicense(); -}; - -LDHeader::FileType headerTypeFromString(const QString& string); -QString headerTypeToString(const LDHeader::FileType fileType); -QString headerToString(const LDHeader& header); - -Q_DECLARE_OPERATORS_FOR_FLAGS(QFlags)