From 15b625021cefa058188a16800fc1d8c53ba6203c Mon Sep 17 00:00:00 2001 From: plc-user <74435298+plc-user@users.noreply.github.com> Date: Sun, 7 Apr 2024 15:17:04 +0200 Subject: [PATCH] fix warnings: "control reaches end of non-void function" --- sources/editor/graphicspart/partterminal.cpp | 1 + sources/properties/elementdata.cpp | 7 +++++++ sources/properties/terminaldata.cpp | 1 + 3 files changed, 9 insertions(+) diff --git a/sources/editor/graphicspart/partterminal.cpp b/sources/editor/graphicspart/partterminal.cpp index 900b0d880..9aff99155 100644 --- a/sources/editor/graphicspart/partterminal.cpp +++ b/sources/editor/graphicspart/partterminal.cpp @@ -176,6 +176,7 @@ qreal PartTerminal::rotation() const { case Qet::South : return 180; case Qet::West : return 270; } + return 0; } /** diff --git a/sources/properties/elementdata.cpp b/sources/properties/elementdata.cpp index 4ee521296..3e02c874f 100644 --- a/sources/properties/elementdata.cpp +++ b/sources/properties/elementdata.cpp @@ -362,6 +362,7 @@ QString ElementData::masterTypeToString(ElementData::MasterType type) case ElementData::Commutator: return QStringLiteral("commutator"); } + return QStringLiteral("coil"); } ElementData::MasterType ElementData::masterTypeFromString(const QString &string) @@ -394,6 +395,7 @@ QString ElementData::slaveTypeToString(ElementData::SlaveType type) case ElementData::delayOnOff: return QStringLiteral("delayOnOff"); } + return QStringLiteral("simple"); } ElementData::SlaveType ElementData::slaveTypeFromString(const QString &string) @@ -428,6 +430,7 @@ QString ElementData::slaveStateToString(ElementData::SlaveState type) case Other: return QStringLiteral("Other"); } + return QStringLiteral("NO"); } ElementData::SlaveState ElementData::slaveStateFromString(const QString &string) @@ -462,6 +465,7 @@ QString ElementData::terminalTypeToString(ElementData::TerminalType type) case ElementData::TTGround: return QStringLiteral("ground"); } + return QStringLiteral("generic"); } ElementData::TerminalType ElementData::terminalTypeFromString(const QString &string) @@ -498,6 +502,7 @@ QString ElementData::translatedTerminalType(ElementData::TerminalType type) case ElementData::TTGround: return QObject::tr("Terre", "ground terminal element type"); } + return QObject::tr("Générique", "generic terminal element type"); } QString ElementData::terminalFunctionToString(ElementData::TerminalFunction function) @@ -510,6 +515,7 @@ QString ElementData::terminalFunctionToString(ElementData::TerminalFunction func case ElementData::TFNeutral: return QStringLiteral("neutral"); } + return QStringLiteral("generic"); } ElementData::TerminalFunction ElementData::terminalFunctionFromString(const QString &string) @@ -535,6 +541,7 @@ QString ElementData::translatedTerminalFunction(ElementData::TerminalFunction fu case TFPhase : return QObject::tr("Phase", "phase terminal element function" ); case TFNeutral : return QObject::tr("Neutre", "neutral terminal element function"); } + return QObject::tr("Générique", "generic terminal element function"); } void ElementData::kindInfoFromXml(const QDomElement &xml_element) diff --git a/sources/properties/terminaldata.cpp b/sources/properties/terminaldata.cpp index 4c92405ba..7c521a36a 100644 --- a/sources/properties/terminaldata.cpp +++ b/sources/properties/terminaldata.cpp @@ -172,6 +172,7 @@ QString TerminalData::typeToString(TerminalData::Type type) case Outer : return QString("Outer"); } + return QString("Generic"); } /**