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>
71 lines
1.5 KiB
C++
71 lines
1.5 KiB
C++
/**
|
|
* @RDE_HEADER@
|
|
* SimpleCommand
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Christian Fröbel, SLSE, 2017-07-11
|
|
*/
|
|
|
|
#include "simple_command.h"
|
|
#include "iava_comm.h"
|
|
#include "iava_command_done_observer.h"
|
|
#include "ivd_comm.h"
|
|
#include "ivd_command_done_observer.h"
|
|
#include <QtGlobal>
|
|
|
|
|
|
namespace AudioVideoManagement
|
|
{
|
|
|
|
namespace detail
|
|
{
|
|
|
|
template<class Comm, class DoneObserver>
|
|
SimpleCommand<Comm, DoneObserver>::SimpleCommand(const QString &commandDesc, Comm *comm, DoneObserver *observer, std::function<void (Comm *)> commandInvoker, int okCount)
|
|
: m_commandInvoker(std::move(commandInvoker))
|
|
, m_expectedOkCount(okCount)
|
|
, m_comm(comm)
|
|
, m_observer(observer)
|
|
, m_commandDesc(commandDesc)
|
|
{
|
|
Q_ASSERT(comm);
|
|
Q_ASSERT(observer);
|
|
Q_ASSERT(okCount > 0);
|
|
}
|
|
|
|
template<class Comm, class DoneObserver>
|
|
void SimpleCommand<Comm, DoneObserver>::send()
|
|
{
|
|
connect(m_comm, &Comm::ok, this, &SimpleCommand::onOk);
|
|
m_commandInvoker(m_comm);
|
|
}
|
|
|
|
template<class Comm, class DoneObserver>
|
|
void SimpleCommand<Comm, DoneObserver>::onOk()
|
|
{
|
|
Q_ASSERT(m_okCount < m_expectedOkCount);
|
|
++m_okCount;
|
|
if (m_okCount == m_expectedOkCount)
|
|
done();
|
|
}
|
|
|
|
template<class Comm, class DoneObserver>
|
|
void SimpleCommand<Comm, DoneObserver>::done()
|
|
{
|
|
m_comm->disconnect(this);
|
|
m_observer->done(this);
|
|
}
|
|
|
|
/**
|
|
* Explicit template instantiations.
|
|
*/
|
|
///@{
|
|
template class SimpleCommand<IAvaComm, IAvaCommandDoneObserver>;
|
|
template class SimpleCommand<IVdComm, IVdCommandDoneObserver>;
|
|
///@}
|
|
|
|
} // namespace detail
|
|
|
|
} // namespace AudioVideoManagement
|