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
@@ -169,7 +169,7 @@ void EditingModeUI::addAttributeContainer(int eventType, const QString &initialV
|
||||
EditingModeUI::EditingModeUI(DetailData *detailData, const QString &attributeType, QWidget *parent) : QWidget(parent)
|
||||
, attributeType(attributeType)
|
||||
, m_detailData(detailData),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
QVBoxLayout *editingModeLayout = new QVBoxLayout;
|
||||
|
||||
QWidget *filterTextWidget = new QWidget;
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@ QComboBox *SelectionModeUI::createAttributesComboBox(int eventType)
|
||||
|
||||
SelectionModeUI::SelectionModeUI(DetailData *detailData, const int eventType) : eventType(eventType)
|
||||
, m_detailData(detailData),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
selectionModeWidget = new QWidget();
|
||||
selectionModeLayout = new QHBoxLayout();
|
||||
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ FilterTableEntry::FilterTableEntry(DetailData *detailData, const int &eventType,
|
||||
, m_pbOK(new QPushButton(tr("OK")))
|
||||
, m_lbSelectText(new QLabel(tr("Select event type to filter:")))
|
||||
, m_detailData(detailData),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_cbEventSelector = getEventTypesComboBox();
|
||||
|
||||
m_pbDelete->setPalette(QPalette(QColor("red")));
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ FilterTableEntryAttribute::FilterTableEntryAttribute(DetailData *detailData, int
|
||||
, m_editionModeUI(nullptr)
|
||||
, m_attributesLayout(new QVBoxLayout())
|
||||
, m_detailData(detailData),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
|
||||
this->setTitle(QString());
|
||||
|
||||
|
||||
+1
-1
@@ -36,7 +36,7 @@ FilterWindow::FilterWindow(DetailData *detailData,
|
||||
, updateTimer(new QTimer(this))
|
||||
, m_detailData(detailData)
|
||||
, m_session(session),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_ui->setupUi(this);
|
||||
setMinimumSize(1500, 800);
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ namespace Timeline
|
||||
ComboBox::ComboBox(DetailData *detailData, const QString &attributeType, int eventType, const QString &initialValue, QWidget* parent) : AbstractAttributeWidget(parent)
|
||||
, m_cbValues(new QComboBox())
|
||||
, m_eventType(eventType),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(m_cbValues, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &ComboBox::signalChanges);
|
||||
|
||||
addCustomWidget(m_cbValues);
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ namespace Timeline
|
||||
DefaultRangeWidget::DefaultRangeWidget(unsigned int min, unsigned int max, const QString &prefix, const QString &suffix, const QString &initialValue, QWidget *parent) : AbstractAttributeWidget(parent)
|
||||
, box1(new QSpinBox())
|
||||
, box2(new QSpinBox()),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(box1, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &DefaultRangeWidget::signalChanges);
|
||||
connect(box2, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &DefaultRangeWidget::signalChanges);
|
||||
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ namespace Timeline
|
||||
TimeRangeWidget::TimeRangeWidget(DetailData *detailData, const QString &initialValue, QWidget *parent) : AbstractAttributeWidget(parent)
|
||||
, m_edit1(new LtsWidgets::LtsDateTimeEdit(this))
|
||||
, m_edit2(new LtsWidgets::LtsDateTimeEdit(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(m_edit1, &LtsWidgets::LtsDateTimeEdit::dateTimeChanged, this, &TimeRangeWidget::signalChanges);
|
||||
connect(m_edit2, &LtsWidgets::LtsDateTimeEdit::dateTimeChanged, this, &TimeRangeWidget::signalChanges);
|
||||
|
||||
|
||||
+1
-1
@@ -1625,7 +1625,7 @@ QVector<LtsTimelineClassic::Event *> DDSTimelineModel::createTestEvents(qint64 t
|
||||
EventRequest::EventRequest(const QUrl &url, qint64 start, qint64 end, const QSet<int> &eventTypes, int limit) : m_start(start)
|
||||
, m_end(end)
|
||||
, m_timeoutTimer(new QTimer(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
QUrl realUrl(url);
|
||||
realUrl.setPath(QStringLiteral("/request"));
|
||||
|
||||
|
||||
Reference in new issue
Block a user