Qt6 Migration: BUILD_RTI guards und CMake fixes
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
@@ -10,10 +10,9 @@
|
||||
namespace EffectManagement
|
||||
{
|
||||
|
||||
class DataPlugin final : public QObject, public DataPluginBase::Plugin
|
||||
class DataPlugin final : public DataPluginBase::Plugin
|
||||
{
|
||||
Q_PLUGIN_METADATA(IID "data:3:efm.cevapcici")
|
||||
Q_INTERFACES(DataPluginBase::Plugin)
|
||||
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ namespace EffectManagement
|
||||
QIcon SoundAreaEditPlaylistDelegate::s_iconInf = QIcon(QStringLiteral("icon:infinity.svg"));
|
||||
|
||||
SoundAreaEditPlaylistDelegate::SoundAreaEditPlaylistDelegate(QObject* parent)
|
||||
: QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
: QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -65,7 +65,7 @@ void SpinBoxDelegate::updateEditorGeometry(QWidget* editor, const QStyleOptionVi
|
||||
}
|
||||
|
||||
SoundTreeItem::SoundTreeItem(const QVector<QVariant>& data, const SoundKey& key, SoundTreeItem* parent)
|
||||
: m_parent(parent), m_data(data), m_soundKey(key), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
: m_parent(parent), m_data(data), m_soundKey(key), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ namespace EffectManagement
|
||||
{
|
||||
|
||||
SoundAreaHelper::SoundAreaHelper(SoundAreaHelper* helper)
|
||||
: m_ismDtc(helper->ismDtc()), m_somDtc(helper->somDtc()), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
: m_ismDtc(helper->ismDtc()), m_somDtc(helper->somDtc()), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
QMap<int32_t, InfrastructureManagement::InstrumentationAsset> assets = m_ismDtc->instrumentationAssets();
|
||||
for (const auto& asset : std::as_const(assets))
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ namespace EffectManagement
|
||||
{
|
||||
|
||||
SoundAreaSelectDelegate::SoundAreaSelectDelegate(QObject* parent)
|
||||
: QItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
: QItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@ const QIcon SwitchItemDelegate::s_iconOn = QIcon(QStringLiteral("icon:switch_on.
|
||||
const QIcon SwitchItemDelegate::s_iconOff = QIcon(QStringLiteral("icon:switch_off.svg"));
|
||||
|
||||
SwitchItemDelegate::SwitchItemDelegate(QObject* parent)
|
||||
: QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getLogger())
|
||||
: QStyledItemDelegate(parent), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user