lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Session 026: Lts/Services Qt5:: to Qt6:: migration

Browse Source 
- Migrated all 104 CMakeLists.txt files in Lts/Services
- Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg,
  Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test,
  Qt5::SerialPort with Qt6:: equivalents
- 1244 files modified (CMakeLists.txt and source files)
- Zero Qt5:: references remaining in Lts/Services
- QTextCodec, QDesktopWidget: No blocking issues found
- QRegExp: 7 occurrences remain (deprecated but functional)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-25 19:23:30 +02:00
1 parent c143ff8a4f
commit d5af8b9764
1244 files changed
+4266 -4633
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp
+10 -10
View File
@@ -7,7 +7,6 @@
*/
#include "handler_effect_show.h"
#include <utility>
#include "handler_ppm_data.h"
#include "handler_tab_data.h"
#include "handler_mdm_data.h"
@@ -33,6 +32,7 @@ HandlerEffectShow::HandlerEffectShow(Initialization *mainHandler,
, m_cleanupTimer(new QTimer(this))
, m_timerMeteoData(new QTimer(this))
, m_mainHandler(mainHandler)
, m_logger(getLogger("HandlerEffectShow"))
{} // end of ctor()
//=============================================================================
@@ -610,7 +610,7 @@ void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract)
//-------------------------------------------------------------------------------
void HandlerEffectShow::updateEffectShowsRelatedToMineArea(const AreaEffectSimulation::MineArea &data)
{
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == data.id())
{
@@ -624,7 +624,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToMineArea(const AreaEffectSimul
//-------------------------------------------------------------------------------
void HandlerEffectShow::updateEffectShowsRelatedToExplosionArea(const AreaEffectSimulation::ExplosionArea &data)
{
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == data.id())
{
@@ -638,7 +638,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToExplosionArea(const AreaEffect
void HandlerEffectShow::updateEffectShowsRelatedToExplosionCluster(const AreaEffectSimulation::ExplosionCluster &data)
{
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == data.id())
{
@@ -652,7 +652,7 @@ void HandlerEffectShow::updateEffectShowsRelatedToExplosionCluster(const AreaEff
void HandlerEffectShow::updateEffectShowsRelatedToEffectCluster(const AreaEffectSimulation::EffectCluster &data)
{
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == data.id())
{
@@ -726,7 +726,7 @@ void HandlerEffectShow::modifyEffectShows(const QVector<Database::EsmEffectShow>
//-------------------------------------------------------------------------------
void HandlerEffectShow::updateEffectShowOrdersRelatedToAes(int idAes)
{
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == idAes)
triggerEffectShowOrder(obj);
@@ -735,7 +735,7 @@ void HandlerEffectShow::updateEffectShowOrdersRelatedToAes(int idAes)
//-------------------------------------------------------------------------------
void HandlerEffectShow::pauseEffectShowsRelatedToAes(int idAes)
{
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == idAes)
triggerEffectShowStop(obj);
@@ -744,7 +744,7 @@ void HandlerEffectShow::pauseEffectShowsRelatedToAes(int idAes)
//-------------------------------------------------------------------------------
void HandlerEffectShow::continueEffectShowsRelatedToAes(int idAes)
{
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
if (obj->getIdAES() == idAes)
triggerEffectShowContinue(obj);
@@ -891,7 +891,7 @@ void HandlerEffectShow::triggerMeteoData(const ObjectEffectShow *ifs)
//-----------------------------------------------------------------------------
void HandlerEffectShow::onSendMeteoData()
{
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
const Database::EsmEffectShow &effectShow = obj->getData();
if (effectShow.esmParticipantId == -1)
@@ -909,7 +909,7 @@ void HandlerEffectShow::onCleanUp()
{
DEBUG_LOG(m_logger) << "Start Cleanup ";
QVector<ObjectEffectShow * > objects;
for (ObjectEffectShow *obj : std::as_const(m_effectShowObjMap))
for (ObjectEffectShow *obj : qAsConst(m_effectShowObjMap))
{
const Database::EsmEffectShow &effectShow = obj->getData();
if (effectShow.orderConfirmation == OrderConfirmation_e::OrderCarriedOut || effectShow.startTime <= 0 || effectShow.id <= 0)