# HG changeset patch # User Teemu Piippo # Date 1656268371 -10800 # Node ID 76a025db49483063cc092c2c517266fde2a4f532 # Parent 59b6027b9843dedfd5531cb654d04a4302ad2b51 Convert all includes to be relative to project root directory. Files that cannot be found in this manner use angle brackets. diff -r 59b6027b9843 -r 76a025db4948 CMakeLists.txt --- a/CMakeLists.txt Sun Jun 26 21:00:06 2022 +0300 +++ b/CMakeLists.txt Sun Jun 26 21:32:51 2022 +0300 @@ -122,7 +122,6 @@ include_directories("${PROJECT_BINARY_DIR}") include_directories("${PROJECT_BINARY_DIR}/src") include_directories("${PROJECT_SOURCE_DIR}") -include_directories("${PROJECT_SOURCE_DIR}/src") add_custom_target(resources ALL DEPENDS ${LDFORGE_RESOURCES}) if (NOT MSVC) diff -r 59b6027b9843 -r 76a025db4948 src/basics.h --- a/src/basics.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/basics.h Sun Jun 26 21:32:51 2022 +0300 @@ -37,9 +37,9 @@ #include #include #include -#include "geometry.h" -#include "functional.h" -#include "typeconversions.h" +#include "src/geometry.h" +#include "src/functional.h" +#include "src/typeconversions.h" template using opt = std::optional; @@ -49,7 +49,6 @@ Q_DECLARE_METATYPE(glm::vec3) Q_DECLARE_METATYPE(glm::mat4) -Q_DECLARE_METATYPE(QMdiArea::ViewMode) //! \brief count the amount of elements in a basic array template diff -r 59b6027b9843 -r 76a025db4948 src/circularprimitive.h --- a/src/circularprimitive.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/circularprimitive.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,8 +1,8 @@ #pragma once #include -#include "basics.h" -#include "model.h" -#include "ldrawalgorithm.h" +#include "src/basics.h" +#include "src/model.h" +#include "src/ldrawalgorithm.h" template void rasterize(const CircularPrimitive& circ, Fn&& fn) diff -r 59b6027b9843 -r 76a025db4948 src/colors.cpp --- a/src/colors.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/colors.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,6 +1,6 @@ #include #include -#include "colors.h" +#include "src/colors.h" const ColorDefinition unknownColor{{}, {}, "Unknown", "???"}; diff -r 59b6027b9843 -r 76a025db4948 src/colors.h --- a/src/colors.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/colors.h Sun Jun 26 21:32:51 2022 +0300 @@ -18,7 +18,7 @@ #pragma once #include -#include "basics.h" +#include "src/basics.h" /** * @brief Represents an LDraw color index (e.g 16, 24, ...) diff -r 59b6027b9843 -r 76a025db4948 src/documentmanager.cpp --- a/src/documentmanager.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/documentmanager.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -21,8 +21,8 @@ #include #include #include -#include "documentmanager.h" -#include "parser.h" +#include "src/documentmanager.h" +#include "src/parser.h" DocumentManager::DocumentManager(QObject *parent) : QObject{parent} diff -r 59b6027b9843 -r 76a025db4948 src/documentmanager.h --- a/src/documentmanager.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/documentmanager.h Sun Jun 26 21:32:51 2022 +0300 @@ -17,9 +17,9 @@ */ #pragma once -#include "libraries.h" -#include "model.h" -#include "polygoncache.h" +#include "src/libraries.h" +#include "src/model.h" +#include "src/polygoncache.h" enum OpenType { diff -r 59b6027b9843 -r 76a025db4948 src/geometry.cpp --- a/src/geometry.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/geometry.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,7 +1,7 @@ #include -#include "geometry.h" -#include "basics.h" -#include "ring.h" +#include "src/geometry.h" +#include "src/basics.h" +#include "src/ring.h" /** * @brief Computes line-plane intersection diff -r 59b6027b9843 -r 76a025db4948 src/gl/basicshaderprogram.cpp --- a/src/gl/basicshaderprogram.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/gl/basicshaderprogram.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "basicshaderprogram.h" +#include "src/gl/basicshaderprogram.h" BasicShader::BasicShader() : buffer{QOpenGLBuffer::VertexBuffer}, diff -r 59b6027b9843 -r 76a025db4948 src/gl/basicshaderprogram.h --- a/src/gl/basicshaderprogram.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/gl/basicshaderprogram.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,5 +1,5 @@ #pragma once -#include "common.h" +#include "src/gl/common.h" struct GLAttributeSpec { diff -r 59b6027b9843 -r 76a025db4948 src/gl/common.h --- a/src/gl/common.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/gl/common.h Sun Jun 26 21:32:51 2022 +0300 @@ -25,9 +25,9 @@ #include #include #include -#include "basics.h" -#include "colors.h" -#include "model.h" +#include "src/basics.h" +#include "src/colors.h" +#include "src/model.h" class RenderLayer { diff -r 59b6027b9843 -r 76a025db4948 src/gl/compiler.cpp --- a/src/gl/compiler.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/gl/compiler.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -17,10 +17,10 @@ */ #include -#include "gl/compiler.h" -#include "documentmanager.h" -#include "invert.h" -#include "ring.h" +#include "src/documentmanager.h" +#include "src/invert.h" +#include "src/ring.h" +#include "src/gl/compiler.h" constexpr char VERTEX_SHADER_SOURCE[] = R"( #version 330 core diff -r 59b6027b9843 -r 76a025db4948 src/gl/compiler.h --- a/src/gl/compiler.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/gl/compiler.h Sun Jun 26 21:32:51 2022 +0300 @@ -21,10 +21,10 @@ #include #include #include -#include "basics.h" -#include "gl/common.h" -#include "types/boundingbox.h" -#include "model.h" +#include "src/basics.h" +#include "src/types/boundingbox.h" +#include "src/model.h" +#include "src/gl/common.h" class Model; class DocumentManager; diff -r 59b6027b9843 -r 76a025db4948 src/gl/debug.cpp --- a/src/gl/debug.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/gl/debug.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,4 +1,4 @@ -#include "debug.h" +#include "src/gl/debug.h" QString sourceToString(const QOpenGLDebugMessage::Source source) { diff -r 59b6027b9843 -r 76a025db4948 src/gl/debug.h --- a/src/gl/debug.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/gl/debug.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,5 +1,5 @@ #pragma once #include -#include "basics.h" +#include "src/basics.h" Message debugMessageToString(const QOpenGLDebugMessage& glmessage); diff -r 59b6027b9843 -r 76a025db4948 src/gl/partrenderer.cpp --- a/src/gl/partrenderer.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/gl/partrenderer.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -24,12 +24,12 @@ #include #include #include -#include "geometry.h" -#include "partrenderer.h" -#include "model.h" -#include "gl/compiler.h" -#include "gl/debug.h" -#include "settings.h" +#include "src/geometry.h" +#include "src/model.h" +#include "src/settings.h" +#include "src/gl/partrenderer.h" +#include "src/gl/compiler.h" +#include "src/gl/debug.h" static constexpr double MIN_ZOOM = -3.0; static constexpr double MAX_ZOOM = 3.0; diff -r 59b6027b9843 -r 76a025db4948 src/gl/partrenderer.h --- a/src/gl/partrenderer.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/gl/partrenderer.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,11 +1,11 @@ #pragma once #include #include -#include "basics.h" -#include "gl/common.h" -#include "gl/compiler.h" -#include "documentmanager.h" -#include "types/boundingbox.h" +#include "src/basics.h" +#include "src/documentmanager.h" +#include "src/types/boundingbox.h" +#include "src/gl/common.h" +#include "src/gl/compiler.h" class PartRenderer final : public QOpenGLWidget { diff -r 59b6027b9843 -r 76a025db4948 src/invert.cpp --- a/src/invert.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/invert.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -#include "basics.h" -#include "model.h" -#include "gl/common.h" -#include "invert.h" -#include "documentmanager.h" +#include "src/basics.h" +#include "src/model.h" +#include "src/gl/common.h" +#include "src/invert.h" +#include "src/documentmanager.h" /* * Returns a matrix that causes a flip on the given dimension. diff -r 59b6027b9843 -r 76a025db4948 src/invert.h --- a/src/invert.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/invert.h Sun Jun 26 21:32:51 2022 +0300 @@ -17,8 +17,8 @@ */ #pragma once -#include "basics.h" -#include "gl/common.h" +#include "src/basics.h" +#include "src/gl/common.h" enum Axis { X, Y, Z }; diff -r 59b6027b9843 -r 76a025db4948 src/layers/axeslayer.cpp --- a/src/layers/axeslayer.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/layers/axeslayer.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -#include "gl/partrenderer.h" #include #include -#include "axeslayer.h" +#include "src/gl/partrenderer.h" +#include "src/layers/axeslayer.h" static constexpr char vertexShaderSource[] = R"( #version 330 core diff -r 59b6027b9843 -r 76a025db4948 src/layers/axeslayer.h --- a/src/layers/axeslayer.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/layers/axeslayer.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,6 +1,6 @@ #pragma once -#include "gl/common.h" -#include "gl/basicshaderprogram.h" +#include "src/gl/common.h" +#include "src/gl/basicshaderprogram.h" class AxesLayer final : public RenderLayer { diff -r 59b6027b9843 -r 76a025db4948 src/layers/edittools.cpp --- a/src/layers/edittools.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/layers/edittools.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -18,12 +18,12 @@ #include #include -#include "../algorithm/earcut.h" -#include "../model.h" -#include "../ui/objecteditor.h" -#include "../gl/partrenderer.h" -#include "../circularprimitive.h" -#include "edittools.h" +#include "src/algorithm/earcut.h" +#include "src/model.h" +#include "src/ui/objecteditor.h" +#include "src/gl/partrenderer.h" +#include "src/circularprimitive.h" +#include "src/layers/edittools.h" // Make mapbox::earcut work with glm::vec3 template<> struct mapbox::util::nth<0, glm::vec3> diff -r 59b6027b9843 -r 76a025db4948 src/layers/edittools.h --- a/src/layers/edittools.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/layers/edittools.h Sun Jun 26 21:32:51 2022 +0300 @@ -20,9 +20,9 @@ #include #include #include -#include "model.h" -#include "vertexmap.h" -#include "gl/common.h" +#include "src/model.h" +#include "src/vertexmap.h" +#include "src/gl/common.h" enum EditingMode { diff -r 59b6027b9843 -r 76a025db4948 src/layers/gridlayer.cpp --- a/src/layers/gridlayer.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/layers/gridlayer.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -#include "../gl/partrenderer.h" -#include "gridlayer.h" +#include "src/gl/partrenderer.h" +#include "src/layers/gridlayer.h" constexpr char vertexShaderSource[] = R"( #version 330 core diff -r 59b6027b9843 -r 76a025db4948 src/layers/gridlayer.h --- a/src/layers/gridlayer.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/layers/gridlayer.h Sun Jun 26 21:32:51 2022 +0300 @@ -17,8 +17,8 @@ */ #pragma once -#include "../gl/basicshaderprogram.h" -#include "../gl/common.h" +#include "src/gl/basicshaderprogram.h" +#include "src/gl/common.h" class GridLayer final : public RenderLayer { diff -r 59b6027b9843 -r 76a025db4948 src/ldrawalgorithm.cpp --- a/src/ldrawalgorithm.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/ldrawalgorithm.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,4 +1,4 @@ -#include "ldrawalgorithm.h" +#include "src/ldrawalgorithm.h" std::pair splitTriangles( const Quadrilateral& q, diff -r 59b6027b9843 -r 76a025db4948 src/ldrawalgorithm.h --- a/src/ldrawalgorithm.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/ldrawalgorithm.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,6 +1,6 @@ #pragma once -#include "basics.h" -#include "model.h" +#include "src/basics.h" +#include "src/model.h" namespace ldraw { diff -r 59b6027b9843 -r 76a025db4948 src/libraries.cpp --- a/src/libraries.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/libraries.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -17,8 +17,8 @@ */ #include -#include "libraries.h" -#include "settings.h" +#include "src/libraries.h" +#include "src/settings.h" /** * @brief Constructs a new library manager diff -r 59b6027b9843 -r 76a025db4948 src/libraries.h --- a/src/libraries.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/libraries.h Sun Jun 26 21:32:51 2022 +0300 @@ -19,8 +19,8 @@ #pragma once #include #include -#include "basics.h" -#include "colors.h" +#include "src/basics.h" +#include "src/colors.h" class QSettings; diff -r 59b6027b9843 -r 76a025db4948 src/main.cpp --- a/src/main.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/main.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,24 +1,24 @@ #include +#include #include +#include #include -#include #include #include -#include -#include "mainwindow.h" -#include "ui_mainwindow.h" -#include "version.h" -#include "gl/partrenderer.h" -#include "layers/axeslayer.h" -#include "layers/gridlayer.h" -#include "layers/edittools.h" -#include "settingseditor/settingseditor.h" -#include "widgets/colorselectdialog.h" -#include "settings.h" -#include "ui/circletooloptionswidget.h" -#include "messagelog.h" -#include "ui/objecteditor.h" -#include "ldrawalgorithm.h" +#include +#include +#include "src/gl/partrenderer.h" +#include "src/layers/axeslayer.h" +#include "src/layers/edittools.h" +#include "src/layers/gridlayer.h" +#include "src/ldrawalgorithm.h" +#include "src/messagelog.h" +#include "src/settings.h" +#include "src/settingseditor/settingseditor.h" +#include "src/ui/circletooloptionswidget.h" +#include "src/ui/objecteditor.h" +#include "src/version.h" +#include "src/widgets/colorselectdialog.h" static const QDir LOCALE_DIR {":/locale"}; @@ -65,7 +65,7 @@ Q_SIGNALS: void triggered(); }; -#include "main.moc" +#include static void doQtRegistrations() { diff -r 59b6027b9843 -r 76a025db4948 src/mainwindow.h --- a/src/mainwindow.h Sun Jun 26 21:00:06 2022 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +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 -#include -#include -#include "documentmanager.h" -#include "libraries.h" -#include "uiutilities.h" diff -r 59b6027b9843 -r 76a025db4948 src/messagelog.cpp --- a/src/messagelog.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/messagelog.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,5 +1,5 @@ #include -#include "messagelog.h" +#include "src/messagelog.h" MessageLog::MessageLog(QObject *parent) : QAbstractTableModel{parent} diff -r 59b6027b9843 -r 76a025db4948 src/messagelog.h --- a/src/messagelog.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/messagelog.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,5 +1,5 @@ #include -#include "basics.h" +#include "src/basics.h" class MessageLog final : public QAbstractTableModel { diff -r 59b6027b9843 -r 76a025db4948 src/model.cpp --- a/src/model.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/model.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -17,7 +17,7 @@ */ #include -#include "model.h" +#include "src/model.h" constexpr unsigned int gcd(unsigned int a, unsigned int b) { diff -r 59b6027b9843 -r 76a025db4948 src/model.h --- a/src/model.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/model.h Sun Jun 26 21:32:51 2022 +0300 @@ -19,8 +19,8 @@ #pragma once #include #include -#include "basics.h" -#include "colors.h" +#include "src/basics.h" +#include "src/colors.h" struct SubfileReference { diff -r 59b6027b9843 -r 76a025db4948 src/parser.cpp --- a/src/parser.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/parser.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -18,9 +18,9 @@ #include #include -#include "model.h" -#include "parser.h" -#include "ldrawalgorithm.h" +#include "src/ldrawalgorithm.h" +#include "src/model.h" +#include "src/parser.h" struct BodyParseError { diff -r 59b6027b9843 -r 76a025db4948 src/parser.h --- a/src/parser.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/parser.h Sun Jun 26 21:32:51 2022 +0300 @@ -17,8 +17,8 @@ */ #pragma once -#include "basics.h" -#include "model.h" +#include "src/basics.h" +#include "src/model.h" class Parser : public QObject { diff -r 59b6027b9843 -r 76a025db4948 src/polygoncache.cpp --- a/src/polygoncache.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/polygoncache.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,7 +1,7 @@ -#include "polygoncache.h" -#include "documentmanager.h" -#include "invert.h" -#include "circularprimitive.h" +#include "src/circularprimitive.h" +#include "src/documentmanager.h" +#include "src/invert.h" +#include "src/polygoncache.h" Model* resolve(const QString& name, const ModelId callingModelId, DocumentManager* documents) { diff -r 59b6027b9843 -r 76a025db4948 src/polygoncache.h --- a/src/polygoncache.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/polygoncache.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,7 +1,7 @@ #pragma once -#include "basics.h" -#include "model.h" -#include "gl/common.h" +#include "src/basics.h" +#include "src/model.h" +#include "src/gl/common.h" template struct WithId : T diff -r 59b6027b9843 -r 76a025db4948 src/settings.h --- a/src/settings.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/settings.h Sun Jun 26 21:32:51 2022 +0300 @@ -2,8 +2,8 @@ #define SETTINGS_H #include #include -#include "libraries.h" -#include "gl/common.h" +#include "src/libraries.h" +#include "src/gl/common.h" template struct SettingInfo{}; @@ -24,6 +24,8 @@ // ----------------------------------------------------------------------------- // Setting definitions +Q_DECLARE_METATYPE(QMdiArea::ViewMode) + // Rendering options SETTING(Locale, QString{"system"}) SETTING(BackgroundColor, (QColor{48, 48, 48})) diff -r 59b6027b9843 -r 76a025db4948 src/settingseditor/keyboardshortcutseditor.cpp --- a/src/settingseditor/keyboardshortcutseditor.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/settingseditor/keyboardshortcutseditor.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,6 +1,6 @@ #include -#include "keyboardshortcutseditor.h" -#include "uiutilities.h" +#include "src/uiutilities.h" +#include "src/settingseditor/keyboardshortcutseditor.h" KeyboardShortcutsEditor::KeyboardShortcutsEditor(QObject* subject, QObject* parent) : QAbstractTableModel{parent}, diff -r 59b6027b9843 -r 76a025db4948 src/settingseditor/librarieseditor.cpp --- a/src/settingseditor/librarieseditor.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/settingseditor/librarieseditor.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,8 +1,8 @@ #include #include #include -#include "librarieseditor.h" -#include "ui_librarieseditor.h" +#include +#include "src/settingseditor/librarieseditor.h" LibrariesEditor::LibrariesEditor(QWidget* parent) : QWidget{parent}, diff -r 59b6027b9843 -r 76a025db4948 src/settingseditor/librarieseditor.h --- a/src/settingseditor/librarieseditor.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/settingseditor/librarieseditor.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,7 +1,7 @@ #pragma once #include -#include "basics.h" -#include "libraries.h" +#include "src/basics.h" +#include "src/libraries.h" class LibrariesEditor : public QWidget { diff -r 59b6027b9843 -r 76a025db4948 src/settingseditor/settingseditor.cpp --- a/src/settingseditor/settingseditor.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/settingseditor/settingseditor.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,10 +1,10 @@ #include #include -#include "settings.h" -#include "gl/common.h" -#include "keyboardshortcutseditor.h" -#include "settingseditor.h" -#include "ui_settingseditor.h" +#include +#include "src/settings.h" +#include "src/gl/common.h" +#include "src/settingseditor/keyboardshortcutseditor.h" +#include "src/settingseditor/settingseditor.h" SettingsEditor::SettingsEditor( const uiutilities::KeySequenceMap& defaultKeyboardShortcuts, diff -r 59b6027b9843 -r 76a025db4948 src/settingseditor/settingseditor.h --- a/src/settingseditor/settingseditor.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/settingseditor/settingseditor.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,9 +1,9 @@ #pragma once #include -#include "basics.h" -#include "librarieseditor.h" -#include "libraries.h" -#include "uiutilities.h" +#include "src/basics.h" +#include "src/libraries.h" +#include "src/uiutilities.h" +#include "src/settingseditor/librarieseditor.h" class SettingsEditor : public QDialog { diff -r 59b6027b9843 -r 76a025db4948 src/types/boundingbox.cpp --- a/src/types/boundingbox.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/types/boundingbox.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "boundingbox.h" +#include "src/types/boundingbox.h" /** * @brief Resizes @c box so that @c vertex fits inside diff -r 59b6027b9843 -r 76a025db4948 src/types/boundingbox.h --- a/src/types/boundingbox.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/types/boundingbox.h Sun Jun 26 21:32:51 2022 +0300 @@ -17,7 +17,7 @@ */ #pragma once -#include "basics.h" +#include "../basics.h" struct BoundingBox { diff -r 59b6027b9843 -r 76a025db4948 src/ui/circletooloptionswidget.cpp --- a/src/ui/circletooloptionswidget.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/ui/circletooloptionswidget.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,4 +1,4 @@ -#include "circletooloptionswidget.h" +#include "src/ui/circletooloptionswidget.h" static QString circularPrimitiveTypeName(CircularPrimitive::Type type) { diff -r 59b6027b9843 -r 76a025db4948 src/ui/circletooloptionswidget.h --- a/src/ui/circletooloptionswidget.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/ui/circletooloptionswidget.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,7 +1,7 @@ #pragma once #include -#include "ui_circletool.h" -#include "model.h" +#include +#include "src/model.h" class CircleToolOptionsWidget : public QWidget { diff -r 59b6027b9843 -r 76a025db4948 src/ui/objecteditor.cpp --- a/src/ui/objecteditor.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/ui/objecteditor.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,11 +1,10 @@ #include #include #include -#include -#include "objecteditor.h" +#include "src/ui/objecteditor.h" +#include "src/widgets/colorindexinput.h" #include "widgets/colorbutton.h" -#include "widgets/colorindexinput.h" -#include "ui_objecteditor.h" +#include "widgets/vec3editor.h" using PropertyPointer = std::variant< glm::vec3*, diff -r 59b6027b9843 -r 76a025db4948 src/ui/objecteditor.h --- a/src/ui/objecteditor.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/ui/objecteditor.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,8 +1,8 @@ #pragma once #include -#include "../basics.h" -#include "../model.h" -#include "ui_objecteditor.h" +#include +#include "src/basics.h" +#include "src/model.h" class ObjectEditor final : public QWidget { diff -r 59b6027b9843 -r 76a025db4948 src/ui/objecteditor.ui --- a/src/ui/objecteditor.ui Sun Jun 26 21:00:06 2022 +0300 +++ b/src/ui/objecteditor.ui Sun Jun 26 21:32:51 2022 +0300 @@ -24,8 +24,8 @@ 0 0 - 908 - 857 + 907 + 481 @@ -71,7 +71,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -238,17 +238,17 @@ VectorInput QWidget -
vec3editor.h
+
widgets/vec3editor.h
MatrixEditor QWidget -
matrixeditor.h
+
widgets/matrixeditor.h
ColorIndexInput QWidget -
widgets/colorindexinput.h
+
src/widgets/colorindexinput.h
1
diff -r 59b6027b9843 -r 76a025db4948 src/uiutilities.cpp --- a/src/uiutilities.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/uiutilities.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -18,7 +18,7 @@ #include #include -#include "uiutilities.h" +#include "src/uiutilities.h" std::vector uiutilities::collectActions(QObject* subject) { diff -r 59b6027b9843 -r 76a025db4948 src/version.cpp --- a/src/version.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/version.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -18,8 +18,8 @@ #include #include -#include "version.h" -#include "hginfo.h" +#include +#include "src/version.h" static QString makeVersionString(const Version &version) { diff -r 59b6027b9843 -r 76a025db4948 src/vertexmap.cpp --- a/src/vertexmap.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/vertexmap.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,5 +1,5 @@ -#include "vertexmap.h" -#include "gl/common.h" +#include "src/vertexmap.h" +#include "src/gl/common.h" hash_t hashVertex(const glm::vec3& vec) { diff -r 59b6027b9843 -r 76a025db4948 src/vertexmap.h --- a/src/vertexmap.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/vertexmap.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,8 +1,8 @@ #ifndef VERTEXMAP_H #define VERTEXMAP_H #include -#include "basics.h" -#include "model.h" +#include "src/basics.h" +#include "src/model.h" /** * @brief Collects a map of all vertices in a model to all objects that use the specified vertex. diff -r 59b6027b9843 -r 76a025db4948 src/widgets/colorindexinput.cpp --- a/src/widgets/colorindexinput.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/widgets/colorindexinput.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,7 +1,7 @@ -#include "colorindexinput.h" -#include "ui_colorindexinput.h" -#include "colorselectdialog.h" -#include "uiutilities.h" +#include +#include "src/uiutilities.h" +#include "src/widgets/colorindexinput.h" +#include "src/widgets/colorselectdialog.h" ColorIndexInput::ColorIndexInput(QWidget *parent) : QWidget{parent}, diff -r 59b6027b9843 -r 76a025db4948 src/widgets/colorindexinput.h --- a/src/widgets/colorindexinput.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/widgets/colorindexinput.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,5 +1,5 @@ #pragma once -#include "colors.h" +#include "src/colors.h" class ColorIndexInput : public QWidget { diff -r 59b6027b9843 -r 76a025db4948 src/widgets/colorselectdialog.cpp --- a/src/widgets/colorselectdialog.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/src/widgets/colorselectdialog.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,9 +1,7 @@ #include -#include -#include -#include "colorselectdialog.h" -#include "ui_colorselectdialog.h" -#include "uiutilities.h" +#include +#include "src/widgets/colorselectdialog.h" +#include "src/uiutilities.h" ColorSelectDialog::ColorSelectDialog(const ColorTable& colorTable, QWidget *parent) : QDialog{parent}, diff -r 59b6027b9843 -r 76a025db4948 src/widgets/colorselectdialog.h --- a/src/widgets/colorselectdialog.h Sun Jun 26 21:00:06 2022 +0300 +++ b/src/widgets/colorselectdialog.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,6 +1,6 @@ #pragma once -#include "../basics.h" -#include "../colors.h" +#include "src/basics.h" +#include "src/colors.h" #include #include #include diff -r 59b6027b9843 -r 76a025db4948 widgets/CMakeLists.txt --- a/widgets/CMakeLists.txt Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/CMakeLists.txt Sun Jun 26 21:32:51 2022 +0300 @@ -22,7 +22,7 @@ get_target_property(UIPLUGIN_INCLUDES QtUiPlugin INTERFACE_INCLUDE_DIRECTORIES) target_include_directories(ldforgewidgets PUBLIC "${UIPLUGIN_INCLUDES}") -target_include_directories(ldforgewidgets PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") +target_include_directories(ldforgewidgets PUBLIC "${CMAKE_SOURCE_DIR}") target_include_directories(ldforgewidgets PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") target_link_libraries(ldforgewidgets Qt::Widgets) set_target_properties(ldforgewidgets PROPERTIES AUTOMOC 1) diff -r 59b6027b9843 -r 76a025db4948 widgets/colorbutton.cpp --- a/widgets/colorbutton.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/colorbutton.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,6 +1,6 @@ #include #include -#include "colorbutton.h" +#include "widgets/colorbutton.h" ColorButton::ColorButton(const QColor& color, QWidget* parent) : ColorButton{parent} diff -r 59b6027b9843 -r 76a025db4948 widgets/designerplugins.cpp --- a/widgets/designerplugins.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/designerplugins.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,7 +1,7 @@ -#include "designerplugins.h" -#include "vec3editor.h" -#include "matrixeditor.h" -#include "colorbutton.h" +#include "widgets/designerplugins.h" +#include "widgets/vec3editor.h" +#include "widgets/matrixeditor.h" +#include "widgets/colorbutton.h" LDForgeWidgetCollection::LDForgeWidgetCollection(QObject* parent) : QObject{parent} @@ -38,7 +38,7 @@ QString Vec3EditorPlugin::includeFile() const { - return "vec3editor.h"; + return "widgets/vec3editor.h"; } QIcon Vec3EditorPlugin::icon() const @@ -78,7 +78,7 @@ QString MatrixEditorPlugin::includeFile() const { - return "matrixeditor.h"; + return "widgets/matrixeditor.h"; } QIcon MatrixEditorPlugin::icon() const @@ -119,7 +119,7 @@ QString ColorButtonPlugin::includeFile() const { - return "colorbutton.h"; + return "widgets/colorbutton.h"; } QIcon ColorButtonPlugin::icon() const diff -r 59b6027b9843 -r 76a025db4948 widgets/doublespinbox.cpp --- a/widgets/doublespinbox.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/doublespinbox.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#include "doublespinbox.h" +#include "widgets/doublespinbox.h" /* * Constructs a new double spin box. The locale is fixed to system default "C". diff -r 59b6027b9843 -r 76a025db4948 widgets/matrixeditor.cpp --- a/widgets/matrixeditor.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/matrixeditor.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,6 +1,6 @@ -#include "matrixeditor.h" -#include "ui_matrixeditor.h" -#include "multiplyfactordialog.h" +#include +#include "widgets/matrixeditor.h" +#include "widgets/multiplyfactordialog.h" constexpr char BUTTON_COLUMN_PROPERTY[] = "_ldforge_column"; diff -r 59b6027b9843 -r 76a025db4948 widgets/matrixeditor.ui --- a/widgets/matrixeditor.ui Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/matrixeditor.ui Sun Jun 26 21:32:51 2022 +0300 @@ -115,7 +115,7 @@ DoubleSpinBox QDoubleSpinBox -
doublespinbox.h
+
widgets/doublespinbox.h
diff -r 59b6027b9843 -r 76a025db4948 widgets/multiplyfactordialog.cpp --- a/widgets/multiplyfactordialog.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/multiplyfactordialog.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,5 +1,5 @@ -#include "multiplyfactordialog.h" -#include "ui_multiplyfactordialog.h" +#include +#include "widgets/multiplyfactordialog.h" MultiplyFactorDialog::MultiplyFactorDialog(const glm::vec3& baseVector, QWidget* parent) : QDialog{parent}, diff -r 59b6027b9843 -r 76a025db4948 widgets/multiplyfactordialog.h --- a/widgets/multiplyfactordialog.h Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/multiplyfactordialog.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,6 +1,6 @@ #pragma once #include -#include "vec3editor.h" +#include "widgets/vec3editor.h" namespace Ui { diff -r 59b6027b9843 -r 76a025db4948 widgets/multiplyfactordialog.ui --- a/widgets/multiplyfactordialog.ui Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/multiplyfactordialog.ui Sun Jun 26 21:32:51 2022 +0300 @@ -62,7 +62,7 @@ DoubleSpinBox QDoubleSpinBox -
doublespinbox.h
+
widgets/doublespinbox.h
diff -r 59b6027b9843 -r 76a025db4948 widgets/vec3editor.cpp --- a/widgets/vec3editor.cpp Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/vec3editor.cpp Sun Jun 26 21:32:51 2022 +0300 @@ -1,8 +1,8 @@ #include #include #include -#include "vec3editor.h" -#include "multiplyfactordialog.h" +#include "widgets/vec3editor.h" +#include "widgets/multiplyfactordialog.h" VectorInput::VectorInput(const glm::vec3& value, QWidget* parent, QFlags flags) : VectorInput{parent, flags} diff -r 59b6027b9843 -r 76a025db4948 widgets/vec3editor.h --- a/widgets/vec3editor.h Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/vec3editor.h Sun Jun 26 21:32:51 2022 +0300 @@ -1,7 +1,7 @@ #pragma once #include #include -#include "ui_vec3editor.h" +#include class VectorInput : public QWidget { diff -r 59b6027b9843 -r 76a025db4948 widgets/vec3editor.ui --- a/widgets/vec3editor.ui Sun Jun 26 21:00:06 2022 +0300 +++ b/widgets/vec3editor.ui Sun Jun 26 21:32:51 2022 +0300 @@ -7,7 +7,7 @@ 0 0 613 - 46 + 50 @@ -75,7 +75,7 @@ DoubleSpinBox QDoubleSpinBox -
doublespinbox.h
+
widgets/doublespinbox.h