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,82 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Download a PDF file from the server
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Hannes Fritsche, NLE, 2019-04-29
|
||||
*/
|
||||
|
||||
#include "pdf_download.h"
|
||||
|
||||
#include "main_handler.h"
|
||||
|
||||
#include <tcpserver/tcpserver.h>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
|
||||
CBI_PdfDownload::CBI_PdfDownload(unsigned short port)
|
||||
: CommandInterface(port, "PDF_DOWNLOAD")
|
||||
, m_logger(getLogger("PdfDownload"))
|
||||
{}
|
||||
|
||||
void CBI_PdfDownload::handleCommandInternal(const QVector<QByteArray> &args)
|
||||
{
|
||||
setAutoWriteEOL(false);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Got command for PDF download";
|
||||
|
||||
if (args.count() != 1)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Invalid arg count";
|
||||
return;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Argument count ok";
|
||||
|
||||
bool bOk;
|
||||
int documentId = args.at(0).toInt(&bOk);
|
||||
|
||||
if (!bOk)
|
||||
{
|
||||
const QString err(QStringLiteral("Invalid file id: '%1'").arg(QString::fromUtf8(args.at(0))));
|
||||
writeError(err);
|
||||
ERROR_LOG(m_logger) << err;
|
||||
return;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Argument ok";
|
||||
|
||||
MainHandler *mainHandler = static_cast<MainHandler *>(TcpServer::instance(port())->userData());
|
||||
|
||||
Database::FlmFileContent fileContent;
|
||||
mainHandler->db()->selectFlmFileContent(documentId, fileContent);
|
||||
|
||||
if (fileContent.id < 1)
|
||||
{
|
||||
const QString err(QStringLiteral("File with ID '%1' does not exist").arg(QString::fromUtf8(args.at(0))));
|
||||
writeError(err);
|
||||
ERROR_LOG(m_logger) << err;
|
||||
return;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "File ID valid";
|
||||
|
||||
if (fileContent.fileTypeId != FileManagement::FileType::Pdf)
|
||||
{
|
||||
const QString err(QStringLiteral("File with ID '%1' is not of type Pdf").arg(QString::fromUtf8(args.at(0))));
|
||||
writeError(err);
|
||||
ERROR_LOG(m_logger) << err;
|
||||
return;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "FileType valid";
|
||||
|
||||
// success
|
||||
DEBUG_LOG(m_logger) << "File ok, sending file \"" << fileContent.name << "\" with ID " << fileContent.id;
|
||||
writeData(fileContent.content);
|
||||
}
|
||||
|
||||
QString CBI_PdfDownload::help() const
|
||||
{
|
||||
return QLatin1String("PDF_DOWNLOAD <fileId> ");
|
||||
}
|
||||
|
||||
} // namespace FileManagement
|
||||
Reference in new issue
Block a user