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,102 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* PlaybackApp
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Fröbel, NLSE, 2018-04-18
|
||||
*/
|
||||
|
||||
#include "playback_app.h"
|
||||
#include "avs_app.h"
|
||||
|
||||
#include <AudioVideoManagement/avs_dialog.h>
|
||||
#include <QtGlobal>
|
||||
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
PlaybackApp::PlaybackApp(const QString &dialogId, AvaControl *avaControl, AppType appType)
|
||||
: m_dialogId(dialogId)
|
||||
, m_autoHide(appType == AppType::AutoHide)
|
||||
{
|
||||
if (appType != AppType::AlwaysHidden)
|
||||
{
|
||||
m_app.reset(new AvsApp(m_dialogId, avaControl));
|
||||
m_objectWrapper = new ObjectWrapper(nullptr);
|
||||
QObject::connect(m_app.get(), &AvsApp::signalVisible,
|
||||
m_objectWrapper, &ObjectWrapper::signalVisible);
|
||||
QObject::connect(m_app.get(), &AvsApp::signalPause,
|
||||
m_objectWrapper, &ObjectWrapper::signalPause);
|
||||
QObject::connect(m_app.get(), &AvsApp::signalResume,
|
||||
m_objectWrapper, &ObjectWrapper::signalResume);
|
||||
}
|
||||
}
|
||||
|
||||
PlaybackApp::~PlaybackApp()
|
||||
{
|
||||
if (m_objectWrapper)
|
||||
m_objectWrapper->deleteLater();
|
||||
}
|
||||
|
||||
void PlaybackApp::acquire()
|
||||
{
|
||||
Q_ASSERT(!m_inUse);
|
||||
if (m_app)
|
||||
m_app->show();
|
||||
m_inUse = true;
|
||||
}
|
||||
|
||||
void PlaybackApp::setGeometry(const QRect &geometry)
|
||||
{
|
||||
Q_ASSERT(m_app);
|
||||
m_app->show(geometry);
|
||||
}
|
||||
|
||||
void PlaybackApp::acquire(const QRect &geometry)
|
||||
{
|
||||
Q_ASSERT(!m_inUse);
|
||||
setGeometry(geometry);
|
||||
m_inUse = true;
|
||||
}
|
||||
|
||||
void PlaybackApp::release()
|
||||
{
|
||||
Q_ASSERT(m_inUse);
|
||||
|
||||
// Hint: when m_autoHide == true, m_app is set.
|
||||
// Otherwise (appType == Normal or AlwaysHidden) m_app might not be set (when appType == AlwaysHidden).
|
||||
if (m_autoHide)
|
||||
m_app->hide(true /* and close */); // implicitly releases all streams
|
||||
else if (m_app)
|
||||
m_app->releaseStreams();
|
||||
m_inUse = false;
|
||||
}
|
||||
|
||||
void PlaybackApp::hide(bool andClose)
|
||||
{
|
||||
Q_ASSERT(m_inUse);
|
||||
|
||||
if (m_app)
|
||||
m_app->hide(andClose);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// PlaybackAppHandle
|
||||
PlaybackAppHandle::PlaybackAppHandle(PlaybackApp *app)
|
||||
: m_app(app, [] (PlaybackApp *app_) { app_->release(); })
|
||||
{
|
||||
Q_ASSERT(app);
|
||||
app->acquire();
|
||||
}
|
||||
|
||||
PlaybackAppHandle::PlaybackAppHandle(PlaybackApp *app, const QRect &geometry)
|
||||
: m_app(app, [] (PlaybackApp *app_) { app_->release(); })
|
||||
{
|
||||
Q_ASSERT(app);
|
||||
app->acquire(geometry);
|
||||
}
|
||||
|
||||
} // namespace AudioVideoManagement
|
||||
Reference in new issue
Block a user