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
+13
-14
@@ -21,9 +21,8 @@ PresentationManagementDialog::PresentationManagementDialog(QWidget *parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("PresentationManagementDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PresentationManagementDialog ctor";
|
||||
DEBUG_LOG() << "PresentationManagementDialog ctor";
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
|
||||
@@ -85,7 +84,7 @@ void PresentationManagementDialog::enaDisa()
|
||||
|
||||
void PresentationManagementDialog::slotAdd()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PresentationManagementDialog::slotAdd";
|
||||
DEBUG_LOG() << "PresentationManagementDialog::slotAdd";
|
||||
PresentationEditDialog *dialog = new PresentationEditDialog(this);
|
||||
if (!dialog->init(-1 , m_dtc, m_ftc, m_opmDtc))
|
||||
{
|
||||
@@ -102,7 +101,7 @@ void PresentationManagementDialog::slotAdd()
|
||||
|
||||
void PresentationManagementDialog::slotEdit()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PresentationManagementDialog::slotEdit";
|
||||
DEBUG_LOG() << "PresentationManagementDialog::slotEdit";
|
||||
PresentationEditDialog *dialog = new PresentationEditDialog(this);
|
||||
|
||||
|
||||
@@ -127,13 +126,13 @@ void PresentationManagementDialog::slotEdit()
|
||||
|
||||
void PresentationManagementDialog::slotRemove()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PresentationManagementDialog::slotRemove";
|
||||
DEBUG_LOG() << "PresentationManagementDialog::slotRemove";
|
||||
QModelIndex selIndex = m_ui->widget->currentIndex();
|
||||
if (!selIndex.isValid())
|
||||
return;
|
||||
|
||||
Core::RemoveElementRequest req(m_model->getRowData(selIndex.row()).id());
|
||||
DEBUG_LOG(m_logger) << "Removing presentation id = " << req.id();
|
||||
DEBUG_LOG() << "Removing presentation id = " << req.id();
|
||||
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
@@ -141,18 +140,18 @@ void PresentationManagementDialog::slotRemove()
|
||||
});
|
||||
|
||||
if (m_requestHelper->failed())
|
||||
ERROR_LOG(m_logger) << "Failed to remove presentation";
|
||||
ERROR_LOG() << "Failed to remove presentation";
|
||||
}
|
||||
|
||||
void PresentationManagementDialog::slotDelete()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PresentationManagementDialog::slotDelete";
|
||||
DEBUG_LOG() << "PresentationManagementDialog::slotDelete";
|
||||
changeStatus(FileStatus::Deleted);
|
||||
}
|
||||
|
||||
void PresentationManagementDialog::slotRestore()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PresentationManagementDialog::slotRestore";
|
||||
DEBUG_LOG() << "PresentationManagementDialog::slotRestore";
|
||||
changeStatus(FileStatus::Valid);
|
||||
}
|
||||
|
||||
@@ -173,14 +172,14 @@ void PresentationManagementDialog::changeStatus(const FileStatus &fs)
|
||||
req.fileStatus(fs);
|
||||
req.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
req.lastModified(QDateTime::currentMSecsSinceEpoch());
|
||||
DEBUG_LOG(m_logger) << "Changing status for presentation id = " << pre.id();
|
||||
DEBUG_LOG() << "Changing status for presentation id = " << pre.id();
|
||||
m_requestHelper->startSingleRequest([this, req]()
|
||||
{
|
||||
return m_ftc->presentationChangeStatusRequest(PresentationChangeStatusRequest(req), this);
|
||||
});
|
||||
|
||||
if (m_requestHelper->failed())
|
||||
ERROR_LOG(m_logger) << "Failed to change status for presentation";
|
||||
ERROR_LOG() << "Failed to change status for presentation";
|
||||
|
||||
}
|
||||
|
||||
@@ -196,7 +195,7 @@ bool PresentationManagementDialog::init(const ScriptsDialogMode &dlgMode,
|
||||
const std::shared_ptr<OperatorManagement::Interface::Dtc> &opmDtc,
|
||||
LtsSession::LtsSession *session)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PresentationManagementDialog::init";
|
||||
DEBUG_LOG() << "PresentationManagementDialog::init";
|
||||
m_modeDialog = dlgMode;
|
||||
m_dtc = dtc;
|
||||
m_ftc = ftc;
|
||||
@@ -222,12 +221,12 @@ bool PresentationManagementDialog::init(const ScriptsDialogMode &dlgMode,
|
||||
|
||||
const QMap<qint32, PresentationManagement::Presentation> presentations = dtc->presentations();
|
||||
for (const auto &p : presentations)
|
||||
DEBUG_LOG(m_logger) << "Presentation: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
|
||||
DEBUG_LOG() << "Presentation: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
|
||||
|
||||
connect(m_ui->widget, &LtsDataView::LtsDataView::signalSelectionChanged, this, &PresentationManagementDialog::enaDisa, Qt::UniqueConnection);
|
||||
|
||||
m_loadedScriptId = m_session->getSavegame()[QStringLiteral("ScriptId")].toInt();
|
||||
ERROR_LOG(m_logger) << "Loaded script id = " << m_loadedScriptId;
|
||||
ERROR_LOG() << "Loaded script id = " << m_loadedScriptId;
|
||||
|
||||
if (m_modeDialog != ScriptsDialogMode::modeView)
|
||||
{
|
||||
|
||||
-3
@@ -65,9 +65,6 @@ private:
|
||||
LtsSession::LtsSession *m_session;
|
||||
|
||||
int m_loadedScriptId {-1};
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private slots:
|
||||
void slotAdd();
|
||||
void slotEdit();
|
||||
|
||||
+17
-18
@@ -37,9 +37,8 @@ PreMobileDialog::PreMobileDialog(QWidget *parent)
|
||||
, m_label(nullptr)
|
||||
, m_avScriptsCount(0)
|
||||
, m_avScriptsActualDone(0)
|
||||
, m_logger(getLogger("PreMobileDialog"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PreMobileDialog ctor";
|
||||
DEBUG_LOG() << "PreMobileDialog ctor";
|
||||
connect(&m_copyExercise, &DBAdministration::CopyExercise::copyDbFailed, this, &PreMobileDialog::onCopyDbFailed);
|
||||
connect(&m_copyExercise, &DBAdministration::CopyExercise::copyDbFinished, this, &PreMobileDialog::onCopyDbFinished);
|
||||
|
||||
@@ -50,7 +49,7 @@ PreMobileDialog::PreMobileDialog(QWidget *parent)
|
||||
m_progressBar = new QProgressBar();
|
||||
m_label = new QLabel();
|
||||
connect(m_label, &QLabel::destroyed, this, [this]()
|
||||
{ERROR_LOG(m_logger) << "Label destroyed";});
|
||||
{ERROR_LOG() << "Label destroyed";});
|
||||
m_widgetProgressBar->layout()->addWidget(m_label);
|
||||
m_widgetProgressBar->layout()->addWidget(m_progressBar);
|
||||
m_progressBar->setMinimum(0);
|
||||
@@ -117,7 +116,7 @@ void PreMobileDialog::slotDownload()
|
||||
connect(&m_copyExercise, &DBAdministration::CopyExercise::nextProgress, this, &PreMobileDialog::onProgressBar);
|
||||
|
||||
if (!m_copyExercise.doCopy(exerciseId))
|
||||
ERROR_LOG(m_logger) << "Failed to copy database from " << DBAdministration::Settings::serverDatabaseHost() << " to " << hostname;
|
||||
ERROR_LOG() << "Failed to copy database from " << DBAdministration::Settings::serverDatabaseHost() << " to " << hostname;
|
||||
|
||||
|
||||
|
||||
@@ -160,7 +159,7 @@ bool PreMobileDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
const std::shared_ptr<AudioVideoManagement::DataInterface> &avmDataIfc,
|
||||
LtsSession::LtsSession *session)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "PreMobileDialog::init";
|
||||
DEBUG_LOG() << "PreMobileDialog::init";
|
||||
m_session = session;
|
||||
m_avmDataIfc = avmDataIfc;
|
||||
m_dtc = dtc;
|
||||
@@ -187,7 +186,7 @@ bool PreMobileDialog::init(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
|
||||
const QMap<qint32, PresentationManagement::Presentation> presentations = dtc->presentations();
|
||||
for (const auto &p : presentations)
|
||||
DEBUG_LOG(m_logger) << "Presentation: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
|
||||
DEBUG_LOG() << "Presentation: id = " << p.id() << ", name = " << p.name().c_str() << ", desc = " << p.description().c_str();
|
||||
|
||||
connect(m_ui->widget, &LtsDataView::LtsDataView::signalSelectionChanged, this, &PreMobileDialog::enaDisa, Qt::UniqueConnection);
|
||||
|
||||
@@ -247,7 +246,7 @@ void PreMobileDialog::handlePresentationContent(const GetPresentationContentRepl
|
||||
|
||||
if (contentList.empty())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No content for Script Id = " << reply.id();
|
||||
WARNING_LOG() << "No content for Script Id = " << reply.id();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -269,28 +268,28 @@ void PreMobileDialog::handlePresentationContent(const GetPresentationContentRepl
|
||||
|
||||
bool PreMobileDialog::downloadAVScripts()
|
||||
{
|
||||
INFO_LOG(m_logger) << "IN downloadAVScripts";
|
||||
INFO_LOG() << "IN downloadAVScripts";
|
||||
int nextProgress = 76;
|
||||
m_progressBar->setValue(nextProgress);
|
||||
|
||||
if (!m_avmDataIfc->hasAvsSession())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "avm hasAvsSession failed";
|
||||
ERROR_LOG() << "avm hasAvsSession failed";
|
||||
m_copyExercise.stopPing();
|
||||
return false;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "hasAVsSession ok";
|
||||
INFO_LOG() << "hasAVsSession ok";
|
||||
|
||||
AudioVideoManagement::AvaSession *avaSession = m_avmDataIfc->avaSession();
|
||||
if (!avaSession->isEstablished())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "avaSession not established, abort";
|
||||
ERROR_LOG() << "avaSession not established, abort";
|
||||
m_copyExercise.stopPing();
|
||||
return false;
|
||||
}
|
||||
|
||||
INFO_LOG(m_logger) << "avaSession established";
|
||||
INFO_LOG() << "avaSession established";
|
||||
|
||||
m_avaControl = avaSession->control();
|
||||
|
||||
@@ -324,14 +323,14 @@ void PreMobileDialog::slotScriptSet(const AudioVideoManagement::AvaStreamInfo &s
|
||||
{
|
||||
if (streamState == AudioVideoManagement::AvaStreamState::NotPossible)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Script " << m_lastScriptName << " not correctly downloaded";
|
||||
ERROR_LOG() << "Script " << m_lastScriptName << " not correctly downloaded";
|
||||
slotScriptDownloaded(streamState);
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "ScriptName: " << m_lastScriptName;
|
||||
DEBUG_LOG(m_logger) << "streamInfo: start" << streamInfo.duration.count();
|
||||
DEBUG_LOG(m_logger) << "streamState: " << static_cast<int>(streamState);
|
||||
DEBUG_LOG() << "ScriptName: " << m_lastScriptName;
|
||||
DEBUG_LOG() << "streamInfo: start" << streamInfo.duration.count();
|
||||
DEBUG_LOG() << "streamState: " << static_cast<int>(streamState);
|
||||
|
||||
m_avaControl->startScript(QStringLiteral("LOCAL_RECORD"), m_lastScriptName,
|
||||
LtsUtils::createConnection(m_avaControl, &AudioVideoManagement::AvaControl::startScriptResponse,
|
||||
@@ -340,7 +339,7 @@ void PreMobileDialog::slotScriptSet(const AudioVideoManagement::AvaStreamInfo &s
|
||||
|
||||
void PreMobileDialog::slotScriptDownloaded(AudioVideoManagement::AvaStreamState streamState)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "streamState: " << static_cast<int>(streamState);
|
||||
DEBUG_LOG() << "streamState: " << static_cast<int>(streamState);
|
||||
|
||||
m_avScriptsActualDone += 1;
|
||||
QString labelText = tr("Downloaded Audio Video Data: ") + QString::number(m_avScriptsActualDone) + QStringLiteral(" / ") + QString::number(m_avScriptsCount);
|
||||
@@ -350,7 +349,7 @@ void PreMobileDialog::slotScriptDownloaded(AudioVideoManagement::AvaStreamState
|
||||
|
||||
if (streamState == AudioVideoManagement::AvaStreamState::NotPossible)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Script " << m_lastScriptName << " not correctly downloaded";
|
||||
ERROR_LOG() << "Script " << m_lastScriptName << " not correctly downloaded";
|
||||
QString msg = tr("Could not download data - Audio/Video download - Script %1 failed").arg(m_lastScriptName);
|
||||
auto x = new LtsWidgets::LtsMessageDialogNew(this, msg);
|
||||
connect(x, &LtsWidgets::LtsMessageDialogNew::ok,
|
||||
|
||||
-2
@@ -80,8 +80,6 @@ private:
|
||||
QLabel *m_label;
|
||||
int m_avScriptsCount;
|
||||
int m_avScriptsActualDone;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private slots:
|
||||
void slotDownload();
|
||||
void enaDisa();
|
||||
|
||||
Reference in new issue
Block a user