Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -26,7 +26,7 @@ ADD_INTERFACE_LIBRARY(AsbGuiPluginInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/asb_gui_plugin_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
GuiPluginInterface
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
)
|
||||
|
||||
#
|
||||
@@ -36,5 +36,5 @@ ADD_INTERFACE_LIBRARY(AsbSymbolProxyGuiPluginInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/asb_symbol_proxy_gui_plugin_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
GuiPluginInterface
|
||||
Qt5::Gui
|
||||
Qt6::Gui
|
||||
)
|
||||
@@ -33,7 +33,7 @@ NGL_ADD_LIBRARY(WS AsbDataPlugin MODULE
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbDataPlugin
|
||||
AsbData
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
AsbDataPluginInterface
|
||||
GimDataPluginInterface
|
||||
svcAesCommon
|
||||
@@ -51,7 +51,7 @@ NGL_ADD_LIBRARY(WS AsbForeignDataPluginThp STATIC
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbForeignDataPluginThp
|
||||
AsbData
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
AsbDataPluginInterface
|
||||
GimDataPluginInterface
|
||||
svcAesCommon
|
||||
|
||||
+3
-3
@@ -47,8 +47,8 @@ NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
)
|
||||
NGL_INSTALL_TARGET(AsbSymEditGuiPlugin)
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "asb_symbol_editor.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QButtonGroup>
|
||||
#include <QScrollBar>
|
||||
@@ -603,7 +604,7 @@ void SymbolEditor::resetGUI()
|
||||
|
||||
|
||||
m_ui->ComboBoxColor->clear();
|
||||
for (const auto &scp : qAsConst(m_internal->m_symbolColorsPreview))
|
||||
for (const auto &scp : std::as_const(m_internal->m_symbolColorsPreview))
|
||||
{
|
||||
QPixmap pixmap(20, 20);
|
||||
pixmap.fill(scp.second);
|
||||
@@ -1381,7 +1382,7 @@ void SymbolEditor::updateGraphicViews(bool editview, bool preview)
|
||||
previewFrameFillCol,
|
||||
-0.29, false, false);
|
||||
}
|
||||
for (const SymbologyXML::Symbol *miscSymbol : qAsConst(miscSymbols))
|
||||
for (const SymbologyXML::Symbol *miscSymbol : std::as_const(miscSymbols))
|
||||
{
|
||||
if (miscSymbol != nullptr)
|
||||
{
|
||||
@@ -1405,7 +1406,7 @@ void SymbolEditor::updateGraphicViews(bool editview, bool preview)
|
||||
previewAttFillCol,
|
||||
-0.29, false, false);
|
||||
}
|
||||
for (const SymbologyXML::Symbol *tgSymbol : qAsConst(tgSymbols))
|
||||
for (const SymbologyXML::Symbol *tgSymbol : std::as_const(tgSymbols))
|
||||
{
|
||||
if (tgSymbol != nullptr)
|
||||
{
|
||||
|
||||
+2
-2
@@ -22,8 +22,8 @@ NGL_ADD_LIBRARY(WS AsbSymbolProxyGuiPlugin MODULE ${AsbSymbolProxyGuiPlugin_SRCS
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin
|
||||
AsbSymbolProxyGuiPluginInterface
|
||||
NGLLogger
|
||||
Qt5::Svg
|
||||
Qt5::Xml
|
||||
Qt6::Svg
|
||||
Qt6::Xml
|
||||
SituationMapGuiPluginInterface
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
|
||||
+5
-4
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "asb_flm_subscriber.h"
|
||||
#include <utility>
|
||||
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
@@ -558,7 +559,7 @@ void FlmSubscriber::onLocalSymbolProxyEtsSymbolAdded(qint32 fileConte
|
||||
const QStringList &usrTags)
|
||||
{
|
||||
Q_UNUSED(fileContentId);
|
||||
for (const SymbologyType symbologyType : qAsConst(d->m_symbolDictionaryToUpdate))
|
||||
for (const SymbologyType symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
@@ -568,7 +569,7 @@ void FlmSubscriber::onLocalSymbolProxyEtsSymbolAdded(qint32 fileConte
|
||||
|
||||
void FlmSubscriber::onLocalSymbolProxyEtsSymbolRemoved(qint32 fileContentId, const QString &name)
|
||||
{
|
||||
for (const SymbologyType &symbologyType : qAsConst(d->m_symbolDictionaryToUpdate))
|
||||
for (const SymbologyType &symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
@@ -594,7 +595,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolAdded(qint32 fileContentId,
|
||||
|
||||
if (!xmlContent.isEmpty())
|
||||
{
|
||||
for (const SymbologyType &symbologyType : qAsConst(d->m_symbolDictionaryToUpdate))
|
||||
for (const SymbologyType &symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
@@ -613,7 +614,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " fileContentId=" << fileContentId;
|
||||
|
||||
for (const SymbologyType &symbologyType : qAsConst(d->m_symbolDictionaryToUpdate))
|
||||
for (const SymbologyType &symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
|
||||
@@ -13,9 +13,9 @@ SET(tmsr_SRCS
|
||||
NGL_ADD_LIBRARY2(WS AsbHelper STATIC ${tmsr_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbHelper
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
PRIVATE
|
||||
Qt5::Gui
|
||||
Qt6::Gui
|
||||
AsbDataPluginInterface
|
||||
NGLLogger
|
||||
)
|
||||
Reference in new issue
Block a user