torstenandCopilot
7173785915
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>
81 lines
2.2 KiB
C++
81 lines
2.2 KiB
C++
/*
|
|
* @RDE_HEADER@
|
|
* <short description>
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Malte Schröder, SLSE, 2016-06-08
|
|
*/
|
|
|
|
#include "aar_application.h"
|
|
#include <NGLLogger/INGLLogger.h>
|
|
#include <nglapplication/nglapplication.h>
|
|
#include <nglapplication/nglcoreapplication.h>
|
|
#include <ngltranslator/ngltranslator.h>
|
|
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
|
|
|
class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
|
|
{
|
|
public:
|
|
CmdLineParser()
|
|
: LtsCommandLineParser(ProvideCommandLineParameterOptions::None)
|
|
{
|
|
addOption({{QStringLiteral("l"), QStringLiteral("lang")},
|
|
QStringLiteral("Language iso code to use (de_DE, en_GB, en_US)"),
|
|
QStringLiteral("<locale iso code>")
|
|
});
|
|
}
|
|
QString langIsoCode() const { return value(QStringLiteral("l")); }
|
|
};
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int retval = -1;
|
|
bool bHeadless = false;
|
|
for (int i = 1; i < argc; ++i)
|
|
{
|
|
if (strcmp(argv[i], "-e") == 0)
|
|
{
|
|
bHeadless = true;
|
|
break;
|
|
}
|
|
}
|
|
QScopedPointer<QCoreApplication> app;
|
|
app.reset(bHeadless ? dynamic_cast<QCoreApplication*>(new NGLCoreApplication(argc, argv))
|
|
: dynamic_cast<QCoreApplication*>(new NGLApplication(argc, argv)));
|
|
QCoreApplication::setApplicationName(QLatin1String("AarApplication"));
|
|
QCoreApplication::setOrganizationName(QLatin1String("RME"));
|
|
|
|
if (!bHeadless)
|
|
app->setAttribute(Qt::AA_UseHighDpiPixmaps);
|
|
|
|
|
|
NGL::LoggerHandler *lh = dynamic_cast<NGL::LoggerHandler*>(app.data());
|
|
lh->createLogger("AarApp", "log4cxx_aarApp.props");
|
|
NGL::INGLLogger &logger = lh->baseLogger();
|
|
|
|
// Parse Options
|
|
CmdLineParser options;
|
|
if (!options.init())
|
|
return retval;
|
|
|
|
// Set Translation
|
|
QString langIsoCode = options.langIsoCode();
|
|
if (langIsoCode.isEmpty())
|
|
langIsoCode = QLocale::system().name();
|
|
NGL::setTranslationLocale(langIsoCode.toLatin1());
|
|
|
|
AARApplication::AarApplication * w = new AARApplication::AarApplication;
|
|
if (!w->init())
|
|
return -2;
|
|
|
|
STARTUP_LOG(logger);
|
|
w->show();
|
|
QGuiApplication::setQuitOnLastWindowClosed(true);
|
|
retval = QCoreApplication::exec();
|
|
|
|
SHUTDOWN_LOG(logger);
|
|
|
|
return retval;
|
|
}
|