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
+4
-5
@@ -6,11 +6,10 @@
|
||||
*/
|
||||
|
||||
#include "object_danger_area.h"
|
||||
#include <utility>
|
||||
#include "special_area_provider.h"
|
||||
|
||||
#include "Utils/polygons.h"
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTimer>
|
||||
|
||||
#include "handler_bccontamination.h"
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
@@ -131,7 +130,7 @@ Core::FunctionReplyObject ObjectDangerArea::updateObject(const Database::AesDang
|
||||
for (size_t i = 0; i < segments.size(); ++i)
|
||||
tmpSegments[i].position = QPointF(segments[i].lon(), segments[i].lat());
|
||||
|
||||
for (const Database::AesDangerSegment &segment : std::as_const(tmpSegments))
|
||||
for (const Database::AesDangerSegment &segment : qAsConst(tmpSegments))
|
||||
{
|
||||
if (!m_mainHandler->db()->update(segment))
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AesDangerSegment-data in database."));
|
||||
@@ -242,7 +241,7 @@ void ObjectDangerArea::removeTopics()
|
||||
auto dts = m_mainHandler->dds()->dts();
|
||||
dts->removeDangerAreaByKey(m_data.id);
|
||||
dts->removeAesItemViewByKey(1000 * m_data.id + AesType::inner_enum::AtDangerArea);
|
||||
for (int idx : std::as_const(m_correlatedAesItems))
|
||||
for (int idx : qAsConst(m_correlatedAesItems))
|
||||
dts->removeDangerAreaCorrelatedAesItemByKey(idForCorrelatedItem(idx));
|
||||
m_correlatedAesItems.clear();
|
||||
emit removeAiv(m_data.id);
|
||||
@@ -255,7 +254,7 @@ void ObjectDangerArea::onUpdateCorrelation()
|
||||
// If Danger Area is not active, remove correlations and return
|
||||
if (effectState() != AesEffectState::EsActivated)
|
||||
{
|
||||
for(int oldItem : std::as_const(m_correlatedAesItems))
|
||||
for(int oldItem : qAsConst(m_correlatedAesItems))
|
||||
m_mainHandler->dds()->dts()->removeDangerAreaCorrelatedAesItemByKey(idForCorrelatedItem(oldItem));
|
||||
m_correlatedAesItems.clear();
|
||||
return;
|
||||
|
||||
Reference in new issue
Block a user