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/AreaEffectSimulation/Utils/firing_timer.cpp
+40 -39
View File
@@ -10,13 +10,13 @@
#include "firing_timer.h"
#include "../logger.h"
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
#include <LtsUtilsCore/qpoint3d.h>
#include <QtCore/QString>
#include <QtCore/QTimer>
#include <QString>
#include <QTimer>
#include <QElapsedTimer>
#include <QtCore/QDateTime>
#include <QtCore/QDebug>
#include <QDateTime>
#include <QDebug>
#include <iostream>
#include <cmath>
@@ -27,7 +27,7 @@ namespace AreaEffectSimulation
// To be able to aesily differentiate between different instances:
#define MY_Q_FUNC_INFO "debugInfo='" << d->m_debugInfo << "' " << Q_FUNC_INFO
#define MY_LOGFUNCTION "debugInfo='" << d->m_debugInfo << "' " << Q_FUNC_INFO
static long s_counter{0};
@@ -129,21 +129,22 @@ public:
FiringTimer::FiringTimer(const QString &debugInfo)
: BaseClass(nullptr)
, d(new Private)
, m_logger(getLogger("Utils.FiringTimer"))
{
++s_counter;
d->m_debugInfo = debugInfo;
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " START, s_counter=" << s_counter << " this=" << this;
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " END, s_counter=" << s_counter << " this=" << this;
}
FiringTimer::~FiringTimer()
{
--s_counter;
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " START, s_counter=" << s_counter << " this=" << this;
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " START, s_counter=" << s_counter << " this=" << this;
QString debugInfoSave = d->m_debugInfo;
delete d;
//DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
DEBUG_LOG(m_logger) << "debugInfo='" << debugInfoSave << "'" << Q_FUNC_INFO << " END, s_counter=" << s_counter << " this=" << this;
//DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " END, s_counter=" << s_counter << " this=" << this;
DEBUG_LOG(m_logger) << "debugInfo='" << debugInfoSave << "'" << LOGFUNCTION << " END, s_counter=" << s_counter << " this=" << this;
}
void FiringTimer::setDebugInfo(const QString &debugInfo)
@@ -153,14 +154,14 @@ void FiringTimer::setDebugInfo(const QString &debugInfo)
void FiringTimer::reset()
{
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START";
d->reset();
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
}
bool FiringTimer::init(long effectDurationMsec, int ammoCount, long ammoFlightDurationMsec)
{
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START,"
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START,"
<< ", effectDurationMsec=" << effectDurationMsec
<< ", ammoCount=" << ammoCount
<< ", ammoFlightDurationMsec=" << ammoFlightDurationMsec;
@@ -170,7 +171,7 @@ bool FiringTimer::init(long effectDurationMsec, int ammoCount, long ammoFlightDu
d->m_ammoCount = ammoCount;
d->m_ammoFlightDurationMsec = ammoFlightDurationMsec;
d->m_intervallMsec = static_cast<double>(d->m_effectDurationMsec) / d->m_ammoCount; // ensure float calculation
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " m_intervallMsec " << d->m_intervallMsec;
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " m_intervallMsec " << d->m_intervallMsec;
d->m_firingTimer->stop();
d->m_firingTimer->setSingleShot(false);
@@ -178,24 +179,24 @@ bool FiringTimer::init(long effectDurationMsec, int ammoCount, long ammoFlightDu
connect(d->m_firingTimer, &QTimer::timeout,
this, &FiringTimer::onFiringTimout, Qt::UniqueConnection);
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
return true;
}
bool FiringTimer::startFiring()
{
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START";
if ((d->m_currentFiringMode != FiringMode::FM_Undefined) &&
(d->m_currentFiringMode != FiringMode::FM_Paused))
{
ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " wrong firingMode, cur = " << (int)d->m_currentFiringMode;
ERROR_LOG(m_logger) << MY_LOGFUNCTION << " wrong firingMode, cur = " << (int)d->m_currentFiringMode;
return false;
}
if (remainingAmmoCount() <= 0)
{
ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " no ammo left"
ERROR_LOG(m_logger) << MY_LOGFUNCTION << " no ammo left"
<< " (total ammoCount was: " << d->m_ammoCount
<< " cur firingMode = " << (int)d->m_currentFiringMode;
return false;
@@ -213,7 +214,7 @@ bool FiringTimer::startFiring()
#endif // SUPPORT_STATE_CHANGE_DELAYED
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " start firing with m_firedAmmoCount = " << d->m_firedAmmoCount;
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " start firing with m_firedAmmoCount = " << d->m_firedAmmoCount;
d->m_firingTimer->start();
d->m_currentFiringMode = FiringMode::FM_Active;
@@ -227,7 +228,7 @@ bool FiringTimer::startFiring()
d->m_pausedMsec += pausedElapsedMsec;
d->m_etPaused->invalidate();
}
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " start firing after [ms]: " << pausedElapsedMsec
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " start firing after [ms]: " << pausedElapsedMsec
<< ", m_activeMsec in total = " << d->m_activeMsec
<< ", m_pausedMsec in total = " << d->m_pausedMsec;
@@ -256,7 +257,7 @@ bool FiringTimer::startFiring()
// to fire at the beginning of the interval:
onFiringTimout();
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
return true;
}
@@ -270,17 +271,17 @@ bool FiringTimer::startFiringDelay(qint64 delayMsec)
bool FiringTimer::pauseFiring()
{
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START";
if (d->m_currentFiringMode != FiringMode::FM_Active)
{
ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " wrong firingMode";
ERROR_LOG(m_logger) << MY_LOGFUNCTION << " wrong firingMode";
return false;
}
if (remainingAmmoCount() <= 0)
{
ERROR_LOG(m_logger) << MY_Q_FUNC_INFO << " no ammo left"
ERROR_LOG(m_logger) << MY_LOGFUNCTION << " no ammo left"
<< " (total ammoCount was: " << d->m_ammoCount;
return false;
}
@@ -293,7 +294,7 @@ bool FiringTimer::pauseFiring()
#endif // SUPPORT_STATE_CHANGE_DELAYED
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing at m_firedAmmoCount = " << d->m_firedAmmoCount;
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " stop firing at m_firedAmmoCount = " << d->m_firedAmmoCount;
d->m_firingTimer->stop();
d->m_currentFiringMode = FiringMode::FM_Paused;
d->m_etPaused->start();
@@ -305,14 +306,14 @@ bool FiringTimer::pauseFiring()
const qint64 activeElapsedMsec = d->m_etActive->elapsed();
d->m_activeMsec += activeElapsedMsec;
d->m_etActive->invalidate();
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing after [ms]: " << activeElapsedMsec
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " stop firing after [ms]: " << activeElapsedMsec
<< ", m_activeMsec in total = " << d->m_activeMsec
<< ", m_pausedMsec in total = " << d->m_pausedMsec;
QString log = QString(QStringLiteral("pauseFiring_at_%1")).arg(QDateTime::currentMSecsSinceEpoch()) ;
d->m_logHistorie.append(log);
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
return true;
}
@@ -346,7 +347,7 @@ long FiringTimer::intervallMsec() const
#ifdef SUPPORT_STATE_CHANGE_DELAYED
void FiringTimer::emitStateChangeDelayed(AreaEffectSimulation::FiringTimer::CMD cmd, int firedAmmoCount)
{
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " SUPPORT_STATE_CHANGE_DELAYED: " << cmd
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " SUPPORT_STATE_CHANGE_DELAYED: " << cmd
<< ", firedAmmoCount = " << firedAmmoCount;
emit stateChangeDelayedAsInt(static_cast<int>(cmd), firedAmmoCount);
}
@@ -380,11 +381,11 @@ QString FiringTimer::toString(const CMD cmd)
void FiringTimer::onFiringTimout()
{
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START";
++d->m_firedAmmoCount;
INFO_LOG(m_logger) << MY_Q_FUNC_INFO << " emit firing with: " << d->m_firedAmmoCount
INFO_LOG(m_logger) << MY_LOGFUNCTION << " emit firing with: " << d->m_firedAmmoCount
<< " of total ammoCount = " << d->m_ammoCount;
emit firing(d->m_firedAmmoCount, d->m_ammoCount);
@@ -396,7 +397,7 @@ void FiringTimer::onFiringTimout()
int currentFiringNumber = d->m_firedAmmoCount;
int totalFiringNumber = d->m_ammoCount;
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " XXXXXXXXX schedule 'emit impact' " << currentFiringNumber;
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " XXXXXXXXX schedule 'emit impact' " << currentFiringNumber;
QTimer::singleShot(d->m_ammoFlightDurationMsec, this, [this, currentFiringNumber, totalFiringNumber]()
{
@@ -408,7 +409,7 @@ void FiringTimer::onFiringTimout()
}
#endif // SUPPORT_STATE_CHANGE_DELAYED
INFO_LOG(m_logger) << MY_Q_FUNC_INFO << " emit impact " << currentFiringNumber
INFO_LOG(m_logger) << MY_LOGFUNCTION << " emit impact " << currentFiringNumber
<< " of total = " << totalFiringNumber;
emit impact(currentFiringNumber, totalFiringNumber);
@@ -430,7 +431,7 @@ void FiringTimer::onFiringTimout()
if (d->m_firedAmmoCount >= d->m_ammoCount)
{
INFO_LOG(m_logger) << MY_Q_FUNC_INFO << " no ammo left, finishing firing"
INFO_LOG(m_logger) << MY_LOGFUNCTION << " no ammo left, finishing firing"
<< ", " << d->m_firedAmmoCount << " of total ammoCount = " << d->m_ammoCount << " are fired";
d->m_firingTimer->stop();
@@ -440,7 +441,7 @@ void FiringTimer::onFiringTimout()
// !! Attention: do pauseFiring() WITHIN the intervall will reduce amount of time the firing is active !!
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing after [ms]: " << activeElapsedMsec
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " stop firing after [ms]: " << activeElapsedMsec
<< ", m_activeMsec in total = " << d->m_activeMsec
<< ", m_pausedMsec in total = " << d->m_pausedMsec
<< " now FiringTimoutExpiredPlus ...";
@@ -465,12 +466,12 @@ void FiringTimer::onFiringTimout()
d->m_firingTimer->start();
}
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END" << ", m_firedAmmoCount " << d->m_firedAmmoCount;
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END" << ", m_firedAmmoCount " << d->m_firedAmmoCount;
}
void FiringTimer::onFiringTimoutExpiredPlus()
{
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " START";
d->m_currentFiringMode = FiringMode::FM_ExpiredPlus;
@@ -480,7 +481,7 @@ void FiringTimer::onFiringTimoutExpiredPlus()
// !! Attention: do pauseFiring() WITHIN the intervall will reduce amount of time the firing is active !!
DEBUG_LOG(m_logger) << MY_Q_FUNC_INFO << " stop firing2 after [ms]: " << activeElapsedMsec
DEBUG_LOG(m_logger) << MY_LOGFUNCTION << " stop firing2 after [ms]: " << activeElapsedMsec
<< ", m_activeMsec in total = " << d->m_activeMsec
<< ", m_pausedMsec in total = " << d->m_pausedMsec;
@@ -488,7 +489,7 @@ void FiringTimer::onFiringTimoutExpiredPlus()
emit firingFinishedPlus();
TRACE_LOG(m_logger) << MY_Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << MY_LOGFUNCTION << " END";
}