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
@@ -22,7 +22,6 @@ AvmSequenceModel::AvmSequenceModel(QObject *parent)
|
||||
tr("Volume"),
|
||||
tr("Description")},
|
||||
parent)
|
||||
, m_logger(getLogger("AvmSequenceModel"))
|
||||
{}
|
||||
|
||||
void AvmSequenceModel::setTimezoneHoursOffset(int timezoneHoursOffset)
|
||||
|
||||
-1
@@ -63,7 +63,6 @@ private:
|
||||
|
||||
QVector<int> m_highlightedRows;
|
||||
int m_timezoneHoursOffset = 0;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
class AvmSequenceProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel
|
||||
|
||||
+2
-3
@@ -62,7 +62,6 @@ TopicEditor::TopicEditor(LtsSession::LtsSession *session, const TopicEditorBase:
|
||||
, m_model(new AvmSequenceModel(this))
|
||||
, m_playbackMenu(nullptr)
|
||||
, m_ui(new Ui::AVTopicEditor)
|
||||
, m_logger(getLogger("TopicEditor"))
|
||||
{
|
||||
Q_ASSERT(session);
|
||||
|
||||
@@ -380,7 +379,7 @@ void TopicEditor::onEditSequence()
|
||||
if (!m_playbackMenu)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "slotEditSequence ";
|
||||
DEBUG_LOG() << "slotEditSequence ";
|
||||
const auto selRows = m_ui->tvSequences->selectionModel()->selectedRows();
|
||||
|
||||
if (selRows.size() != 1)
|
||||
@@ -393,7 +392,7 @@ void TopicEditor::onEditSequence()
|
||||
m_model->setHighlightedRow(row);
|
||||
const AvsSequence selectedSeq = m_model->getRowData(row);
|
||||
|
||||
DEBUG_LOG(m_logger) << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName;
|
||||
DEBUG_LOG() << "selectedSeq.internalStreamName=" << selectedSeq.internalStreamName;
|
||||
m_playbackMenu->setStreamName(selectedSeq.internalStreamName);
|
||||
|
||||
m_ui->dtStart->setMsecsSinceEpoch(std::chrono::milliseconds(selectedSeq.start.time_since_epoch()).count());
|
||||
|
||||
-1
@@ -67,7 +67,6 @@ private:
|
||||
QString m_topicStreamName;
|
||||
|
||||
Ui::AVTopicEditor *m_ui{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user