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
+12
-13
@@ -32,7 +32,6 @@ BaseDownloader::BaseDownloader(const QString &menuGroup, LtsSession::LtsSession
|
||||
, m_exmDtc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::BaseDownloader)
|
||||
, m_logger(getLogger("BaseDownloaderDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->leStatus->setText(tr("Not Connected"));
|
||||
@@ -122,7 +121,7 @@ bool BaseDownloader::init()
|
||||
|
||||
void BaseDownloader::onStartBaseDownloadReply(const BaseDownloadReply &replyObject)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "NEW STATE REPLY: " << replyObject.currentStep() << " \n" << replyObject.progress();
|
||||
DEBUG_LOG() << "NEW STATE REPLY: " << replyObject.currentStep() << " \n" << replyObject.progress();
|
||||
switch (replyObject.replyState().underlying())
|
||||
{
|
||||
case Core::FtReplyState::InProgress:
|
||||
@@ -209,7 +208,7 @@ void BaseDownloader::startBaseDownload()
|
||||
m_ui->leServer->text().toStdString(),
|
||||
QDateTime::currentMSecsSinceEpoch());
|
||||
|
||||
DEBUG_LOG(m_logger) << "EXERCISE ID: " << m_exerciseId;
|
||||
DEBUG_LOG() << "EXERCISE ID: " << m_exerciseId;
|
||||
|
||||
if (m_ftc->startBaseDownloadRequest(req, this))
|
||||
{
|
||||
@@ -318,13 +317,13 @@ void BaseDownloader::onNewTextMessageFromSocket(const QString &message)
|
||||
m_timer->stop();
|
||||
if (m_state == ConnectionState::ConnectedToExternalServer)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "message from SVC " << message;
|
||||
DEBUG_LOG() << "message from SVC " << message;
|
||||
|
||||
doConnectToExerciseManagement(message);
|
||||
}
|
||||
else if (m_state == ConnectionState::ConnectedToExerciseManagement)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "message from EXM " << message;
|
||||
DEBUG_LOG() << "message from EXM " << message;
|
||||
fillExerciseModel(message);
|
||||
}
|
||||
}
|
||||
@@ -401,7 +400,7 @@ void BaseDownloader::onOcPdfDownloadClicked()
|
||||
}
|
||||
const QString matrixOperator = LtsSessionData::LtsSessionData::getInstance()->getOperatorName();
|
||||
|
||||
DEBUG_LOG(m_logger)<<LOGFUNCTION<<" folderId:" <<folderId<<" operatorName: "<<matrixOperator;
|
||||
DEBUG_LOG()<<Q_FUNC_INFO<<" folderId:" <<folderId<<" operatorName: "<<matrixOperator;
|
||||
OcPdfDownloadRequest req(folderId,matrixOperator.toStdString());
|
||||
m_ftc->ocPdfDownloadRequest(req, this);
|
||||
}
|
||||
@@ -418,12 +417,12 @@ void BaseDownloader::doConnectToExerciseManagement(const QString &message)
|
||||
QJsonDocument doc = QJsonDocument::fromJson(message.toUtf8());
|
||||
if (!doc.isObject())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No Valid Object in " << message;
|
||||
WARNING_LOG() << "No Valid Object in " << message;
|
||||
return;
|
||||
}
|
||||
if (!doc.object().value(QStringLiteral("data")).isArray())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No Data Array in" << message;
|
||||
WARNING_LOG() << "No Data Array in" << message;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -457,7 +456,7 @@ void BaseDownloader::doConnectToExerciseManagement(const QString &message)
|
||||
|
||||
if (exPort > 0)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Connect To EXM";
|
||||
DEBUG_LOG() << "Connect To EXM";
|
||||
m_socket->open(getUrl(m_ui->leServer->text(), exPort));
|
||||
}
|
||||
|
||||
@@ -466,14 +465,14 @@ void BaseDownloader::doConnectToExerciseManagement(const QString &message)
|
||||
QUrl BaseDownloader::getUrl(const QString &adress, unsigned short port) const
|
||||
{
|
||||
QString url = QLatin1String("ws://") + adress + QLatin1Char(':') + QString::number(port);
|
||||
DEBUG_LOG(m_logger) << "Connect to: " << url;
|
||||
DEBUG_LOG() << "Connect to: " << url;
|
||||
|
||||
return QUrl(url);
|
||||
}
|
||||
|
||||
void BaseDownloader::sendProcessListRequest()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "send processListRequest message to SVC";
|
||||
DEBUG_LOG() << "send processListRequest message to SVC";
|
||||
m_timer->start();
|
||||
m_socket->sendTextMessage(QStringLiteral("{\"type\": \"servicePortsInformationRequest\",\"uuid\": \"7777\"}"));
|
||||
m_ui->leStatus->setText(tr("Wait for Service Data."));
|
||||
@@ -482,7 +481,7 @@ void BaseDownloader::sendProcessListRequest()
|
||||
|
||||
void BaseDownloader::sendExerciseListRequest()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "send exerciseListRequest message to EXM";
|
||||
DEBUG_LOG() << "send exerciseListRequest message to EXM";
|
||||
m_timer->start();
|
||||
m_ftcTimer->start();
|
||||
m_socket->sendTextMessage(QStringLiteral("{\"type\": \"exerciseInformationRequest\",\"uuid\": \"7777\"}"));
|
||||
@@ -499,7 +498,7 @@ void BaseDownloader::fillExerciseModel(const QString &exerciseList)
|
||||
QJsonDocument doc = QJsonDocument::fromJson(exerciseList.toUtf8());
|
||||
if (!doc.isObject() || !doc.object().value(QStringLiteral("data")).isArray())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No Valid Object in " << exerciseList;
|
||||
WARNING_LOG() << "No Valid Object in " << exerciseList;
|
||||
m_ui->leStatus->setText(tr("Got Invalid Data from Exercise Management."));
|
||||
return;
|
||||
}
|
||||
|
||||
-2
@@ -96,8 +96,6 @@ private:
|
||||
|
||||
int m_exerciseId = 0;
|
||||
Ui::BaseDownloader *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -12,7 +12,6 @@ namespace OcBaseDownload
|
||||
BaseDownloaderMessage::BaseDownloaderMessage(QWidget *parent)
|
||||
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
|
||||
, m_ui(new Ui::BaseDownloaderMessage)
|
||||
, m_logger(getLogger("BaseDownloaderMessageDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
connect(m_ui->pbClose, &QPushButton::clicked, this, &BaseDownloaderMessage::close);
|
||||
|
||||
-2
@@ -34,8 +34,6 @@ private:
|
||||
|
||||
private:
|
||||
Ui::BaseDownloaderMessage *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
-1
@@ -14,7 +14,6 @@ const char *BaseDownloaderPdfSelector::ID = "id";
|
||||
BaseDownloaderPdfSelector::BaseDownloaderPdfSelector(QWidget *parent)
|
||||
: LtsWidgets::LtsFramelessDialog(parent, LtsWidgets::Behaviour::Modal)
|
||||
, m_ui(new Ui::BaseDownloaderPdfSelector)
|
||||
, m_logger(getLogger("BaseDownloaderPdfSelectorDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-2
@@ -45,7 +45,5 @@ private:
|
||||
Ui::BaseDownloaderPdfSelector *m_ui;
|
||||
std::shared_ptr<OcBaseDownload::Interface::Ftc> m_ftc;
|
||||
QVector<QCheckBox *> m_chks;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
}
|
||||
-1
@@ -19,7 +19,6 @@ ExModel::ExModel(QObject *parent)
|
||||
tr("Description"),
|
||||
QStringLiteral("Id")},
|
||||
parent)
|
||||
, m_logger(getLogger("ExModel"))
|
||||
{}
|
||||
|
||||
void ExModel::addExercise(const QJsonObject &exercise)
|
||||
|
||||
-2
@@ -33,8 +33,6 @@ public:
|
||||
|
||||
private:
|
||||
friend class ExProxyModel;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
class ExProxyModel final : public LtsWidgets::LtsColumnFilterProxyModel
|
||||
|
||||
Reference in new issue
Block a user