Session 026: Lts/Services Qt5:: to Qt6:: migration
- 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:
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
+7
-7
@@ -7,13 +7,12 @@
|
||||
*/
|
||||
|
||||
#include "handler_oc_aes_data.h"
|
||||
#include <utility>
|
||||
#include <functional>
|
||||
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QByteArray>
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/qbytearray_byteaccess.h>
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtilsCore/qbytearray_byteaccess.h>
|
||||
|
||||
#include "settings.h"
|
||||
|
||||
@@ -34,6 +33,7 @@ HandlerOcAesData::HandlerOcAesData(MainHandler *mainHandler,
|
||||
, m_demandingEquipments(QMap<OcSituation::AesType, QSet<int>>())
|
||||
, m_iedPositionsToBeSend(QMap<int, GuezIedManagement::IedPosition>())
|
||||
, m_iedPositionCycleTimer(new QTimer(this))
|
||||
, m_logger(getLogger("HandlerOcAesData"))
|
||||
{}
|
||||
|
||||
HandlerOcAesData::~HandlerOcAesData()
|
||||
@@ -61,7 +61,7 @@ bool HandlerOcAesData::init()
|
||||
return false;
|
||||
}
|
||||
|
||||
for (const auto &data : std::as_const(dataVec))
|
||||
for (const auto &data : qAsConst(dataVec))
|
||||
{
|
||||
switch (data.aesTypeId)
|
||||
{
|
||||
@@ -199,7 +199,7 @@ void HandlerOcAesData::sendIedPositions()
|
||||
LtsUtils::set1Byte(OcSituation::AesType::IedPositions, data);
|
||||
LtsUtils::set1Byte(cnt, data);
|
||||
|
||||
for (const auto &pos : std::as_const(m_iedPositionsToBeSend))
|
||||
for (const auto &pos : qAsConst(m_iedPositionsToBeSend))
|
||||
{
|
||||
LtsUtils::set2Byte(m_gimDtc->ied(pos.id()).equipmentNumber(), data);
|
||||
const QPointF relCoord(m_positionConverter->relativeFromGeographic(pos.position()));
|
||||
@@ -252,7 +252,7 @@ void HandlerOcAesData::collectionTimeout(OcSituation::AesType type, const std::f
|
||||
if (m_demandingEquipments[type].size() > 5)
|
||||
sendFunction(0); // broadcast
|
||||
else
|
||||
for (int eqNumber : std::as_const(m_demandingEquipments[type]))
|
||||
for (int eqNumber : qAsConst(m_demandingEquipments[type]))
|
||||
sendFunction(eqNumber);
|
||||
|
||||
//cleanup
|
||||
|
||||
Reference in new issue
Block a user