Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,93 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Basic Item for Tracks
|
||||
* $Id: Event.h 51204 2020-05-20 15:47:37Z wille_m $
|
||||
* $HeadURL: svn://192.168.133.21/TDS/branches/product/features/hotline/Lts/Common/LtsEventTimeline/Event.h $
|
||||
* $Author: wille_m $
|
||||
* Created by Mike Wille, SLSE, 2014-10-01
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsTimeline/ltstimeline_export.h>
|
||||
|
||||
#include <QColor>
|
||||
|
||||
#include <memory>
|
||||
#include <functional> // ref wrapper
|
||||
|
||||
|
||||
class QPainter;
|
||||
class QStyleOptionViewItem;
|
||||
class QModelIndex;
|
||||
|
||||
namespace PresentationManagement
|
||||
{
|
||||
class ScriptModel;
|
||||
}
|
||||
|
||||
|
||||
namespace LtsTimeline
|
||||
{
|
||||
|
||||
class ItemDelegate;
|
||||
|
||||
|
||||
class LTSTIMELINE_EXPORT Item
|
||||
{
|
||||
friend class ItemDelegate;
|
||||
|
||||
public:
|
||||
static QString mimetype;
|
||||
static QColor s_highlightColor;
|
||||
|
||||
Item() = default;
|
||||
Item(qint64 startTime, int duration, const QColor &color, bool isEditable = true);
|
||||
Item(const Item &) = delete;
|
||||
Item &operator=(const Item &) = delete;
|
||||
Item(Item &&) noexcept = default; // why-ever my compiler doesn't auto-create the move ctor
|
||||
virtual ~Item() = default;
|
||||
|
||||
int id() const { return m_id; }
|
||||
int parentTrackId() const { return m_parentTrackId; }
|
||||
|
||||
QColor color() const { return m_color; }
|
||||
void setColor(const QColor &color) { m_color = color; }
|
||||
|
||||
qint64 startTime() const { return m_startTime; }
|
||||
[[deprecated("use model's setItemStartTime instead, needed to notify the model that it has to re-sort items")]]
|
||||
void setStartTime(qint64 startTime) { m_startTime = startTime; }
|
||||
|
||||
int duration() const { return m_duration; }
|
||||
void setDuration(int duration) { m_duration = duration; }
|
||||
|
||||
bool isEditable() const { return m_isEditable; }
|
||||
void setEditable(bool editable) { m_isEditable = editable; }
|
||||
|
||||
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index, bool highlight = false) const;
|
||||
|
||||
void _setStartTime(qint64 startTime) { m_startTime = startTime; }
|
||||
void _setDuration(int duration) { m_duration = duration; }
|
||||
|
||||
protected:
|
||||
QColor m_color;
|
||||
qint64 m_startTime { -1 };
|
||||
int m_duration { -1 };
|
||||
bool m_isEditable { false };
|
||||
|
||||
private:
|
||||
friend class TimelineModel;
|
||||
friend class PresentationManagement::ScriptModel;
|
||||
|
||||
int m_id { -1 };
|
||||
int m_parentTrackId { -1 };
|
||||
};
|
||||
|
||||
typedef std::unique_ptr<Item> ItemPtr;
|
||||
typedef std::vector<ItemPtr> Items;
|
||||
typedef std::reference_wrapper<const ItemPtr> ItemPtrRef;
|
||||
typedef std::reference_wrapper<ItemPtr> ItemPtrNCVRef;
|
||||
typedef std::vector<ItemPtrNCVRef> ItemPtrNCVRefs;
|
||||
typedef std::vector<ItemPtrRef> ItemPtrRefs;
|
||||
|
||||
} // namespace LtsTimeline
|
||||
Reference in new issue
Block a user