Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes
- Merged 292 changed files from dlbo snapshot - Fixed IDL enum collisions (PortType, PdmEventType) - Fixed Grantlee template for C++11 scoped enums - Fixed CMake VERSION_GREATER syntax - Added missing directories (THP, LtsRestClient, etc.) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
310 files changed
+2823
-740
No files matched your search
@@ -1916,33 +1916,13 @@ Szenarstatus strToSzenarstatus(QString status) { return szenarstatusMap.value(st
|
||||
|
||||
int getFeuerkommandoRaketeEffectDurationMsec(const QJsonObject &data)
|
||||
{
|
||||
bool bOk = false;
|
||||
int wirkzeitMsec;
|
||||
switch (toInteger(data[JsonKeys::WIRKZEIT()], bOk)){
|
||||
case 1:
|
||||
wirkzeitMsec = 3 * 60 * 60 * 1000;
|
||||
break;
|
||||
case 2:
|
||||
wirkzeitMsec = 6 * 60 * 60 * 1000;
|
||||
break;
|
||||
case 3:
|
||||
wirkzeitMsec = 12 * 60 * 60 * 1000;
|
||||
break;
|
||||
case 4:
|
||||
wirkzeitMsec = 24 * 60 * 60 * 1000;
|
||||
break;
|
||||
case 5:
|
||||
wirkzeitMsec = 48 * 60 * 60 * 1000;
|
||||
break;
|
||||
case 6:
|
||||
wirkzeitMsec = 96 * 60 * 60 * 1000;
|
||||
break;
|
||||
default:
|
||||
wirkzeitMsec = 3 * 60 * 60 * 1000;
|
||||
break;
|
||||
}
|
||||
constexpr int hourToMsec = 60 * 60 * 1000;
|
||||
constexpr int defaultWirkzeitMsec = 3 * hourToMsec;
|
||||
|
||||
return wirkzeitMsec;
|
||||
bool bOk = false;
|
||||
int wirkzeitHour = toInteger(data[JsonKeys::WIRKZEIT()], bOk);
|
||||
|
||||
return (bOk ? wirkzeitHour * hourToMsec : defaultWirkzeitMsec);
|
||||
}
|
||||
|
||||
} // namespace AdlerJson
|
||||
Reference in new issue
Block a user