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
@@ -24,7 +24,6 @@ DemandSituation::DemandSituation(LtsSession::LtsSession *session, QWidget *paren
|
||||
, m_model(nullptr)
|
||||
, m_proxyModel(nullptr)
|
||||
, m_ui(new Ui::DemandSituation)
|
||||
, m_logger(getLogger("DemandSituationDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setOnlineHelpFilename(QStringLiteral("OC-Demand_Situation"));
|
||||
|
||||
-2
@@ -82,8 +82,6 @@ private:
|
||||
std::shared_ptr<SituationMap::ForeignGuiInterface> m_sitMapGuiIfc;
|
||||
|
||||
Ui::DemandSituation *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+12
-13
@@ -23,7 +23,6 @@ FolderContentEditDialog::FolderContentEditDialog(QWidget *parent)
|
||||
, m_session(nullptr)
|
||||
, m_obdFtc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("OscFolderContentEditDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
setOnlineHelpFilename(QStringLiteral("OSC-Edit_Folder_Content"));
|
||||
@@ -61,7 +60,7 @@ bool FolderContentEditDialog::init(LtsSession::LtsSessionDataDds *session)
|
||||
m_session = session;
|
||||
if (!m_session->getFtc<OcBaseDownload::DataInterface>(m_obdFtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Cant get Obd FTC can't download";
|
||||
ERROR_LOG() << "Cant get Obd FTC can't download";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -131,7 +130,7 @@ void FolderContentEditDialog::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;
|
||||
OcBaseDownload::OcPdfDownloadRequest req(folderId,matrixOperator.toStdString());
|
||||
m_requestHelper->startSingleRequest([req, this]()
|
||||
{
|
||||
@@ -158,13 +157,13 @@ void FolderContentEditDialog::onPreviewFile()
|
||||
|
||||
if(m_pdfWidget == nullptr)
|
||||
{
|
||||
WARNING_LOG(m_logger)<<" pdf widget not initialized. trying to init...";
|
||||
WARNING_LOG()<<" pdf widget not initialized. trying to init...";
|
||||
initPdfWidow();
|
||||
}
|
||||
QFile f(m_currViewPath);
|
||||
if(f.open(QIODevice::ReadOnly))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Current File: " << m_currViewPath;
|
||||
DEBUG_LOG() << "Current File: " << m_currViewPath;
|
||||
setPage(1);
|
||||
setZoomFactor(ZOOM_DEFAULT);
|
||||
setRotation(Poppler::Page::Rotate0);
|
||||
@@ -179,7 +178,7 @@ void FolderContentEditDialog::onPreviewFile()
|
||||
|
||||
void FolderContentEditDialog::onDeleteFile()
|
||||
{
|
||||
TRACE_LOG(m_logger)<<" delete file START ";
|
||||
TRACE_LOG()<<" delete file START ";
|
||||
QItemSelectionModel *select = m_ui->filesView->selectionModel();
|
||||
if(select == nullptr)
|
||||
return;
|
||||
@@ -191,7 +190,7 @@ void FolderContentEditDialog::onDeleteFile()
|
||||
for(const auto index : std::as_const(indexList))
|
||||
{
|
||||
fileInfoList << m_fileSystemModel->fileInfo(index);
|
||||
TRACE_LOG(m_logger)<< "file path:"<<fileInfoList.last().absoluteFilePath();
|
||||
TRACE_LOG()<< "file path:"<<fileInfoList.last().absoluteFilePath();
|
||||
}
|
||||
|
||||
QDir dir;
|
||||
@@ -199,11 +198,11 @@ void FolderContentEditDialog::onDeleteFile()
|
||||
for (auto fileInfo : fileInfoList)
|
||||
{
|
||||
bool success = dir.remove(fileInfo.fileName());
|
||||
TRACE_LOG(m_logger)<< "remove file:"<<fileInfo.absoluteFilePath() << " | succeed? "<< success;
|
||||
TRACE_LOG()<< "remove file:"<<fileInfo.absoluteFilePath() << " | succeed? "<< success;
|
||||
}
|
||||
}
|
||||
|
||||
TRACE_LOG(m_logger) <<" delete file End ";
|
||||
TRACE_LOG() <<" delete file End ";
|
||||
|
||||
}
|
||||
|
||||
@@ -212,7 +211,7 @@ void FolderContentEditDialog::onDeleteFile()
|
||||
void FolderContentEditDialog::setDefaultFileSystemPath(QString path)
|
||||
{
|
||||
m_filesysPath = path.isEmpty() ? QDir::homePath() : path;
|
||||
TRACE_LOG(m_logger)<<" set default filesystem path: "<< path;
|
||||
TRACE_LOG()<<" set default filesystem path: "<< path;
|
||||
}
|
||||
|
||||
|
||||
@@ -221,7 +220,7 @@ void FolderContentEditDialog::setPage(int pageNo)
|
||||
{
|
||||
if (m_pageNo == pageNo)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "setPage = " << pageNo;
|
||||
DEBUG_LOG() << "setPage = " << pageNo;
|
||||
m_pageNo = pageNo;
|
||||
m_pdfWidget->setPage(pageNo);
|
||||
emit currentPageChanged(m_pageNo);
|
||||
@@ -247,7 +246,7 @@ void FolderContentEditDialog::setZoomFactor(double zoomFactor)
|
||||
{
|
||||
if (qFuzzyCompare(m_zoomFactor, zoomFactor))
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "setZoomFactor = " << zoomFactor;
|
||||
DEBUG_LOG() << "setZoomFactor = " << zoomFactor;
|
||||
m_zoomFactor = zoomFactor;
|
||||
m_pdfWidget->setZoomFactor(zoomFactor);
|
||||
}
|
||||
@@ -258,7 +257,7 @@ void FolderContentEditDialog::setRotation(int rotation)
|
||||
{
|
||||
if (m_rotation == rotation)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "setRotation = " << rotation;
|
||||
DEBUG_LOG() << "setRotation = " << rotation;
|
||||
m_rotation = rotation;
|
||||
m_pdfWidget->setRotation(getRotationFromValue(m_rotation));
|
||||
emit rotationChanged(rotation);
|
||||
|
||||
-1
@@ -25,7 +25,6 @@ EquipPlayer::EquipPlayer(LtsSession::LtsSession *session, QWidget *parent)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_ppmCbxGui(nullptr)
|
||||
, m_ui(new Ui::EquipPlayer)
|
||||
, m_logger(getLogger("EquipPlayerDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-1
@@ -61,7 +61,6 @@ private:
|
||||
std::shared_ptr<ParticipantManagement::ForeignGuiComboboxInterface> m_ppmCbxGui;
|
||||
|
||||
Ui::EquipPlayer *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+1
-2
@@ -22,7 +22,6 @@ FaultMessage::FaultMessage(LtsSession::LtsSession *session, QWidget *parent)
|
||||
, m_tabocDtc(nullptr)
|
||||
, m_ppmCbxGui(nullptr)
|
||||
, m_ui(new Ui::FaultMessage)
|
||||
, m_logger(getLogger("FaultMessageDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->lblCountMax->setText(QString::number(m_maxChars));
|
||||
@@ -204,7 +203,7 @@ void FaultMessage::onSpecificsEquipmentChanged(const TrainingAreaBaseOC::Specifi
|
||||
|
||||
m_ownEquipmentId = data.equipmentNumber();
|
||||
if (m_ownEquipmentId <= 0)
|
||||
WARNING_LOG(m_logger) << "EquipmentNumber " << data.equipmentNumber() << " is not present ";
|
||||
WARNING_LOG() << "EquipmentNumber " << data.equipmentNumber() << " is not present ";
|
||||
|
||||
}
|
||||
}
|
||||
-1
@@ -59,7 +59,6 @@ private:
|
||||
std::shared_ptr<ParticipantManagement::ForeignGuiComboboxInterface> m_ppmCbxGui;
|
||||
|
||||
Ui::FaultMessage *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+1
-2
@@ -20,7 +20,6 @@ OcParticipantInfo::OcParticipantInfo(int participantId, LtsSession::LtsSession *
|
||||
, m_roomId(0)
|
||||
, m_session(session)
|
||||
, m_ui(new Ui::OcParticipantInfo)
|
||||
, m_logger(getLogger("OcOcParticipantInfo"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_participant.id(participantId);
|
||||
@@ -155,7 +154,7 @@ bool OcParticipantInfo::setUiValues()
|
||||
}
|
||||
};
|
||||
if (!m_sitMapGuiIfc->setMovementTrackCallback(this, onMovementTrackChangedFunc))
|
||||
ERROR_LOG(m_logger) << LOGFUNCTION << " setMovementTrackCallback failed";
|
||||
ERROR_LOG() << Q_FUNC_INFO << " setMovementTrackCallback failed";
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
-2
@@ -81,8 +81,6 @@ private:
|
||||
AdvancedSymbology::SymbolResultWatcherLabel *m_symbolWatcher;
|
||||
|
||||
Ui::OcParticipantInfo *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -14,7 +14,6 @@ CloseAesList::CloseAesList(LtsSession::LtsSession *session, QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_model(new AesListModel(session, this))
|
||||
, m_ui(new Ui::CloseAesList)
|
||||
, m_logger(getLogger("CloseAesList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->aesList->setModel(m_model);
|
||||
|
||||
-3
@@ -34,9 +34,6 @@ private:
|
||||
AesListModel *m_model;
|
||||
|
||||
Ui::CloseAesList *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -19,7 +19,6 @@ AesListModel::AesListModel(LtsSession::LtsSession *session, QObject *parent)
|
||||
}
|
||||
, parent)
|
||||
, m_session(session)
|
||||
, m_logger(getLogger("AesListModel"))
|
||||
{
|
||||
|
||||
m_session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc);
|
||||
|
||||
-2
@@ -42,7 +42,5 @@ private:
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_aesDtc;
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -20,13 +20,12 @@ SelfTest::SelfTest(LtsSession::LtsSession *session, QWidget *parent)
|
||||
, m_tabocDtc(nullptr)
|
||||
, m_escDtc(nullptr)
|
||||
, m_ui(new Ui::SelfTest)
|
||||
, m_logger(getLogger("SelfTestDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
if ( m_session->getDtc<TrainingAreaBaseOC::DataInterface>(m_tabocDtc))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "load tab settings";
|
||||
WARNING_LOG() << "load tab settings";
|
||||
connect(m_tabocDtc.get(), &TrainingAreaBaseOC::Interface::Dtc::technicalStateSfmChanged,
|
||||
this, &SelfTest::onSfmStatusChanged);
|
||||
|
||||
|
||||
@@ -56,9 +56,6 @@ private:
|
||||
std::shared_ptr<EffectShowClient::Interface::Dtc> m_escDtc;
|
||||
|
||||
Ui::SelfTest *m_ui;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user