Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
+2
-2
@@ -26,8 +26,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(ThpCommon
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../ # export file
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(ThpCommon
|
||||
Qt5::Core
|
||||
Qt5::Concurrent
|
||||
Qt6::Core
|
||||
Qt6::Concurrent
|
||||
NGLLogger
|
||||
LtsSession
|
||||
AsmDataPluginInterface
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "tpm_exported_scripts_model.h"
|
||||
#include <utility>
|
||||
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
@@ -55,7 +56,7 @@ bool ExportedScriptsModel::init(const QString &rootDirectoryToScan)
|
||||
WARNING_LOG(m_logger) << "local exericses: " << localExercises.count();
|
||||
|
||||
|
||||
for (const int exId : qAsConst(localExercises))
|
||||
for (const int exId : std::as_const(localExercises))
|
||||
{
|
||||
const QString baseDir = exercisePath(rootDirectoryToScan, exId);
|
||||
QFile file(baseDir + QDir::separator() + QStringLiteral("data.json"));
|
||||
@@ -132,7 +133,7 @@ void ExportedScriptsModel::setServerContent(const QString &jsonArray)
|
||||
}
|
||||
|
||||
|
||||
for (const auto &data : qAsConst(m_vecData))
|
||||
for (const auto &data : std::as_const(m_vecData))
|
||||
{
|
||||
exerciseScriptIds[data.exerciseId].append(data.scriptId);
|
||||
DEBUG_LOG(m_logger) << "exerciseId=" << data.exerciseId
|
||||
@@ -530,7 +531,7 @@ bool ExportedScriptsModel::removeRow(int row)
|
||||
const int exId = obj.value(QStringLiteral("exerciseId")).toInt();
|
||||
QJsonArray arr;
|
||||
|
||||
for (const auto &esi : qAsConst(m_vecData))
|
||||
for (const auto &esi : std::as_const(m_vecData))
|
||||
{
|
||||
if (esi.exerciseId == exId)
|
||||
arr += esi.toJson();
|
||||
|
||||
+3
-3
@@ -28,9 +28,9 @@ NGL_ADD_LIBRARY2(WS ThpManagementGuiPlugin MODULE ${thp_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(ThpManagementGuiPlugin
|
||||
ThpCommon
|
||||
TpmGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt5::Network
|
||||
Qt5::WebSockets
|
||||
Qt6::Widgets
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
NGLLogger
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
|
||||
+3
-3
@@ -23,9 +23,9 @@ NGL_ADD_LIBRARY2(WS ThpUsbManagementGuiPlugin MODULE ${src})
|
||||
NGL_TARGET_LINK_LIBRARIES(ThpUsbManagementGuiPlugin
|
||||
ThpCommon
|
||||
TpmGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt5::Network
|
||||
Qt5::WebSockets
|
||||
Qt6::Widgets
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
NGLLogger
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
|
||||
+3
-2
@@ -8,6 +8,7 @@
|
||||
|
||||
|
||||
#include "ui_tpm_usb_dialog.h"
|
||||
#include <utility>
|
||||
#include "tpm_usb_dialog.h"
|
||||
|
||||
#include <Common/tpm_process_dialog.h>
|
||||
@@ -1081,7 +1082,7 @@ public:
|
||||
{
|
||||
QVector<int> ret;
|
||||
|
||||
for (const QJsonValue &val : qAsConst(m_presentationsArray))
|
||||
for (const QJsonValue &val : std::as_const(m_presentationsArray))
|
||||
{
|
||||
QJsonObject scriptObject(val.toObject());
|
||||
|
||||
@@ -1292,7 +1293,7 @@ void USBDialog::scriptCopied(int )
|
||||
|
||||
|
||||
|
||||
for (const int scriptId : qAsConst(usbScripts))
|
||||
for (const int scriptId : std::as_const(usbScripts))
|
||||
djh.removeScript(scriptId);
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -34,8 +34,8 @@ NGL_TARGET_LINK_LIBRARIES(Thp2Common
|
||||
PUBLIC
|
||||
Thp2CommonCore
|
||||
PRIVATE
|
||||
Qt5::Core
|
||||
Qt5::Concurrent
|
||||
Qt6::Core
|
||||
Qt6::Concurrent
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsUtilsCoreHeaderOnly
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(Thp2CommonCore
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(Thp2CommonCore
|
||||
PRIVATE
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
#NGLLogger
|
||||
LtsUtilsCoreHeaderOnly
|
||||
)
|
||||
|
||||
+3
-3
@@ -27,9 +27,9 @@ NGL_TARGET_LINK_LIBRARIES(Thp2ManagementGuiPlugin
|
||||
Thp2Common
|
||||
Thp2CommonCore
|
||||
Tpm2GuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt5::Network
|
||||
Qt5::WebSockets # get live changes from the server
|
||||
Qt6::Widgets
|
||||
Qt6::Network
|
||||
Qt6::WebSockets # get live changes from the server
|
||||
NGLLogger
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
|
||||
+3
-3
@@ -25,9 +25,9 @@ NGL_TARGET_LINK_LIBRARIES(Thp2UsbManagementGuiPlugin
|
||||
Thp2Common
|
||||
Thp2CommonCore
|
||||
Tpm2GuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt5::Network
|
||||
Qt5::Concurrent
|
||||
Qt6::Widgets
|
||||
Qt6::Network
|
||||
Qt6::Concurrent
|
||||
NGLLogger
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include <ui_tpm_usb2_dialog.h>
|
||||
#include <utility>
|
||||
#include "tpm_usb_dialog.h"
|
||||
|
||||
#include <Common2/tpm_file_copy.h>
|
||||
@@ -329,7 +330,7 @@ void USB2Dialog::slotUnmount()
|
||||
usbDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
|
||||
QStringList folderNames = usbDir.entryList();
|
||||
|
||||
for(const auto &folder : qAsConst(folderNames))
|
||||
for(const auto &folder : std::as_const(folderNames))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Folder: " << folder << " USB Root: " << m_usbRoot;
|
||||
|
||||
|
||||
Reference in new issue
Block a user