Qt6 Migration: BUILD_RTI guards und CMake fixes
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
+1
-1
@@ -84,7 +84,7 @@ namespace SituationMap
|
||||
{
|
||||
|
||||
AdapterDds::AdapterDds(QObject *parent) : QObject(parent),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START DDDDDDDD" ;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END" ;
|
||||
}
|
||||
|
||||
+1
-1
@@ -137,7 +137,7 @@ public:
|
||||
|
||||
BuildingContamination::BuildingContamination(int drawOrder, QObject *parent) : BaseClass(parent)
|
||||
, d(new Private()),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
d->m_drawOrder = drawOrder;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
|
||||
+1
-1
@@ -213,7 +213,7 @@ public:
|
||||
|
||||
BuildingOwnership::BuildingOwnership(int drawOrder, QObject *parent) : BaseClass(parent)
|
||||
, d(new Private()),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
d->m_drawOrder = drawOrder;
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ QString toString(SpecialChargeType value)
|
||||
}
|
||||
|
||||
PdmHandler::PdmHandler(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtcPdm) : m_dtcPdm(dtcPdm),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
|
||||
void PdmHandler::initializePdm()
|
||||
|
||||
+1
-1
@@ -88,7 +88,7 @@ void ConfigureSingleMapUrl::onClose()
|
||||
|
||||
ConfigureMapUrlsWidget::ConfigureMapUrlsWidget(QWidget *parent) : QWidget(parent)
|
||||
, m_ui(new Ui::Configure_Urls_Widget),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
+1
-1
@@ -308,7 +308,7 @@ void MapObjectSelectionLtsDialog::onServiceMonitorRequestedAdd()
|
||||
|
||||
MapObjectSelectionWidget::MapObjectSelectionWidget(QWidget *parent) : BaseClass(parent)
|
||||
, m_ui(new Ui::MapObjectSelectionDialog),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
m_ui->setupUi(this);
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ namespace SituationMap
|
||||
|
||||
LayersModel::LayersModel(LtsSession::LtsSession *session, QObject *parent) : QAbstractTableModel(parent)
|
||||
, m_session(session),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
bool LayersModel::initModel(Map *situationMap)
|
||||
{
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ static inline bool isScreenIdValid(const OperatorManagement::ActiveApp &item)
|
||||
|
||||
RegisterAppHandler::RegisterAppHandler() : BaseClass()
|
||||
, m_updateTimer(new QTimer(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
INFO_LOG(m_logger) << "RAH c_tor";
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
namespace SituationMap
|
||||
{
|
||||
TerrainProfileHandler::TerrainProfileHandler(const QString &menuGroup) : m_menuGroup(menuGroup),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
TerrainProfileHandler::~TerrainProfileHandler()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user