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
+8
-9
@@ -35,7 +35,6 @@ SoundAreaEditDialog::SoundAreaEditDialog(const SoundArea &soundArea, QWidget *pa
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_soundArea(new SoundArea(soundArea))
|
||||
, m_ui(new Ui::SoundAreaEditDialog)
|
||||
, m_logger(getLogger("Plugins.Gui.SoundArea.EditDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_buttonBox->getButton(LtsWidgets::DialogButton::Hide)->setIcon(QIcon(QStringLiteral("icon:avm_stop.svg")));
|
||||
@@ -97,7 +96,7 @@ void SoundAreaEditDialog::onPlaySound(SoundManagement::SoundCategory category, i
|
||||
|
||||
void SoundAreaEditDialog::onStopAllSounds()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onStopAllSounds";
|
||||
DEBUG_LOG() << "onStopAllSounds";
|
||||
|
||||
QList<int32_t> egcuIds;
|
||||
|
||||
@@ -106,13 +105,13 @@ void SoundAreaEditDialog::onStopAllSounds()
|
||||
{
|
||||
if (!m_egcuCheckBoxes.value(egcu)->isChecked())
|
||||
continue;
|
||||
DEBUG_LOG(m_logger) << "onStopAllSounds add egcu=" << egcu;
|
||||
DEBUG_LOG() << "onStopAllSounds add egcu=" << egcu;
|
||||
egcuIds.append(egcu);
|
||||
}
|
||||
|
||||
for (const auto &egcu : std::as_const(egcuIds))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onStopAllSounds egcu=" << egcu;
|
||||
DEBUG_LOG() << "onStopAllSounds egcu=" << egcu;
|
||||
SoundManagement::StopAllSoundsRequest req(egcu);
|
||||
|
||||
m_somFtc->stopAllSoundsRequest(req, nullptr);
|
||||
@@ -126,7 +125,7 @@ m_somFtc->stopAllSoundsRequest(req, nullptr);
|
||||
|
||||
bool SoundAreaEditDialog::init(LtsSession::LtsSessionDataDds *session)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "init";
|
||||
DEBUG_LOG() << "init";
|
||||
|
||||
m_session = session;
|
||||
|
||||
@@ -134,19 +133,19 @@ bool SoundAreaEditDialog::init(LtsSession::LtsSessionDataDds *session)
|
||||
std::shared_ptr<InfrastructureManagement::Interface::Dtc> ismDtc;
|
||||
if (!m_session->getDtc<InfrastructureManagement::DataInterface>(ismDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "connection to ISM-DTC failed";
|
||||
ERROR_LOG() << "connection to ISM-DTC failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_session->getDtc<EffectManagement::DataInterface>(m_somDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "connection to SOM-DTC failed";
|
||||
ERROR_LOG() << "connection to SOM-DTC failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_session->getFtc<EffectManagement::DataInterface>(m_somFtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "connection to SOM-FTC failed";
|
||||
ERROR_LOG() << "connection to SOM-FTC failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -245,7 +244,7 @@ bool SoundAreaEditDialog::init(LtsSession::LtsSessionDataDds *session)
|
||||
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Hide, this, &SoundAreaEditDialog::onStopAllSounds);
|
||||
|
||||
DEBUG_LOG(m_logger) << "init successful";
|
||||
DEBUG_LOG() << "init successful";
|
||||
return true;
|
||||
}
|
||||
}
|
||||
-2
@@ -145,8 +145,6 @@ private:
|
||||
|
||||
LtsSession::LtsSessionDataDds *m_session{nullptr};
|
||||
Ui::SoundAreaEditDialog *m_ui{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+6
-7
@@ -73,7 +73,6 @@ SoundAreaPlaylistModel::SoundAreaPlaylistModel(const QVector<int32_t> &egcuIds,
|
||||
parent)
|
||||
, m_helper(helper)
|
||||
, m_egcuIds(egcuIds)
|
||||
, m_logger(getLogger("Plugins.Gui.SoundArea.EditModelPlaylist"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -98,7 +97,7 @@ void SoundAreaPlaylistModel::onTimeout()
|
||||
|
||||
bool SoundAreaPlaylistModel::init(std::shared_ptr<SoundManagement::Interface::Dtc> &somDtc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "init";
|
||||
DEBUG_LOG() << "init";
|
||||
|
||||
const QMap<int32_t, SoundManagement::SoundState> soundStates = somDtc->soundStates();
|
||||
for (const auto &data : std::as_const(soundStates))
|
||||
@@ -121,7 +120,7 @@ bool SoundAreaPlaylistModel::init(std::shared_ptr<SoundManagement::Interface::Dt
|
||||
connect(m_timer, &QTimer::timeout, this, &SoundAreaPlaylistModel::onTimeout);
|
||||
m_timer->start(1000);
|
||||
|
||||
DEBUG_LOG(m_logger) << "init successful";
|
||||
DEBUG_LOG() << "init successful";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -148,14 +147,14 @@ bool SoundAreaPlaylistModel::addActiveSound(SoundState data)
|
||||
|
||||
if (row != -1)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "'" << name << "' is already active";
|
||||
ERROR_LOG() << "'" << name << "' is already active";
|
||||
return false;
|
||||
}
|
||||
|
||||
data.status(SoundState::Status::Active);
|
||||
insertRow(data);
|
||||
|
||||
DEBUG_LOG(m_logger) << "adding '" << name << "' to active Sounds";
|
||||
DEBUG_LOG() << "adding '" << name << "' to active Sounds";
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -231,7 +230,7 @@ bool SoundAreaPlaylistModel::onDataChanged(const SoundState &data, DataModificat
|
||||
return addActiveSound(data);
|
||||
|
||||
case DataModification::eModified:
|
||||
WARNING_LOG(m_logger) << "handling eModified for sound states not implemented yet";
|
||||
WARNING_LOG() << "handling eModified for sound states not implemented yet";
|
||||
return false;
|
||||
|
||||
case DataModification::eRemoved:
|
||||
@@ -239,7 +238,7 @@ bool SoundAreaPlaylistModel::onDataChanged(const SoundState &data, DataModificat
|
||||
idx = SoundAreaPlaylistModel::index(m_vecData.indexOf(data), 0);
|
||||
if (row == -1)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is neither scheduled nor active";
|
||||
ERROR_LOG() << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is neither scheduled nor active";
|
||||
return false;
|
||||
}
|
||||
return removeActiveSound(idx);
|
||||
|
||||
-2
@@ -88,8 +88,6 @@ private:
|
||||
std::shared_ptr<SoundAreaHelper> m_helper{nullptr};
|
||||
QVector<int32_t> m_egcuIds;
|
||||
QTimer *m_timer{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+1
-2
@@ -145,7 +145,6 @@ SoundAreaTreeModel::SoundAreaTreeModel(const QVector<int> &egcuIds, std::shared_
|
||||
, m_helper(helper)
|
||||
, m_root(new SoundTreeItem({tr("Category"), tr("Sound"), tr("Loop"), tr("Volume")}, SoundKey(0, 0)))
|
||||
, m_egcuIds(egcuIds)
|
||||
, m_logger(getLogger("Plugins.Gui.SoundArea.EditModelTree"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -209,7 +208,7 @@ bool SoundAreaTreeModel::onToggleLoop(const QModelIndex &index)
|
||||
|
||||
bool SoundAreaTreeModel::init(const std::shared_ptr<SoundManagement::Interface::Dtc> &somDtc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "init";
|
||||
DEBUG_LOG() << "init";
|
||||
|
||||
|
||||
SoundKey key;
|
||||
|
||||
-3
@@ -146,9 +146,6 @@ private:
|
||||
|
||||
SoundTreeItem *m_root{nullptr};
|
||||
QVector<int32_t> m_egcuIds;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -19,7 +19,6 @@ namespace EffectManagement
|
||||
SoundAreaHelper::SoundAreaHelper(SoundAreaHelper *helper)
|
||||
: m_ismDtc(helper->ismDtc())
|
||||
, m_somDtc(helper->somDtc())
|
||||
, m_logger(getLogger("Plugins.Gui.SoundArea.Helper"))
|
||||
{
|
||||
QMap<int32_t, InfrastructureManagement::InstrumentationAsset> assets = m_ismDtc->instrumentationAssets();
|
||||
for (const auto &asset : std::as_const(assets))
|
||||
@@ -35,7 +34,6 @@ SoundAreaHelper::SoundAreaHelper(std::shared_ptr<InfrastructureManagement::Inter
|
||||
std::shared_ptr<SoundManagement::Interface::Dtc> &somDtc)
|
||||
: m_ismDtc(ismDtc)
|
||||
, m_somDtc(somDtc)
|
||||
, m_logger(getLogger("Plugins.Gui.SoundArea.Helper"))
|
||||
{
|
||||
QMap<int32_t, InfrastructureManagement::InstrumentationAsset> assets = m_ismDtc->instrumentationAssets();
|
||||
for (const auto &asset : std::as_const(assets))
|
||||
|
||||
-3
@@ -84,9 +84,6 @@ private:
|
||||
|
||||
QMap<int32_t, QString> m_egcuNames;
|
||||
QMap<SoundKey, int> m_soundDuration;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+6
-7
@@ -26,7 +26,6 @@ SoundAreaSelectDialog::SoundAreaSelectDialog(QWidget *parent)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_model(new SoundAreaSelectModel(this))
|
||||
, m_ui(new Ui::SoundAreasDialog)
|
||||
, m_logger(getLogger("Plugins.Gui.SoundArea.SelectDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -101,7 +100,7 @@ void SoundAreaSelectDialog::onStopAllSounds()
|
||||
|
||||
bool SoundAreaSelectDialog::init(LtsSession::LtsSessionDataDds *session, const QString &menuGroup)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "init";
|
||||
DEBUG_LOG() << "init";
|
||||
|
||||
m_session = session;
|
||||
setMenuGroup(menuGroup);
|
||||
@@ -111,25 +110,25 @@ bool SoundAreaSelectDialog::init(LtsSession::LtsSessionDataDds *session, const Q
|
||||
|
||||
if (!m_session->getDtc<InfrastructureManagement::DataInterface>(ismDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "connection to ISM-DTC failed";
|
||||
ERROR_LOG() << "connection to ISM-DTC failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_session->getDtc<EffectManagement::DataInterface>(somDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "connection to SOM-DTC failed";
|
||||
ERROR_LOG() << "connection to SOM-DTC failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_session->getFtc<EffectManagement::DataInterface>(m_somFtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "connection to SOM-FTC failed";
|
||||
ERROR_LOG() << "connection to SOM-FTC failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!m_model->init(ismDtc, somDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "sound area select model initialization failed";
|
||||
ERROR_LOG() << "sound area select model initialization failed";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -150,7 +149,7 @@ bool SoundAreaSelectDialog::init(LtsSession::LtsSessionDataDds *session, const Q
|
||||
connect(m_ui->tvSoundlist, &QTableView::clicked, this, &SoundAreaSelectDialog::onSelectSoundArea);
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Edit, this, &SoundAreaSelectDialog::onStopAllSounds);
|
||||
|
||||
DEBUG_LOG(m_logger) << "init successful";
|
||||
DEBUG_LOG() << "init successful";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
-3
@@ -73,9 +73,6 @@ private:
|
||||
|
||||
LtsSession::LtsSessionDataDds *m_session{nullptr};
|
||||
Ui::SoundAreasDialog *m_ui{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
+4
-5
@@ -58,7 +58,6 @@ SoundAreaSelectModel::SoundAreaSelectModel(QWidget *parent)
|
||||
tr("Active Sounds"),
|
||||
tr("Stop")
|
||||
}, parent)
|
||||
, m_logger(getLogger("Plugins.Gui.SoundArea.SelectModel"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -78,7 +77,7 @@ bool SoundAreaSelectModel::onSoundStateChanged(const SoundManagement::SoundState
|
||||
case DataModification::eAdded:
|
||||
if (it != soundArea.activeSounds.end())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is already active";
|
||||
DEBUG_LOG() << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is already active";
|
||||
return false;
|
||||
}
|
||||
else
|
||||
@@ -94,7 +93,7 @@ bool SoundAreaSelectModel::onSoundStateChanged(const SoundManagement::SoundState
|
||||
case DataModification::eRemoved:
|
||||
if (it == soundArea.activeSounds.end())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is not active";
|
||||
DEBUG_LOG() << "'" << m_helper->soundName(data.category(), data.soundId()) << "' is not active";
|
||||
return false;
|
||||
}
|
||||
else
|
||||
@@ -124,7 +123,7 @@ bool SoundAreaSelectModel::onSoundStateChanged(const SoundManagement::SoundState
|
||||
bool SoundAreaSelectModel::init(const std::shared_ptr<InfrastructureManagement::Interface::Dtc> &ismDtc,
|
||||
const std::shared_ptr<SoundManagement::Interface::Dtc> &somDtc)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "init";
|
||||
DEBUG_LOG() << "init";
|
||||
|
||||
m_ismDtc = ismDtc;
|
||||
m_somDtc = somDtc;
|
||||
@@ -155,7 +154,7 @@ bool SoundAreaSelectModel::init(const std::shared_ptr<InfrastructureManagement::
|
||||
onSoundStateChanged(soundState, DataModification::eAdded);
|
||||
});
|
||||
|
||||
DEBUG_LOG(m_logger) << "init successful";
|
||||
DEBUG_LOG() << "init successful";
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
-3
@@ -84,9 +84,6 @@ private:
|
||||
std::shared_ptr<SoundManagement::Interface::Dtc> m_somDtc{nullptr};
|
||||
|
||||
std::shared_ptr<SoundAreaHelper> m_helper{nullptr};
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-1
@@ -16,7 +16,6 @@ const QIcon SwitchItemDelegate::s_iconOff = QIcon(QStringLiteral("icon:switch_of
|
||||
|
||||
SwitchItemDelegate::SwitchItemDelegate(QObject *parent)
|
||||
: QStyledItemDelegate(parent)
|
||||
, m_logger(getLogger("Plugins.Gui.SoundArea.SwitchItemDelegate"))
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
-3
@@ -28,9 +28,6 @@ public:
|
||||
private:
|
||||
static const QIcon s_iconOn;
|
||||
static const QIcon s_iconOff;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
-2
@@ -78,8 +78,6 @@ private:
|
||||
QString m_menuGroup;
|
||||
|
||||
Ui::SoundManagementDialog *m_ui{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user