Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
+29
-29
@@ -90,18 +90,18 @@ bool ServiceManagementDialog::init(const std::shared_ptr<ServiceManagement::Inte
|
||||
{
|
||||
// now that all services of that group are represented by a widget, create the group widget which adds all service widgets
|
||||
//const int id = gi.id();
|
||||
const int server = gi.domainId();
|
||||
const int exercise = gi.exercisePartitionId();
|
||||
const int32_t replayPartitionId = gi.replayPartitionId();
|
||||
const QString groupName = groupEnumToGroupName(gi.type()); // QLatin1String("Group Name"); // TODO: get real group name
|
||||
long long timestamp = gi.timestamp();
|
||||
const int server = gi.domainId;
|
||||
const int exercise = gi.exercisePartitionId;
|
||||
const int32_t replayPartitionId = gi.replayPartitionId;
|
||||
const QString groupName = groupEnumToGroupName(gi.type); // QLatin1String("Group Name"); // TODO: get real group name
|
||||
long long timestamp = gi.timestamp;
|
||||
|
||||
servicesList.clear();
|
||||
servicesList.reserve(gi.services().size());
|
||||
for (auto service : gi.services())
|
||||
servicesList.reserve(gi.services.size());
|
||||
for (auto service : gi.services)
|
||||
servicesList.append(service);
|
||||
|
||||
addGroup(gi.type(), server, exercise, replayPartitionId, groupName, timestamp, servicesList);
|
||||
addGroup(gi.type, server, exercise, replayPartitionId, groupName, timestamp, servicesList);
|
||||
}
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@ GroupWidget *ServiceManagementDialog::addGroup(const Core::ServiceGroupType &gro
|
||||
{
|
||||
//qWarning() << "ServiceManagementDialog::addGroup: needed services:" << servicesList;
|
||||
|
||||
QString exName = QString::fromStdString(m_dtcExm.get()->exercise(exercise).name());
|
||||
QString exName = QString::fromStdString(m_dtcExm.get()->exercise(exercise).name);
|
||||
GroupWidget *group = new GroupWidget(groupType, server, exercise, replayPartitionId, exName, timestamp, servicesList); // memleak!
|
||||
|
||||
QString groupObjectName = craftGroupName(server, exercise, groupName);
|
||||
@@ -205,11 +205,11 @@ void ServiceManagementDialog::slotGroupInformationChanged(ServiceManagement::Gro
|
||||
//qWarning() << "slotGroupInformationChanged";
|
||||
|
||||
// find group
|
||||
int server = info.domainId();
|
||||
int exercise = info.exercisePartitionId();
|
||||
int32_t replayPartitionId = info.replayPartitionId();
|
||||
QString groupName = groupEnumToGroupName(info.type());
|
||||
long long timestamp = info.timestamp();
|
||||
int server = info.domainId;
|
||||
int exercise = info.exercisePartitionId;
|
||||
int32_t replayPartitionId = info.replayPartitionId;
|
||||
QString groupName = groupEnumToGroupName(info.type);
|
||||
long long timestamp = info.timestamp;
|
||||
|
||||
QString findGroupName = craftGroupName(server, exercise, groupName);
|
||||
|
||||
@@ -220,12 +220,12 @@ void ServiceManagementDialog::slotGroupInformationChanged(ServiceManagement::Gro
|
||||
//qWarning() << "slotGroupInformationChanged: group not found, adding it";
|
||||
|
||||
QVector<int> servicesList;
|
||||
servicesList.reserve(info.services().size());
|
||||
for (auto service : info.services())
|
||||
servicesList.reserve(info.services.size());
|
||||
for (auto service : info.services)
|
||||
servicesList << service;
|
||||
|
||||
m_ui->lbNoServices->hide();
|
||||
addGroup(info.type(), server, exercise, replayPartitionId, groupName, timestamp, servicesList);
|
||||
addGroup(info.type, server, exercise, replayPartitionId, groupName, timestamp, servicesList);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -238,7 +238,7 @@ void ServiceManagementDialog::slotGroupInformationChanged(ServiceManagement::Gro
|
||||
|
||||
m_ui->lbNoServices->hide(); // added/modified = there are groups, which show services
|
||||
|
||||
gw->setType(info.type());
|
||||
gw->setType(info.type);
|
||||
gw->setServer(server);
|
||||
gw->setExercise(exercise);
|
||||
gw->setTimestamp(timestamp);
|
||||
@@ -262,11 +262,11 @@ void ServiceManagementDialog::slotGroupInformationChanged(ServiceManagement::Gro
|
||||
|
||||
void ServiceManagementDialog::addService(const ServiceManagement::ServiceInformation &svc)
|
||||
{
|
||||
const int id = svc.id();
|
||||
const long long pid = svc.pid();
|
||||
const QString name(QString::fromStdString(svc.name()));
|
||||
const Core::RunningState &state = svc.state();
|
||||
const QString errorString(QString::fromStdString(svc.errorString()));
|
||||
const int id = svc.id;
|
||||
const long long pid = svc.pid;
|
||||
const QString name(QString::fromStdString(svc.name));
|
||||
const Core::RunningState &state = svc.state;
|
||||
const QString errorString(QString::fromStdString(svc.errorString));
|
||||
|
||||
ServiceWidget *service = new ServiceWidget(id, pid, name, state, errorString);
|
||||
service->setObjectName(QLatin1String("service.") + QString::number(id));
|
||||
@@ -286,12 +286,12 @@ void ServiceManagementDialog::slotServiceInformationChanged(ServiceManagement::S
|
||||
|
||||
// find services (because ONE service can be in MANY groups)
|
||||
|
||||
int32_t serviceId = info.id();
|
||||
QString errorString = QString::fromStdString(info.errorString());
|
||||
QString serviceName = QString::fromStdString(info.name());
|
||||
long long pid = info.pid();
|
||||
const Core::RunningState &state = info.state();
|
||||
long long timestamp = info.timestamp();
|
||||
int32_t serviceId = info.id;
|
||||
QString errorString = QString::fromStdString(info.errorString);
|
||||
QString serviceName = QString::fromStdString(info.name);
|
||||
long long pid = info.pid;
|
||||
const Core::RunningState &state = info.state;
|
||||
long long timestamp = info.timestamp;
|
||||
|
||||
QString findServiceName = QLatin1String("service.") + QString::number(serviceId);
|
||||
|
||||
|
||||
Reference in new issue
Block a user