Merge from master

Minor revamp
Remove unused include.
QETproject : Default titleblock are set in the default constructor
instead of set by qetdiagrameditor.
conductor, border, report and xref propertie are now set in the header
of QETProject instead of set by the qetdiagrameditor just after the
creation of a new project.
This commit is contained in:
Laurent Trinques
2020-04-12 18:01:27 +02:00
parent b206f749e8
commit 008e16eb14

View File

@@ -26,6 +26,7 @@
#include "templatescollection.h"
#include "properties/xrefproperties.h"
#include "projectdatabase.h"
#include "reportproperties.h"
class Diagram;
class ElementsLocation;
@@ -237,15 +238,15 @@ class QETProject : public QObject
/// Filepath for which this project is considered read only
QString read_only_file_path_;
/// Default dimensions and properties for new diagrams created within the project
BorderProperties default_border_properties_;
BorderProperties default_border_properties_ = BorderProperties::defaultProperties();
/// Default conductor properties for new diagrams created within the project
ConductorProperties default_conductor_properties_;
ConductorProperties default_conductor_properties_ = ConductorProperties::defaultProperties();
/// Default title block properties for new diagrams created within the project
TitleBlockProperties default_titleblock_properties_;
/// Default report properties
QString m_default_report_properties;
QString m_default_report_properties = ReportProperties::defaultProperties();
/// Default xref properties
QHash <QString, XRefProperties> m_default_xref_properties;
QHash <QString, XRefProperties> m_default_xref_properties = XRefProperties::defaultProperties();
/// Embedded title block templates collection
TitleBlockTemplatesProjectCollection m_titleblocks_collection;
/// project-wide variables that will be made available to child diagrams