Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+5
-6
@@ -26,7 +26,6 @@ NotificationManagementDialog::NotificationManagementDialog(LtsSession::LtsSessio
|
||||
, m_session(session)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("NotificationManagementDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->widget->setSelectionMode(QAbstractItemView::ExtendedSelection);
|
||||
@@ -108,7 +107,7 @@ void NotificationManagementDialog::onAcknowledgeNotification()
|
||||
m_requestHelper->startSingleRequest(
|
||||
[&]()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "m_ftc->readReceipt ";
|
||||
DEBUG_LOG() << "m_ftc->readReceipt ";
|
||||
return m_ftc->readReceiptRequest(request, this);
|
||||
});
|
||||
}
|
||||
@@ -163,7 +162,7 @@ void NotificationManagementDialog::onRemoveNotification()
|
||||
m_requestHelper->startSingleRequest(
|
||||
[&]()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "m_ftc->readReceipt ";
|
||||
DEBUG_LOG() << "m_ftc->readReceipt ";
|
||||
return m_ftc->deleteMessageRequest(request, this);
|
||||
});
|
||||
}
|
||||
@@ -188,7 +187,7 @@ void NotificationManagementDialog::onShowNotificationContent()
|
||||
QString content = QCoreApplication::translate("Notification", noti.content().c_str());
|
||||
|
||||
NomNotification notiDDS = m_dtc->nomNotification(noti.id());
|
||||
DEBUG_LOG(m_logger) << "onShowNotificationContent"
|
||||
DEBUG_LOG() << "onShowNotificationContent"
|
||||
<< ", content=" << noti.content()
|
||||
<< ", contentArgs().size()=" << noti.contentArgs().size()
|
||||
<< ", notiDDS.contentArgs().size()=" << notiDDS.contentArgs().size();
|
||||
@@ -196,7 +195,7 @@ void NotificationManagementDialog::onShowNotificationContent()
|
||||
for (const std::string& arg : notiDDS.contentArgs()) {
|
||||
|
||||
content = content.arg(QString::fromStdString(arg));
|
||||
DEBUG_LOG(m_logger) << ".arg() ersetzt immer den kleinsten freien Platzhalter"
|
||||
DEBUG_LOG() << ".arg() ersetzt immer den kleinsten freien Platzhalter"
|
||||
<< ", arg=" << arg
|
||||
<< ", content=" << content;
|
||||
}
|
||||
@@ -212,7 +211,7 @@ void NotificationManagementDialog::onShowNotificationContent()
|
||||
wid->setMarkdown(content);
|
||||
connect(wid, &QTextBrowser::anchorClicked, this, [this, contentPopup](QUrl link )
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "LINK CLICKED: " << link.toString();
|
||||
DEBUG_LOG() << "LINK CLICKED: " << link.toString();
|
||||
auto *event = new LtsWidgets::LtsLinkEvent(link, m_session->baseLayoutWidget());
|
||||
event->setAccepted(false);
|
||||
QApplication::postEvent(qApp, event);
|
||||
|
||||
-2
@@ -60,7 +60,5 @@ class NotificationManagementDialog
|
||||
|
||||
QString m_menuGroup;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+2
-3
@@ -30,7 +30,6 @@ NotificationManagementDialogModel::NotificationManagementDialogModel(QObject *pa
|
||||
parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_logger(getLogger("NotificationManagementDialogModel"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -53,7 +52,7 @@ bool NotificationManagementDialogModel::initModel(const LtsSession::LtsSessionDa
|
||||
insertRow(noti);
|
||||
});
|
||||
|
||||
INFO_LOG(m_logger) << "initModel - #notis: " << m_vecData.size();
|
||||
INFO_LOG() << "initModel - #notis: " << m_vecData.size();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -190,7 +189,7 @@ QString NotificationManagementDialogModel::getNameByAddressId(int addressId, con
|
||||
{
|
||||
if (addr.addressType() == AddressType_def::Operator)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "addressId=" << addressId
|
||||
DEBUG_LOG() << "addressId=" << addressId
|
||||
<< ", addr.addressId()).name()=" << QString::fromStdString(m_dtcOpm->user(addr.addressId()).name());
|
||||
return QString::fromStdString(m_dtcOpm->user(addr.addressId()).name());
|
||||
}
|
||||
|
||||
-3
@@ -53,9 +53,6 @@ class NotificationManagementDialogModel final : public LtsWidgets::LtsAbstractTa
|
||||
std::shared_ptr<NotificationManagement::Interface::Ftc> m_ftc;
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtcOpm;
|
||||
std::shared_ptr<AssetManagement::Interface::Dtc> m_dtcAsm;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
friend class NotificationDialogProxyModel;
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user