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
@@ -339,12 +339,12 @@ QModelIndex TimelineModel::index(int row, int column, const QModelIndex &parent)
|
||||
}
|
||||
catch (const QString &msg)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "cannot get parent track " << msg;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "cannot get parent track " << msg;
|
||||
return {};
|
||||
}
|
||||
catch (const std::out_of_range &oor)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "cannot get child track " << QString::fromUtf8(oor.what());
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "cannot get child track " << QString::fromUtf8(oor.what());
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -455,7 +455,7 @@ QModelIndex TimelineModel::parent(const QModelIndex &index) const
|
||||
}
|
||||
catch (const QString &msg)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "cannot get parent of track with id" << trackId << msg;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "cannot get parent of track with id" << trackId << msg;
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -473,13 +473,13 @@ QModelIndex TimelineModel::parent(const QModelIndex &index) const
|
||||
}
|
||||
catch (const QString &msg)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "row of track for parent not found for parent id" << parentId << "-" << msg;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "row of track for parent not found for parent id" << parentId << "-" << msg;
|
||||
return {};
|
||||
}
|
||||
}
|
||||
catch (const QString &msg)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << "super parent not found for super parent id" << superParentId << "-" << msg;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "super parent not found for super parent id" << superParentId << "-" << msg;
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -722,11 +722,11 @@ void TimelineModel::setMinimumDuration(int duration)
|
||||
{
|
||||
if (duration < 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "negative duration is not possible -> setting minimum duration to 0";
|
||||
WARNING_LOG() << "negative duration is not possible -> setting minimum duration to 0";
|
||||
duration = 0;
|
||||
}
|
||||
if (duration % 1000 && m_isSnapEnabled)
|
||||
WARNING_LOG(m_logger) << "Snapping to 1000ms enabled, yet minimum duration is not a multiple of 1000ms: " << duration;
|
||||
WARNING_LOG() << "Snapping to 1000ms enabled, yet minimum duration is not a multiple of 1000ms: " << duration;
|
||||
m_minItemDuration = duration;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user