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
@@ -9,10 +9,9 @@
|
||||
namespace Buildings
|
||||
{
|
||||
|
||||
class DataPlugin final : public QObject, public DataPluginBase::Plugin
|
||||
class DataPlugin final : public DataPluginBase::Plugin
|
||||
{
|
||||
Q_PLUGIN_METADATA(IID "data:3:bld")
|
||||
Q_INTERFACES(DataPluginBase::Plugin)
|
||||
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
||||
+1
-1
@@ -60,7 +60,7 @@ namespace Buildings
|
||||
BldInfoDialog::BldInfoDialog(int bldEntityId, const QString& menuGroup, QWidget* parent)
|
||||
: InfoDialogBase(bldEntityId, menuGroup, QStringLiteral("BldInfoDialog"), LtsWidgets::ButtonCombination::CloseOnly,
|
||||
parent),
|
||||
m_ui(new Ui::BldInfoDialog), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
m_ui(new Ui::BldInfoDialog), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " START" << ", bldEntityId=" << bldEntityId;
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ namespace Buildings
|
||||
|
||||
RelayInfoWidget::RelayInfoWidget(int id, QWidget* parent)
|
||||
: QWidget(parent), m_id(id), m_state(false), m_ui(new Ui::RelayInfoWidget),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "RelayInfoWidget";
|
||||
m_ui->setupUi(this);
|
||||
|
||||
Reference in new issue
Block a user