kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-02-19 01:59:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compile issues

Browse Source
This commit is contained in:
Martin
2021-02-24 18:48:59 +01:00
parent ea364f9c4e
commit 02b7ead041
14 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/properties/elementdata.cpp
View File

@@ -19,12 +19,12 @@
#include "../qetxml.h"
#include <QDebug>
void ElementData::toSettings(QSettings &settings, const QString prefix) const {
void ElementData::toSettings(QSettings &settings, const QString& prefix) const {
Q_UNUSED(settings)
Q_UNUSED(prefix)
}
void ElementData::fromSettings(const QSettings &settings, const QString prefix) {
void ElementData::fromSettings(QSettings &settings, const QString& prefix) {
Q_UNUSED(settings)
Q_UNUSED(prefix)
}

6
sources/properties/elementdata.h
View File

@@ -18,7 +18,7 @@
#ifndef ELEMENTDATA_H
#define ELEMENTDATA_H
#include "propertiesinterface.h"
#include "../properties/propertiesinterface.h"
#include "../diagramcontext.h"
#include "../NameList/nameslist.h"
@@ -85,8 +85,8 @@ class ElementData : public PropertiesInterface
ElementData() {}
~ElementData() override {}
void toSettings(QSettings &settings, const QString prefix = QString()) const override;
void fromSettings(const QSettings &settings, const QString prefix = QString()) override;
void toSettings(QSettings &settings, const QString& prefix = QString()) const override;
void fromSettings(QSettings &settings, const QString& prefix = QString()) override;
QDomElement toXml(QDomDocument &xml_element) const override;
bool fromXml(const QDomElement &xml_element) override;
QDomElement kindInfoToXml(QDomDocument &document);

5
sources/properties/propertiesinterface.h
View File

@@ -23,7 +23,7 @@
#include <QColor>
#include <QDomElement>
#include <limits>
#include "qet.h"
#include "sources/qet.h"
#include <QUuid>
/**
@@ -91,9 +91,6 @@ class PropertiesInterface
// = 4
};
/*!
* Try not using the default Value feature. It is better to initialize the class members in the class definition!
*/
static PropertyFlags propertyInteger(const QDomElement &e, const QString& attribute_name, int *entier = nullptr);
static PropertyFlags propertyDouble(const QDomElement &e, const QString& attribute_name, double *reel = nullptr);
static PropertyFlags propertyString(const QDomElement& e, const QString& attribute_name, QString* string = nullptr);

4
sources/properties/terminaldata.cpp
View File

@@ -103,7 +103,7 @@ QDomElement TerminalData::toXml(QDomDocument &xml_document) const
xml_element.appendChild(createXmlProperty(xml_document, "y", m_pos.y()));
xml_element.appendChild(createXmlProperty(xml_document, "name", m_name));
xml_element.appendChild(createXmlProperty(xml_document, "orientation", orientationToString(m_orientation)));
xml_element.appendChild(createXmlProperty(xml_document, "type", typeToString(m_type));
xml_element.appendChild(createXmlProperty(xml_document, "type", typeToString(m_type)));
return(xml_element);
}
@@ -153,7 +153,7 @@ bool TerminalData::fromXml (const QDomElement &xml_element) // RETURNS True
// lit l'orientation de la borne
m_orientation = orientationFromString(o);
QStrint type;
QString type;
if (propertyString(xml_element, "type", &type))
return false;
m_type = typeFromString(type);

6
sources/properties/terminaldata.h
View File

@@ -19,7 +19,7 @@
#define TERMINALDATA_H
#include "../qet.h"
#include "propertiesinterface.h"
#include "../properties/propertiesinterface.h"
#include <QPointF>
#include <QUuid>
@@ -73,11 +73,11 @@ class TerminalData : public PropertiesInterface
*/
Qet::Orientation m_orientation{Qet::Orientation::North};
/**
@brief second_point
@brief m_second_point
Position of the second point of the terminal
in scene coordinates
*/
QPointF second_point{0,0};
QPointF m_second_point{0,0};
/**
@brief m_uuid
Uuid of the terminal.