Cleans up only warnings and specific CMake/include path error in the Qt6 migration tree, using strictly minimal changes with minimal side effects.
This commit is contained in:
8 files changed
+18
-18
No files matched your search
@@ -22,7 +22,8 @@ DdsConnector::DdsConnector(int domainId,
|
||||
int exerciseId,
|
||||
DDS::QosProfile::ConnectionType connectionType,
|
||||
const QUrl &tcpConnectionUrl)
|
||||
: m_domainId(domainId)
|
||||
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Common.DDSConnector"))
|
||||
, m_domainId(domainId)
|
||||
, m_defaultPartitionType(defaultPartitionType)
|
||||
, m_partitionId(partitionId)
|
||||
, m_exerciseId(exerciseId)
|
||||
@@ -32,7 +33,6 @@ DdsConnector::DdsConnector(int domainId,
|
||||
, m_publisher(nullptr)
|
||||
, m_subscriber(nullptr)
|
||||
, m_wsHandler(nullptr)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Common.DDSConnector"))
|
||||
{
|
||||
initInternal();
|
||||
DEBUG_LOG(m_logger) << "DdsConnector ctor: " << m_domainId << "," << m_partitionId << "," << m_exerciseId << ","
|
||||
|
||||
@@ -23,7 +23,7 @@ void SubscriberListener::addCallback(const std::string& topicName, const std::st
|
||||
QWriteLocker l(&m_accessLock);
|
||||
if (m_bPrepareForShutdown)
|
||||
return;
|
||||
m_droCallbacks.insertMulti(std::make_pair(topicName, topicTypeName), fillData(dataReader, cb));
|
||||
m_droCallbacks.insert(std::make_pair(topicName, topicTypeName), fillData(dataReader, cb));
|
||||
}
|
||||
|
||||
void SubscriberListener::removeCallback(const std::string& topicName, const std::string& topicTypeName,
|
||||
|
||||
Reference in new issue
Block a user