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
+1
-2
@@ -23,7 +23,6 @@ SanNineLinerDialog::SanNineLinerDialog(const QString &menuGroup, QWidget *parent
|
||||
, m_ui(new Ui::SanNineLinerDialog)
|
||||
, m_menuGroup(menuGroup)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("SanNineLinerDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setOnlineHelpFilename(QStringLiteral("Situation-SanNineLiner"));
|
||||
@@ -117,7 +116,7 @@ void SanNineLinerDialog::onEditSanNineLiner()
|
||||
|
||||
if (san.id() <= 0)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "current SanNineLinerId: " << san.id();
|
||||
DEBUG_LOG() << "current SanNineLinerId: " << san.id();
|
||||
|
||||
SanNineLinerEditDialog *dialog = new SanNineLinerEditDialog(this);
|
||||
|
||||
|
||||
-2
@@ -48,7 +48,5 @@ private:
|
||||
std::shared_ptr<Evaluations::Interface::Ftc> m_ftc;
|
||||
QString m_menuGroup;
|
||||
LtsUtils::RequestHelper *m_requestHelper{nullptr};
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+2
-3
@@ -21,8 +21,7 @@ SanNineLinerDialogModel::SanNineLinerDialogModel(QObject *parent)
|
||||
tr("Position"),
|
||||
tr("Radio frequency / Call Sign / Suffix")
|
||||
},
|
||||
parent)
|
||||
, m_logger(getLogger("SanNineLinerDialogModel"))
|
||||
parent)
|
||||
{}
|
||||
|
||||
bool SanNineLinerDialogModel::initModel(const std::shared_ptr<Evaluations::Interface::Dtc> &dtc)
|
||||
@@ -38,7 +37,7 @@ bool SanNineLinerDialogModel::initModel(const std::shared_ptr<Evaluations::Inter
|
||||
insertRow(san);
|
||||
});
|
||||
|
||||
INFO_LOG(m_logger) << "initModel - #sanNineLiner: " << m_vecData.size();
|
||||
INFO_LOG() << "initModel - #sanNineLiner: " << m_vecData.size();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -34,8 +34,6 @@ public:
|
||||
|
||||
private:
|
||||
std::shared_ptr<Evaluations::Interface::Dtc> m_evlDtc;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
friend class SanNineLinerProxyModel;
|
||||
};
|
||||
|
||||
|
||||
+5
-6
@@ -33,7 +33,6 @@ SanNineLinerEditDialog::SanNineLinerEditDialog(QWidget *parent)
|
||||
, m_ui(new Ui::SanNineLinerEditDialog)
|
||||
, m_validator(new QIntValidator(this))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("SanNineLinerEditDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -109,7 +108,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
|
||||
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(data.lines(), data.id());
|
||||
|
||||
INFO_LOG(m_logger) << "linesCategory size: " << linesCategory.size();
|
||||
INFO_LOG() << "linesCategory size: " << linesCategory.size();
|
||||
|
||||
for (const Database::SanCategoryLine &cl : std::as_const(linesCategory))
|
||||
{
|
||||
@@ -118,7 +117,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
QLineEdit *leLineAmount = findChild<QLineEdit*>(leName);
|
||||
if (leLineAmount)
|
||||
{
|
||||
INFO_LOG(m_logger) << "leName: " << leName << ", amount: " << cl.amount;
|
||||
INFO_LOG() << "leName: " << leName << ", amount: " << cl.amount;
|
||||
leLineAmount->setText(QString::number(cl.amount));
|
||||
|
||||
continue;
|
||||
@@ -129,7 +128,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
QRadioButton *rbCategory = findChild<QRadioButton*>(rbName);
|
||||
if (rbCategory)
|
||||
{
|
||||
INFO_LOG(m_logger) << "rbName: " << rbName;
|
||||
INFO_LOG() << "rbName: " << rbName;
|
||||
rbCategory->setChecked(true);
|
||||
continue;
|
||||
}
|
||||
@@ -140,7 +139,7 @@ bool SanNineLinerEditDialog::init(LtsSession::LtsSessionDataDds *session,
|
||||
QCheckBox *cbxCategory = findChild<QCheckBox*>(cbxName);
|
||||
if (cbxCategory)
|
||||
{
|
||||
INFO_LOG(m_logger) << "cbxName: " << cbxName;
|
||||
INFO_LOG() << "cbxName: " << cbxName;
|
||||
cbxCategory->setChecked(true);
|
||||
}
|
||||
}
|
||||
@@ -251,7 +250,7 @@ bool SanNineLinerEditDialog::apply()
|
||||
if (request.id() <= 0)
|
||||
{
|
||||
m_sanNineLinerId = m_requestHelper->getRepliedId();
|
||||
ERROR_LOG(m_logger) << "Created new san nine liner with id " << m_sanNineLinerId;
|
||||
ERROR_LOG() << "Created new san nine liner with id " << m_sanNineLinerId;
|
||||
}
|
||||
|
||||
|
||||
|
||||
-2
@@ -79,7 +79,5 @@ private:
|
||||
QString m_menuGroup;
|
||||
QIntValidator *m_validator{nullptr};
|
||||
LtsUtils::RequestHelper *m_requestHelper{nullptr};
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user