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
@@ -18,9 +18,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#if BUILD_RTI
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#endif
|
||||
|
||||
|
||||
namespace AudioVideoManagement
|
||||
@@ -28,6 +26,7 @@ namespace AudioVideoManagement
|
||||
|
||||
DdsHandler::DdsHandler(int domainId)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Any))
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
@@ -40,7 +39,6 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
return false;
|
||||
}
|
||||
|
||||
#if BUILD_RTI
|
||||
// default initialize Publisher and Subscriber
|
||||
m_ddsConnector->initPublisherSubscriber();
|
||||
// no batched writer possible until frequency set data is no longer that big (currently 1800rows)
|
||||
@@ -60,9 +58,6 @@ bool DdsHandler::init(const QStringList &qosFileList)
|
||||
bRet &= m_fts->enableAll();
|
||||
|
||||
return bRet;
|
||||
#else
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool DdsHandler::enableDtcClients()
|
||||
@@ -70,7 +65,6 @@ bool DdsHandler::enableDtcClients()
|
||||
Q_ASSERT(m_exmDtc);
|
||||
Q_ASSERT(m_ismDtc);
|
||||
Q_ASSERT(m_asmDtc);
|
||||
#if BUILD_RTI
|
||||
bool status = m_exmDtc->enableExercise() &&
|
||||
m_ismDtc->enableInstrumentationAsset() &&
|
||||
m_ismDtc->enableMainStructureElement() &&
|
||||
@@ -79,16 +73,11 @@ bool DdsHandler::enableDtcClients()
|
||||
Q_ASSERT(status);
|
||||
|
||||
return status;
|
||||
#else
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
|
||||
#if BUILD_RTI
|
||||
dds::domain::DomainParticipant DdsHandler::domainParticipant() const
|
||||
{
|
||||
return m_ddsConnector->getDomainParticipant();
|
||||
}
|
||||
#endif
|
||||
|
||||
} // Namespace AudioVideoManagement
|
||||
Reference in new issue
Block a user