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:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+2
-2
@@ -70,10 +70,10 @@ void SaveAsSymbol::onInputChanged(const QString &input)
|
||||
|
||||
void SaveAsSymbol::onFileContentChanged(const FileManagement::FileContent &data, DataModification modType)
|
||||
{
|
||||
if (data.fileType() != FileManagement::FileType::OperatorDefinedSymbol)
|
||||
if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
|
||||
return;
|
||||
|
||||
QString name = QString::fromStdString(data.name());
|
||||
QString name = QString::fromStdString(data.name);
|
||||
|
||||
if (modType == DataModification::eRemoved)
|
||||
m_takenNames.removeAll(name);
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ class SelectTextDialog final : public LtsWidgets::LtsFramelessDialog
|
||||
~SelectTextDialog();
|
||||
|
||||
protected:
|
||||
NGL::INGLLogger& m_logger;
|
||||
//NGL::INGLLogger& m_logger; // unused (legacy: commented out)
|
||||
Ui_SelectTextDialog* ui;
|
||||
|
||||
private:
|
||||
|
||||
+13
-17
@@ -125,7 +125,7 @@ SymbolEditor::SymbolEditor(LtsSession::LtsSession *session, QWidget *parent)
|
||||
: LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
|
||||
, m_ui(new Ui::SymbolEditor)
|
||||
, m_session(session)
|
||||
.getNGLLogger("SymbolEditor"))
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("SymbolEditor"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "SymbolEditor(" << "parent=" << parent << ")";
|
||||
m_ui->setupUi(this);
|
||||
@@ -227,9 +227,9 @@ bool SymbolEditor::init(const std::shared_ptr<FileManagement::Interface::Ftc>& f
|
||||
m_internal->m_symbolColorsPreview.clear();
|
||||
m_internal->m_ppmDtc->partys([this](const ParticipantManagement::Party& data) {
|
||||
m_internal->m_symbolColorsPreview.append(
|
||||
{ParticipantManagement::trPartyName(data.name()), QColor::fromRgb(data.color())});
|
||||
m_internal->m_symbolColorsPreview.append({tr("%1 (faded)").arg(ParticipantManagement::trPartyName(data.name())),
|
||||
QColor::fromRgb(data.fadingColor())});
|
||||
{ParticipantManagement::trPartyName(data.name), QColor::fromRgb(data.color)});
|
||||
m_internal->m_symbolColorsPreview.append({tr("%1 (faded)").arg(ParticipantManagement::trPartyName(data.name)),
|
||||
QColor::fromRgb(data.fadingColor)});
|
||||
});
|
||||
|
||||
m_internal->m_toolButtonGroup.addButton(m_ui->ToolButtonRect);
|
||||
@@ -812,11 +812,9 @@ void SymbolEditor::updateSymbolAttributesWidgets()
|
||||
m_ui->ListViewMisc->clearSelection();
|
||||
m_ui->ListViewTruppengattung->clearSelection();
|
||||
|
||||
QLinkedList<SymbologyXML::Primitive*> primitives = m_internal->m_symbol.getPrimitives();
|
||||
QLinkedListIterator<SymbologyXML::Primitive*> pi(primitives);
|
||||
while (pi.hasNext())
|
||||
auto primitives = m_internal->m_symbol.getPrimitives();
|
||||
for (auto* prim : primitives)
|
||||
{
|
||||
SymbologyXML::Primitive* prim = pi.next();
|
||||
int iconId = prim->icon();
|
||||
SymbologyXML::SymbolTypes::t_icon_type iconType = prim->iconType();
|
||||
SymbologyXML::SymbolTypes::t_sector_position sectorPosition = prim->position();
|
||||
@@ -1445,7 +1443,7 @@ void SymbolEditor::slotImportTemplate()
|
||||
else
|
||||
{
|
||||
FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
|
||||
QString symbolName = QString::fromStdString(fc.name());
|
||||
QString symbolName = QString::fromStdString(fc.name);
|
||||
SymbologyXML::SymbolReader sr;
|
||||
pushUndo();
|
||||
sr.read(content, m_internal->m_symbol);
|
||||
@@ -1453,7 +1451,7 @@ void SymbolEditor::slotImportTemplate()
|
||||
|
||||
m_internal->m_lastFileId = fileId;
|
||||
m_internal->m_lastFileName = symbolName;
|
||||
m_internal->m_lastFolderId = fc.folderId();
|
||||
m_internal->m_lastFolderId = fc.folderId;
|
||||
|
||||
updateGUI();
|
||||
__unchange__();
|
||||
@@ -1850,7 +1848,7 @@ void SymbolEditor::onToolButtonTextClicked()
|
||||
|
||||
void SymbolEditor::resetToolButtonGroupState()
|
||||
{
|
||||
m_ui->ToolButtonSelect->animateClick(1);
|
||||
m_ui->ToolButtonSelect->animateClick();
|
||||
}
|
||||
|
||||
void SymbolEditor::onPushButtonFillColorClicked()
|
||||
@@ -1934,11 +1932,9 @@ void SymbolEditor::copyElementsFromSymbol(const SymbologyXML::Symbol& tmpSymbol)
|
||||
m_internal->m_symbol.addBranch((SymbologyXML::SymbolTypes::t_branch)idx);
|
||||
}
|
||||
|
||||
QLinkedList<SymbologyXML::Primitive*> prims = tmpSymbol.getPrimitives();
|
||||
QLinkedListIterator<SymbologyXML::Primitive*> pi(prims);
|
||||
while (pi.hasNext())
|
||||
auto prims = tmpSymbol.getPrimitives();
|
||||
for (auto* prim : prims)
|
||||
{
|
||||
SymbologyXML::Primitive* prim = pi.next();
|
||||
if ((prim->type() == SymbologyXML::Primitive::ICON) &&
|
||||
m_internal->m_symbol.containsPrimitive(prim->iconType(), prim->position(), prim->icon()))
|
||||
continue;
|
||||
@@ -3016,8 +3012,8 @@ bool SymbolEditor::writeFile(bool saveAsNew)
|
||||
DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
|
||||
m_internal->m_lastFileId = fileId;
|
||||
FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
|
||||
m_internal->m_lastFolderId = fc.folderId();
|
||||
const QString fileName = QString::fromStdString(fc.name());
|
||||
m_internal->m_lastFolderId = fc.folderId;
|
||||
const QString fileName = QString::fromStdString(fc.name);
|
||||
m_internal->m_lastFileName = fileName;
|
||||
m_internal->m_symbol.setName(fileName);
|
||||
bRet = true;
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <SymbologyXML/symbol_types.h>
|
||||
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <AdvancedSymbology/asb_gui_plugin_interface.h>
|
||||
#include <flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
|
||||
|
||||
+2
-2
@@ -27,8 +27,8 @@ void FileManagementReplyHandler::requestReply(const Core::FunctionReplyObject &r
|
||||
|
||||
void FileManagementReplyHandler::onGetFileContentDataReply(const FileManagement::GetFileContentDataReply &replyObject)
|
||||
{
|
||||
m_content = replyObject.content();
|
||||
m_id = replyObject.id();
|
||||
m_content = replyObject.content;
|
||||
m_id = replyObject.id;
|
||||
m_requestHelper->requestReply(replyObject);
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -318,7 +318,7 @@
|
||||
<enum>Qt::ScrollBarAsNeeded</enum>
|
||||
</property>
|
||||
<property name="renderHints">
|
||||
<set>QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
|
||||
<set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -576,7 +576,7 @@
|
||||
<enum>Qt::ScrollBarAlwaysOff</enum>
|
||||
</property>
|
||||
<property name="renderHints">
|
||||
<set>QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
|
||||
<set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
Reference in new issue
Block a user