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
-1
@@ -9,7 +9,7 @@
|
||||
#include <OperatorManagement/opm_dtc.h>
|
||||
#include <LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
#include <Plugins/OperatorManagement/Gui/Common/opmchangepasswordgui_export.h>
|
||||
#include <Lts/Plugins/OperatorManagement/Gui/Common/opmchangepasswordgui_export.h>
|
||||
|
||||
namespace Ui {
|
||||
class OperatorChangePassword;
|
||||
|
||||
-1
@@ -35,7 +35,6 @@ OperatorManagementDialogModel::OperatorManagementDialogModel(QObject *parent, in
|
||||
, m_dtc(nullptr)
|
||||
, m_ppmDtc(nullptr)
|
||||
, m_exmDtc(nullptr)
|
||||
, m_logger(getLogger("OpeartorManagementDialogModel"))
|
||||
, m_exerciseId(exerciseId)
|
||||
{}
|
||||
|
||||
|
||||
+1
-2
@@ -10,7 +10,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <Plugins/OperatorManagement/Gui/Common/opmchangepasswordgui_export.h>
|
||||
#include <Lts/Plugins/OperatorManagement/Gui/Common/opmchangepasswordgui_export.h>
|
||||
|
||||
namespace OperatorManagement
|
||||
{
|
||||
@@ -66,7 +66,6 @@ private:
|
||||
QMap<int,QString> m_parties;
|
||||
QMap<int,QString> m_exercises;
|
||||
QMap<int,QString> m_roles;
|
||||
LOGGER_T m_logger;
|
||||
int m_exerciseId;
|
||||
};
|
||||
|
||||
|
||||
+1
-2
@@ -15,7 +15,6 @@ namespace OperatorManagement
|
||||
RemoteShutdownDialog::RemoteShutdownDialog(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_ui(new Ui::RemoteShutdownDialog)
|
||||
, m_logger(getLogger("ShutdownDialog"))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_trvWorkstations(nullptr)
|
||||
, m_trvModel(nullptr)
|
||||
@@ -42,7 +41,7 @@ bool RemoteShutdownDialog::init(const std::shared_ptr<AssetManagement::Interface
|
||||
const std::shared_ptr<AssetManagement::Interface::Dtc> &asmDtc)
|
||||
{
|
||||
int thisWsId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId();
|
||||
DEBUG_LOG(m_logger) << "ws id = " << thisWsId;
|
||||
DEBUG_LOG() << "ws id = " << thisWsId;
|
||||
|
||||
if (thisWsId <= 0 || asmFtc == nullptr)
|
||||
return false;
|
||||
|
||||
-1
@@ -13,7 +13,6 @@ AclDialog::AclDialog(QWidget *parent)
|
||||
, m_ui(new Ui::AclDialog)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_logger(getLogger("AclDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-1
@@ -35,7 +35,6 @@ private:
|
||||
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
|
||||
-1
@@ -17,7 +17,6 @@ AclDialogModel::AclDialogModel(QObject *parent)
|
||||
parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_logger(getLogger("AccessControlLevelDialogModel"))
|
||||
{}
|
||||
|
||||
AclDialogModel::~AclDialogModel()
|
||||
|
||||
-1
@@ -29,6 +29,5 @@ public:
|
||||
private:
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
-1
@@ -20,7 +20,6 @@ GroupEditDialog::GroupEditDialog(QWidget *parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_model(nullptr)
|
||||
, m_logger(getLogger("GroupEditDialog"))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
-1
@@ -64,7 +64,6 @@ class GroupEditDialog
|
||||
std::shared_ptr<Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<Interface::Ftc> m_ftc;
|
||||
MembershipModel *m_model;
|
||||
LOGGER_T m_logger;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
};
|
||||
|
||||
|
||||
-1
@@ -20,7 +20,6 @@ GroupModel::GroupModel(QObject *parent)
|
||||
parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_hideHidden(false)
|
||||
, m_logger(getLogger("GroupManagementDialogModel"))
|
||||
{}
|
||||
|
||||
GroupModel::~GroupModel()
|
||||
|
||||
-1
@@ -41,6 +41,5 @@ protected:
|
||||
private:
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
|
||||
bool m_hideHidden;
|
||||
LOGGER_T m_logger;
|
||||
};
|
||||
}
|
||||
+1
-2
@@ -23,7 +23,6 @@ OperatorDialog::OperatorDialog(const QString &menuGroup, QWidget *parent)
|
||||
, m_ui(new Ui::OperatorDialog)
|
||||
, m_ftc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("OperatorDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -121,7 +120,7 @@ void OperatorDialog::onEditOperator()
|
||||
|
||||
if (op.id() <= 0)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "current Operator Id: " << op.id();
|
||||
DEBUG_LOG() << "current Operator Id: " << op.id();
|
||||
|
||||
OperatorEditDialog *dialog = new OperatorEditDialog(op.id(), m_session, m_menuGroup, this);
|
||||
const QString identifier = QLatin1String("EditOperator") + QString::number(op.id());
|
||||
|
||||
-3
@@ -51,9 +51,6 @@ private:
|
||||
LtsSession::LtsSession *m_session;
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private slots:
|
||||
void enaDisa();
|
||||
void onRemoveOperator();
|
||||
|
||||
+6
-7
@@ -44,7 +44,6 @@ OperatorEditDialog::OperatorEditDialog(const int operatorId,
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_ui(new Ui::OperatorEditDialog)
|
||||
, m_logger(getLogger("operatorManangementEditDialog"))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
@@ -171,7 +170,7 @@ bool OperatorEditDialog::operatorCreateModify(const OperatorCreateModifyRequest
|
||||
return false;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "req.name: " << req.name();
|
||||
DEBUG_LOG() << "req.name: " << req.name();
|
||||
return m_requestHelper->startSingleRequest([this, req]()
|
||||
{
|
||||
return m_ftc->operatorCreateModifyRequest(req, this);
|
||||
@@ -366,7 +365,7 @@ bool OperatorEditDialog::apply()
|
||||
const QVector<int> visiblePartyIds = m_visiblePartiesModel->getCheckedIds();
|
||||
std::vector<OperatorManagement::PartiesByExercise> vpbe;
|
||||
PartiesByExercise pbe;
|
||||
DEBUG_LOG(m_logger) << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
DEBUG_LOG() << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
pbe.exerciseId(0);
|
||||
pbe.visibleParties().set({});
|
||||
std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(pbe.visibleParties().get()));
|
||||
@@ -403,7 +402,7 @@ bool OperatorEditDialog::apply()
|
||||
const QVector<int> visiblePartyIds = m_visiblePartiesModel->getCheckedIds();
|
||||
std::vector<OperatorManagement::PartiesByExercise> vpbe;
|
||||
PartiesByExercise pbe;
|
||||
DEBUG_LOG (m_logger) << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
DEBUG_LOG() << "----------------- m_session.exerciseId:" << m_session->exerciseId();
|
||||
pbe.exerciseId(0);
|
||||
pbe.visibleParties().set({});
|
||||
std::copy(visiblePartyIds.begin(), visiblePartyIds.end(), std::back_inserter(pbe.visibleParties().get()));
|
||||
@@ -461,7 +460,7 @@ void OperatorEditDialog::createFolders()
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "User Folder created with id = " << folderId;
|
||||
DEBUG_LOG() << "User Folder created with id = " << folderId;
|
||||
|
||||
#ifdef GUEZ_MODE
|
||||
|
||||
@@ -474,7 +473,7 @@ void OperatorEditDialog::createFolders()
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "User Subfolder created with id = " << subFolderId;
|
||||
DEBUG_LOG() << "User Subfolder created with id = " << subFolderId;
|
||||
#endif
|
||||
|
||||
LtsWidgets::LtsMessageDialog::showMessage(this, tr("User folders successfully created"));
|
||||
@@ -500,7 +499,7 @@ int OperatorEditDialog::createFolder(int parentFolderId, const QString &folderNa
|
||||
return m_flmFtc->folderModifyRequest(req, this);
|
||||
});
|
||||
|
||||
DEBUG_LOG(m_logger) << "Created folder id = " << m_requestHelper->getRepliedId();
|
||||
DEBUG_LOG() << "Created folder id = " << m_requestHelper->getRepliedId();
|
||||
|
||||
return m_requestHelper->getRepliedId();
|
||||
}
|
||||
|
||||
-1
@@ -87,7 +87,6 @@ private:
|
||||
std::shared_ptr<FileManagement::Interface::Ftc> m_flmFtc;
|
||||
|
||||
Ui::OperatorEditDialog *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
void getProfilePicture();
|
||||
|
||||
-1
@@ -18,7 +18,6 @@ PresetDialog::PresetDialog(const QString &menuGroup, QWidget *parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_ftc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("PresetDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-2
@@ -45,8 +45,6 @@ private:
|
||||
std::shared_ptr<OperatorManagement::Interface::Dtc> m_dtc;
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private slots:
|
||||
void enaDisa();
|
||||
void onRemoveGroup();
|
||||
|
||||
-1
@@ -22,7 +22,6 @@ OperatorOverviewDialog::OperatorOverviewDialog(const QString &windowTitle, QWidg
|
||||
, m_ui(new Ui::OperatorOverviewDialog)
|
||||
, m_ftc(nullptr)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_logger(getLogger("OperatorDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &OperatorOverviewDialog::onPrint);
|
||||
|
||||
-3
@@ -46,9 +46,6 @@ private:
|
||||
LtsSession::LtsSession *m_session;
|
||||
std::shared_ptr<OperatorManagement::Interface::Ftc> m_ftc;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
|
||||
LOGGER_T m_logger;
|
||||
|
||||
private Q_SLOTS:
|
||||
void onPrint();
|
||||
|
||||
|
||||
+5
-6
@@ -16,7 +16,6 @@ SettingsGroup::SettingsGroup(const QString &group, const QString &id, SubSetHand
|
||||
, m_id(id)
|
||||
, m_subSetHandler(handler)
|
||||
, m_opSettings(opSettings)
|
||||
, m_logger(getLogger("SettingsGroup"))
|
||||
{
|
||||
m_logger.setNoSpace(false);
|
||||
}
|
||||
@@ -26,7 +25,7 @@ bool SettingsGroup::init()
|
||||
if (!m_subSetHandler || !m_opSettings)
|
||||
{
|
||||
|
||||
ERROR_LOG(m_logger) << " SettingsGroup::init() failed. this=" << this
|
||||
ERROR_LOG() << " SettingsGroup::init() failed. this=" << this
|
||||
<< ", typeid.name='" << typeid(*this).name()
|
||||
<< ", m_id='" << m_id
|
||||
<< ", m_group='" << m_group;
|
||||
@@ -72,7 +71,7 @@ void SettingsGroup::startLoad()
|
||||
#else
|
||||
if (!m_subSetHandler)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " SettingsGroup::startLoad() : no m_subSetHandler. this=" << this
|
||||
ERROR_LOG() << " SettingsGroup::startLoad() : no m_subSetHandler. this=" << this
|
||||
<< ", typeid.name='" << typeid(*this).name()
|
||||
<< ", m_id='" << m_id
|
||||
<< ", m_group='" << m_group;
|
||||
@@ -94,19 +93,19 @@ void SettingsGroup::startSave()
|
||||
return;
|
||||
for (SubSet &subset : m_subsets)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "saving11 subset for group: " << m_group
|
||||
DEBUG_LOG() << "saving11 subset for group: " << m_group
|
||||
<< ", id:" << m_id
|
||||
<< ", subset.name=" << subset.name
|
||||
<< ", subset.data=" << subset.data.toString();
|
||||
|
||||
bool saveSubSetOk = m_subSetHandler->saveSubSet(subset);
|
||||
if (!saveSubSetOk)
|
||||
WARNING_LOG(m_logger) << "saving22 subset failed for group: " << m_group
|
||||
WARNING_LOG() << "saving22 subset failed for group: " << m_group
|
||||
<< ", id:" << m_id
|
||||
<< ", subset.name=" << subset.name
|
||||
<< ", subset.data=" << subset.data.toString();
|
||||
else
|
||||
DEBUG_LOG(m_logger) << "saving22 subset for group: " << m_group
|
||||
DEBUG_LOG() << "saving22 subset for group: " << m_group
|
||||
<< ", id:" << m_id
|
||||
<< ", subset.name=" << subset.name
|
||||
<< ", subset.data=" << subset.data.toString();
|
||||
|
||||
+1
-3
@@ -98,9 +98,7 @@ protected:
|
||||
SubSetHandler *m_subSetHandler;
|
||||
QJsonObject m_data;
|
||||
QVector<SubSet> m_subsets;
|
||||
LtsUtils::OperatorSettings *m_opSettings;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
LtsUtils::OperatorSettings *m_opSettings;
|
||||
};
|
||||
|
||||
|
||||
|
||||
+12
-13
@@ -39,13 +39,12 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
|
||||
, m_opSettings(LtsUtils::OperatorSettings::getInstance())
|
||||
, m_timer(new QTimer(this))
|
||||
, m_ui(new Ui::OperatorSettingsDialog)
|
||||
, m_logger(getLogger("Plugins.Gui.Opm.SettingsDialog"))
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_session(session)
|
||||
, m_workspaceMap(nullptr)
|
||||
, m_filterMap(nullptr)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
@@ -60,7 +59,7 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
|
||||
connect(m_ui->pbDEBUGNewWsID, &QPushButton::clicked, this, [this]()
|
||||
{
|
||||
const QString newId(QUuid::createUuid().toString());
|
||||
ERROR_LOG(m_logger) << "new WsId" << newId;
|
||||
ERROR_LOG() << "new WsId" << newId;
|
||||
m_session->setWorkspaceId(newId);
|
||||
});
|
||||
}
|
||||
@@ -147,17 +146,17 @@ OperatorSettingsDialog::OperatorSettingsDialog(LtsSession::LtsSession *session,
|
||||
connect(m_ui->cbScriptsHideOnDrag, &QCheckBox::toggled, m_timer, static_cast<void (QTimer::*)(void)>(&QTimer::start));
|
||||
m_ui->cbScriptsHideOnDrag->setChecked(m_opSettings->value(QStringLiteral("Scripts"), QStringLiteral("HideOnDrag"), true).toBool());
|
||||
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
OperatorSettingsDialog::~OperatorSettingsDialog()
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " START";
|
||||
if (m_timer->isActive())
|
||||
onTimerTimeout();
|
||||
delete m_ui;
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
|
||||
TRACE_LOG() << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
|
||||
@@ -259,7 +258,7 @@ void OperatorSettingsDialog::onWorkspaceLoad()
|
||||
QString workspaceId = m_ui->cbWorkspaces->currentData().toString();
|
||||
if (workspaceId.compare(QUuid().toString()) == 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Tried to load a Workspace with Null-Uuid! ... skipping";
|
||||
WARNING_LOG() << "Tried to load a Workspace with Null-Uuid! ... skipping";
|
||||
m_ui->cbWorkspaces->setCurrentIndex(0);
|
||||
return;
|
||||
}
|
||||
@@ -298,7 +297,7 @@ void OperatorSettingsDialog::onWorkspaceOverwrite()
|
||||
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " emit signalOverwriteWorkspace: "
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " emit signalOverwriteWorkspace: "
|
||||
<< " workspaceId= '" << workspaceId << "'"
|
||||
<< " workspaceName= '" << workspaceName << "'";
|
||||
emit signalOverwriteWorkspace(workspaceId, workspaceName, QString());
|
||||
@@ -325,7 +324,7 @@ void OperatorSettingsDialog::onWorkspacesComboboxIndexChanged(int index)
|
||||
{
|
||||
const QString &wspId = m_ui->cbWorkspaces->itemData(index).toString();
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: '" << wspId << "'"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: '" << wspId << "'"
|
||||
<< " itemText: '" << m_ui->cbWorkspaces->itemText(index) << "'";
|
||||
|
||||
if (!m_workspaceMap->contains(wspId) || m_workspaceMap->value(wspId)->data().isEmpty())
|
||||
@@ -371,7 +370,7 @@ void OperatorSettingsDialog::onFilterPresetLoad()
|
||||
QString filterPresetId = m_ui->cbFilterPresets->currentData().toString();
|
||||
if (filterPresetId.compare(QUuid().toString()) == 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Tried to load a FilterPreset with Null-Uuid! ... skipping";
|
||||
WARNING_LOG() << "Tried to load a FilterPreset with Null-Uuid! ... skipping";
|
||||
m_ui->cbFilterPresets->setCurrentIndex(0);
|
||||
return;
|
||||
}
|
||||
@@ -452,7 +451,7 @@ void OperatorSettingsDialog::onFilterPresetDelete()
|
||||
void OperatorSettingsDialog::onFilterPresetsComboboxIndexChanged(int index)
|
||||
{
|
||||
const QString &id = m_ui->cbFilterPresets->itemData(index).toString();
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << " id: '" << id << "'"
|
||||
DEBUG_LOG() << Q_FUNC_INFO << " id: '" << id << "'"
|
||||
<< " itemText: '" << m_ui->cbFilterPresets->itemText(index) << "'";
|
||||
|
||||
m_ui->pbLoadFilterPreset->setProperty(DISABLE_FAST_CLICKS_PROPERTY, QVariant());
|
||||
@@ -499,13 +498,13 @@ void OperatorSettingsDialog::updateCombobox(QComboBox *cbx, const QMap<QString,
|
||||
const QJsonObject &mapValue = it.value()->data();
|
||||
if (mapValue.isEmpty())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Entry with Id: " << it.key() << " has empty data! ... skipping this entry";
|
||||
WARNING_LOG() << "Entry with Id: " << it.key() << " has empty data! ... skipping this entry";
|
||||
continue;
|
||||
}
|
||||
QString name = mapValue.value(QStringLiteral("name")).toString();
|
||||
if (name.isEmpty())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Entry with Id: " << it.key() << " has empty name! ... skipping this entry";
|
||||
WARNING_LOG() << "Entry with Id: " << it.key() << " has empty name! ... skipping this entry";
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -120,7 +120,6 @@ private:
|
||||
LtsUtils::OperatorSettings *m_opSettings;
|
||||
QTimer *m_timer;
|
||||
Ui::OperatorSettingsDialog *m_ui;
|
||||
LOGGER_T m_logger;
|
||||
LtsUtils::RequestHelper *m_requestHelper;
|
||||
LtsSession::LtsSession *m_session;
|
||||
QPixmap m_operatorPixmap;
|
||||
|
||||
Reference in new issue
Block a user