Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+1
-4
@@ -6,7 +6,7 @@
|
||||
|
||||
#include "Event.h"
|
||||
#include "Item.h"
|
||||
#include <LtsTimelineClassic/ltstimelineclassic_export.h>
|
||||
#include "ltstimelineclassic_export.h"
|
||||
|
||||
#include <QAbstractItemModel>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
@@ -45,9 +45,6 @@ public:
|
||||
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsTimelineClassic/ltstimelineclassic_export.h>
|
||||
#include "ltstimelineclassic_export.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QJsonObject>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include "EventList.h"
|
||||
#include "Event.h"
|
||||
#include <LtsTimelineClassic/ltstimelineclassic_export.h>
|
||||
#include "ltstimelineclassic_export.h"
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "EventList.h"
|
||||
|
||||
#include <LtsTimelineClassic/ltstimelineclassic_export.h>
|
||||
#include "ltstimelineclassic_export.h"
|
||||
#include <QRect>
|
||||
|
||||
#include <time.h>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsTimelineClassic/ltstimelineclassic_export.h>
|
||||
#include "ltstimelineclassic_export.h"
|
||||
#include "EventList.h"
|
||||
#include "PassiveEventContainer.h"
|
||||
|
||||
|
||||
@@ -380,7 +380,7 @@ void TimelineIndicator::refreshData()
|
||||
|
||||
if (steps > 60000 || steps < 1)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "More than 60000 ("<<steps<<") or less than 1 lines to draw. Loop will exit after 60000 lines.";
|
||||
ERROR_LOG() << "More than 60000 ("<<steps<<") or less than 1 lines to draw. Loop will exit after 60000 lines.";
|
||||
}
|
||||
|
||||
if (steps < 1)
|
||||
@@ -474,7 +474,7 @@ void TimelineIndicator::paintEvent(QPaintEvent *)
|
||||
DTG::toStringMSec(time, DTG::Short));
|
||||
|
||||
#ifdef VERBOSE
|
||||
WARNING_LOG(m_logger) << "paintEvent: actual drawing position: x=" << centeredPos << " y=" << textY;
|
||||
WARNING_LOG() << "paintEvent: actual drawing position: x=" << centeredPos << " y=" << textY;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -54,8 +54,6 @@ private:
|
||||
LineMap m_lineMap;
|
||||
int m_sectionPos;
|
||||
int m_sectionSize;
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ void TimelineWidget::knownRangesChanged(const QVector<Range> &newRanges)
|
||||
EventDelegate *ed = qobject_cast<EventDelegate *>(m_timelineUi->view->itemDelegate());
|
||||
if (ed == nullptr)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "ed == nullptr";
|
||||
WARNING_LOG() << "ed == nullptr";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
|
||||
#include <LtsTimelineClassic/ltstimelineclassic_export.h>
|
||||
#include "ltstimelineclassic_export.h"
|
||||
|
||||
#include "Range.h"
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
@@ -60,8 +60,6 @@ private:
|
||||
void setTimelineRange(qint64 min, qint64 max);
|
||||
|
||||
void refreshData();
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
Ui::Timeline *m_timelineUi;
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user