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,127 @@
|
||||
/**
|
||||
* Settings for BuildingControlUnit
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#include "settings.h"
|
||||
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtCore/QVariant>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
|
||||
namespace BuildingControlUnit
|
||||
{
|
||||
class NGLSettingsClass : public NGL::Settings
|
||||
{
|
||||
public:
|
||||
NGLSettingsClass()
|
||||
: NGL::Settings(s_iniFile.isEmpty() ? NGL::findProjectConfigFile() : s_iniFile)
|
||||
{}
|
||||
static void setIniFile(const QString &fn)
|
||||
{
|
||||
s_iniFile = fn;
|
||||
}
|
||||
static QString s_iniFile;
|
||||
};
|
||||
QString NGLSettingsClass::s_iniFile;
|
||||
Q_GLOBAL_STATIC(NGLSettingsClass, s)
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void Settings::setIniFile(const QString &ini)
|
||||
{
|
||||
NGLSettingsClass::setIniFile(ini);
|
||||
}
|
||||
|
||||
static const int s_defVolume = 100;
|
||||
int Settings::fireThreshold()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/fireThreshold"), 70).toInt();
|
||||
}
|
||||
|
||||
bool Settings::useHttpQueue()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/useHttpQueue"), true).toBool();
|
||||
}
|
||||
|
||||
int Settings::killThreshold()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/killThreshold"), 80).toInt();
|
||||
}
|
||||
|
||||
int Settings::effectSoundIdEccActivate()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/effectSoundIdEccActivate"), 0).toInt();
|
||||
}
|
||||
|
||||
int Settings::effectSoundIdEccDestroy()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/effectSoundIdEccDestroy"), 1).toInt();
|
||||
}
|
||||
|
||||
int Settings::hitSoundVolume()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/hitSoundVolume"), s_defVolume).toInt();
|
||||
}
|
||||
|
||||
int Settings::activationSoundId()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/activationSoundId"), 0).toInt();
|
||||
}
|
||||
|
||||
int Settings::activationSoundVolume()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/activationSoundVolume"), s_defVolume).toInt();
|
||||
}
|
||||
|
||||
int Settings::fireSoundId()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/fireSoundId"), 4).toInt();
|
||||
}
|
||||
|
||||
int Settings::fireSoundVolume()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/fireSoundVolume"), s_defVolume).toInt();
|
||||
}
|
||||
|
||||
QString Settings::fireSoundCategory()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/fireSoundCategory"), QStringLiteral("Inside_buildings")).toString();
|
||||
}
|
||||
|
||||
int Settings::minimumRemainEffectThreshold()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/minimumRemainEffectThreshold"), 10).toInt();
|
||||
}
|
||||
|
||||
double Settings::transitionMultiplier()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/transitionMultiplier"), 3.0).toDouble();
|
||||
}
|
||||
|
||||
int Settings::numberOfFlashes() // 0 .. 254 Number of flashes (oder Gruppen) 0 - 245; 255 = unendlich wiederholen
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/numberOfFlashes"), 10).toInt();
|
||||
}
|
||||
int Settings::pauseDuration() // Zeitdauer der Pause zwischen 2 flashes (oder Gruppen) 1..10 in Sekunden
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/pauseDuration"), 1).toInt();
|
||||
}
|
||||
int Settings::choppedConfiguration() // 0..1 no chopped flash; 2 .. 20 Zahl der Single flash Pulse innerhalb einer Gruppe
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/choppedConfiguration"), 10).toInt();
|
||||
}
|
||||
int Settings::flashDuration()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/flashDuration"), 30).toInt();
|
||||
}
|
||||
|
||||
int Settings::laserRangeCode()
|
||||
{
|
||||
return s()->settings()->value(QStringLiteral("BuildingControlUnit/laserRangeCode"), 2178).toInt();
|
||||
}
|
||||
|
||||
} // namespace BuildingControlUnit
|
||||
Reference in new issue
Block a user