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
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QColor>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QPushButton>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "timeline_header_view_mouse_handler.h"
|
||||
#include "timeline_utils.h"
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QHeaderView>
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QPoint>
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "item.h"
|
||||
#include "track.h"
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QAbstractItemModel>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
@@ -241,8 +241,6 @@ protected:
|
||||
|
||||
std::map<int , Item *> m_itemCache;
|
||||
Items m_clipboard;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QString>
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ void TimelineView::setHeader(QHeaderView *header)
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "header view should be of type TimelineHeaderView";
|
||||
ERROR_LOG() << "header view should be of type TimelineHeaderView";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,7 +125,7 @@ void TimelineView::setItemDelegate(QAbstractItemDelegate *delegate)
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "item delegate for TimelineView must be derived from ItemDelegate";
|
||||
ERROR_LOG() << "item delegate for TimelineView must be derived from ItemDelegate";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "timeline_header_view.h"
|
||||
#include "timeline_model.h"
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <functional>
|
||||
|
||||
@@ -168,9 +168,6 @@ private:
|
||||
QPoint m_cursorPosition;
|
||||
|
||||
QVector<int> m_selectedItemIds;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "timeline_view.h"
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QPoint>
|
||||
#include <QVector>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QMouseEvent>
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "timeline_view.h"
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QRect>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QMouseEvent>
|
||||
#include <QModelIndex>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include "timeline_utils.h"
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
#include <QWidget>
|
||||
@@ -108,8 +108,6 @@ signals:
|
||||
|
||||
private:
|
||||
Ui::Timeline *m_ui{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "item.h"
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
#include "ltstimeline_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QSet>
|
||||
|
||||
Reference in new issue
Block a user