realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

fix typo in enum-entry and comments

Browse Source
This commit is contained in:
plc-user 2025-02-17 09:33:35 +01:00
parent 51225d5f59
commit 67112bf8e5
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/TerminalStrip/terminalstrip.cpp
View File

@ -250,7 +250,7 @@ bool TerminalStrip::addTerminal(Element *terminal)
}
}
if (terminal->elementData().m_type != ElementData::Terminale) {
if (terminal->elementData().m_type != ElementData::Terminal) {
return false;
}

8
sources/dataBase/projectdatabase.cpp
View File

@ -450,8 +450,8 @@ void projectDataBase::populateElementTable()
for (auto diagram : m_project->diagrams())
{
const ElementProvider ep(diagram);
const auto elmt_vector = ep.find(ElementData::Simple | ElementData::Terminale | ElementData::Master | ElementData::Thumbnail);
//Insert all value into the database
const auto elmt_vector = ep.find(ElementData::Simple | ElementData::Terminal | ElementData::Master | ElementData::Thumbnail);
//Insert all values into the database
for (const auto &elmt : elmt_vector)
{
const auto elmt_data = elmt->elementData();
@ -479,9 +479,9 @@ void projectDataBase::populateElementInfoTable()
for (const auto &diagram : m_project->diagrams())
{
const ElementProvider ep(diagram);
const auto elmt_vector = ep.find(ElementData::Simple | ElementData::Terminale | ElementData::Master | ElementData::Thumbnail);
const auto elmt_vector = ep.find(ElementData::Simple | ElementData::Terminal | ElementData::Master | ElementData::Thumbnail);
//Insert all value into the database
//Insert all values into the database
for (const auto &elmt : elmt_vector)
{
m_insert_element_info_query.bindValue(QStringLiteral(":uuid"), elmt->uuid().toString());

4
sources/dataBase/ui/elementquerywidget.cpp
View File

@ -171,7 +171,7 @@ void ElementQueryWidget::setQuery(const QString &query)
if (ui->m_simple_cb->isChecked()) {
++c;
}
ui->m_terminal_cb->setChecked (str_type.contains(ElementData::typeToString(ElementData::Terminale)) ? true : false);
ui->m_terminal_cb->setChecked (str_type.contains(ElementData::typeToString(ElementData::Terminal)) ? true : false);
if (ui->m_terminal_cb->isChecked()) {
++c;
}
@ -340,7 +340,7 @@ QString ElementQueryWidget::queryStr() const
bool b = false;
if (ui->m_terminal_cb->isChecked()) {
if (b) where +=" OR";
where += QStringLiteral(" element_type = '") += ElementData::typeToString(ElementData::Terminale) += "'";
where += QStringLiteral(" element_type = '") += ElementData::typeToString(ElementData::Terminal) += "'";
b = true;
}
if (ui->m_thumbnail_cb->isChecked()) {

4
sources/editor/elementscene.cpp
View File

@ -463,7 +463,7 @@ const QDomDocument ElementScene::toXml(bool all_parts)
auto type_ = m_element_data.m_type;
if (type_ == ElementData::Slave ||
type_ == ElementData::Master ||
type_ == ElementData::Terminale ||
type_ == ElementData::Terminal ||
type_ == ElementData::Thumbnail)
{
root.appendChild(m_element_data.kindInfoToXml(xml_document));
@ -471,7 +471,7 @@ const QDomDocument ElementScene::toXml(bool all_parts)
if (type_ == ElementData::Simple ||
type_ == ElementData::Master ||
type_ == ElementData::Terminale ||
type_ == ElementData::Terminal ||
type_ == ElementData::Thumbnail)
{
QDomElement element_info = xml_document.createElement("elementInformations");

10
sources/editor/ui/elementpropertieseditorwidget.cpp
View File

@ -98,7 +98,7 @@ void ElementPropertiesEditorWidget::upDateInterface()
ui->m_master_type_cb->setCurrentIndex(
ui->m_master_type_cb->findData (
m_data.m_master_type));
} else if (m_data.m_type == ElementData::Terminale) {
} else if (m_data.m_type == ElementData::Terminal) {
ui->m_terminal_type_cb->setCurrentIndex(
ui->m_terminal_type_cb->findData(
m_data.m_terminal_type));
@ -121,7 +121,7 @@ void ElementPropertiesEditorWidget::setUpInterface()
ui->m_base_type_cb->addItem (tr("Esclave"), ElementData::Slave);
ui->m_base_type_cb->addItem (tr("Renvoi de folio suivant"), ElementData::NextReport);
ui->m_base_type_cb->addItem (tr("Renvoi de folio précédent"), ElementData::PreviousReport);
ui->m_base_type_cb->addItem (tr("Bornier"), ElementData::Terminale);
ui->m_base_type_cb->addItem (tr("Bornier"), ElementData::Terminal);
ui->m_base_type_cb->addItem (tr("Vignette"), ElementData::Thumbnail);
// Slave option
@ -181,7 +181,7 @@ void ElementPropertiesEditorWidget::updateTree()
case ElementData::Slave:
ui->m_tree->setDisabled(true);
break;
case ElementData::Terminale:
case ElementData::Terminal:
ui->m_tree->setEnabled(true);
break;
default:
@ -227,7 +227,7 @@ void ElementPropertiesEditorWidget::on_m_buttonBox_accepted()
else if (m_data.m_type == ElementData::Master) {
m_data.m_master_type = ui->m_master_type_cb->currentData().value<ElementData::MasterType>();
}
else if (m_data.m_type == ElementData::Terminale)
else if (m_data.m_type == ElementData::Terminal)
{
m_data.m_terminal_type = ui->m_terminal_type_cb->currentData().value<ElementData::TerminalType>();
m_data.m_terminal_function = ui->m_terminal_func_cb->currentData().value<ElementData::TerminalFunction>();
@ -260,7 +260,7 @@ void ElementPropertiesEditorWidget::on_m_base_type_cb_currentIndexChanged(int in
slave = true;
else if (type_ == ElementData::Master)
master = true;
else if (type_ == ElementData::Terminale)
else if (type_ == ElementData::Terminal)
terminal = true;
ui->m_slave_gb->setVisible(slave);

2
sources/elementprovider.cpp
View File

@ -204,7 +204,7 @@ QVector<TerminalElement *> ElementProvider::freeTerminal() const
for (const auto element : elmt_list)
{
if (element->elementData().m_type == ElementData::Terminale)
if (element->elementData().m_type == ElementData::Terminal)
{
const auto te{static_cast<TerminalElement *>(element)};
if (!te->parentTerminalStrip()) {

12
sources/properties/elementdata.cpp
View File

@ -102,7 +102,7 @@ QDomElement ElementData::kindInfoToXml(QDomDocument &document)
returned_elmt.appendChild(xml_count);
}
else if (m_type == ElementData::Terminale)
else if (m_type == ElementData::Terminal)
{
//type
auto xml_type = document.createElement(QStringLiteral("kindInformation"));
@ -233,7 +233,7 @@ bool ElementData::operator==(const ElementData &data) const
return false;
}
}
else if (data.m_type == ElementData::Terminale) {
else if (data.m_type == ElementData::Terminal) {
//Check terminal type or overrided terminal type
if (data.m_terminal_type_is_override != m_terminal_type_is_override) {
return false;
@ -309,7 +309,7 @@ QString ElementData::typeToString(ElementData::Type type)
return QStringLiteral("master");
case ElementData::Slave :
return QStringLiteral("slave");
case ElementData::Terminale :
case ElementData::Terminal :
return QStringLiteral("terminal");
case ElementData::Thumbnail:
return QStringLiteral("thumbnail");
@ -333,7 +333,7 @@ ElementData::Type ElementData::typeFromString(const QString &string)
} else if (string == QLatin1String("slave")) {
return ElementData::Slave;
} else if (string == QLatin1String("terminal")) {
return ElementData::Terminale;
return ElementData::Terminal;
} else if (string == QLatin1String("thumbnail")) {
return ElementData::Thumbnail;
}
@ -548,7 +548,7 @@ void ElementData::kindInfoFromXml(const QDomElement &xml_element)
{
if (m_type == ElementData::Master ||
m_type == ElementData::Slave ||
m_type == ElementData::Terminale)
m_type == ElementData::Terminal)
{
auto xml_kind = xml_element.firstChildElement(QStringLiteral("kindInformations"));
for (const auto &dom_elmt : QETXML::findInDomElement(xml_kind, QStringLiteral("kindInformation")))
@ -571,7 +571,7 @@ void ElementData::kindInfoFromXml(const QDomElement &xml_element)
m_contact_count = dom_elmt.text().toInt();
}
}
else if (m_type == ElementData::Terminale) {
else if (m_type == ElementData::Terminal) {
if (name == QLatin1String("type")) {
m_terminal_type = terminalTypeFromString(dom_elmt.text());
} else if (name == QLatin1String("function")) {

2
sources/properties/elementdata.h
View File

@ -40,7 +40,7 @@ class ElementData : public PropertiesInterface
AllReport = 6,
Master = 8,
Slave = 16,
Terminale = 32,
Terminal = 32,
Thumbnail = 64};
Q_ENUM(Type)
Q_DECLARE_FLAGS(Types, Type)

4
sources/qetgraphicsitem/element.cpp
View File

@ -845,7 +845,7 @@ bool Element::fromXml(QDomElement &e,
QStringLiteral("elementInformation"));
//Load override properties (For now, only used when the element is a terminal)
if (m_data.m_type == ElementData::Terminale)
if (m_data.m_type == ElementData::Terminal)
{
auto elmt_type_list = QETXML::subChild(e, QStringLiteral("properties"), QStringLiteral("element_type"));
@ -976,7 +976,7 @@ QDomElement Element::toXml(
}
//Save override properties (For now, only used when the element is a terminal)
if (m_data.m_type == ElementData::Terminale)
if (m_data.m_type == ElementData::Terminal)
{
QDomElement properties = document.createElement(QStringLiteral("properties"));
QDomElement element_type = document.createElement(QStringLiteral("element_type"));

2
sources/ui/elementinfowidget.cpp
View File

@ -179,7 +179,7 @@ void ElementInfoWidget::disableLiveEdit()
void ElementInfoWidget::buildInterface()
{
QStringList keys;
if (m_element.data()->elementData().m_type == ElementData::Terminale) {
if (m_element.data()->elementData().m_type == ElementData::Terminal) {
keys = QETInformation::terminalElementInfoKeys();
} else {
keys = QETInformation::elementInfoKeys();