lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen

Browse Source 
- 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:
torstenandCopilot committed 2026-08-19 06:06:24 +02:00
1 parent 010f91928a
commit b774f4035c
2785 files changed
+18754 -18316
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp
+24 -25
View File
@@ -17,25 +17,24 @@ namespace ComponentMonitor
CheckmkHandler::CheckmkHandler()
: QObject()
, m_socket(new QTcpSocket(this))
, m_logger(getLogger("CheckmkHandler"))
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
CheckmkHandler::~CheckmkHandler()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
TRACE_LOG() << Q_FUNC_INFO << " START";
if (m_timer)
m_timer->stop();
delete m_socket;
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
TRACE_LOG() << Q_FUNC_INFO << " END";
}
bool CheckmkHandler::initialize(const QString &checkMkServerHostname, int checkMkServerPort,
int checkIntervalSec)
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " START"
DEBUG_LOG() << Q_FUNC_INFO << " START"
<< " , hostname=" << checkMkServerHostname
<< " , port=" << checkMkServerPort
<< " , m_checkIntervalSec=" << checkIntervalSec;
@@ -59,22 +58,22 @@ bool CheckmkHandler::initialize(const QString &checkMkServerHostname, int checkM
this, &CheckmkHandler::onConnected);
connect(m_socket, &QTcpSocket::readyRead, this, &CheckmkHandler::readData);
INFO_LOG(m_logger) << LOGFUNCTION << " END";
INFO_LOG() << Q_FUNC_INFO << " END";
return true;
}
void CheckmkHandler::run()
{
INFO_LOG(m_logger) << LOGFUNCTION << " START";
INFO_LOG() << Q_FUNC_INFO << " START";
m_timer->start();
INFO_LOG(m_logger) << LOGFUNCTION << " END";
INFO_LOG() << Q_FUNC_INFO << " END";
}
void CheckmkHandler::stop()
{
INFO_LOG(m_logger) << LOGFUNCTION << " START";
INFO_LOG() << Q_FUNC_INFO << " START";
m_timer->stop();
INFO_LOG(m_logger) << LOGFUNCTION << " END";
INFO_LOG() << Q_FUNC_INFO << " END";
}
void CheckmkHandler::onTimeout()
@@ -87,7 +86,7 @@ void CheckmkHandler::onTimeout()
m_timer->setInterval(m_checkIntervalSec*1000);
}
INFO_LOG(m_logger) << LOGFUNCTION << " Timeout, m_highFrequencyCheck=" << m_highFrequencyCheck
INFO_LOG() << Q_FUNC_INFO << " Timeout, m_highFrequencyCheck=" << m_highFrequencyCheck
<< ", current Interval=" << m_timer->interval() << " [msec]";
if (m_socket->state() == QAbstractSocket::SocketState::ConnectedState)
@@ -100,37 +99,37 @@ void CheckmkHandler::onTimeout()
bool CheckmkHandler::doConnect()
{
INFO_LOG(m_logger) << LOGFUNCTION << " START, (int)m_socket->state()=" << (int)m_socket->state();
INFO_LOG() << Q_FUNC_INFO << " START, (int)m_socket->state()=" << (int)m_socket->state();
m_socket->connectToHost(m_checkMkHost, m_checkMkPort);
if (!m_socket->waitForConnected(5000))
{
ERROR_LOG(m_logger) << LOGFUNCTION << " Could not (re)open tcp destination " << m_checkMkHost << ":" << m_checkMkPort << ", error: " << m_socket->errorString();
ERROR_LOG() << Q_FUNC_INFO << " Could not (re)open tcp destination " << m_checkMkHost << ":" << m_checkMkPort << ", error: " << m_socket->errorString();
return false;
}
INFO_LOG(m_logger) << LOGFUNCTION << " (Re)openend tcp destination " << m_checkMkHost << ":" << m_checkMkPort;
INFO_LOG() << Q_FUNC_INFO << " (Re)openend tcp destination " << m_checkMkHost << ":" << m_checkMkPort;
INFO_LOG(m_logger) << LOGFUNCTION << " END";
INFO_LOG() << Q_FUNC_INFO << " END";
return true;
}
void CheckmkHandler::onImmediateGetStateRequested()
{
INFO_LOG(m_logger) << LOGFUNCTION << " START";
INFO_LOG() << Q_FUNC_INFO << " START";
m_highFrequencyCheck = 3;
onTimeout();
INFO_LOG(m_logger) << LOGFUNCTION << " END";
INFO_LOG() << Q_FUNC_INFO << " END";
}
bool CheckmkHandler::writeGetStateRequest()
{
if (!m_socket->isOpen())
{
ERROR_LOG(m_logger) << LOGFUNCTION << " socket not open";
ERROR_LOG() << Q_FUNC_INFO << " socket not open";
return false;
}
@@ -161,16 +160,16 @@ bool CheckmkHandler::writeGetStateRequest()
const char* cmdCheck = "GET hosts\nResponseHeader: fixed16\nColumns: name state last_check \nKeepAlive: on\n\n";
int bWritten = m_socket->write(cmdCheck);
INFO_LOG(m_logger) << LOGFUNCTION << " cmdCheck= '" << cmdCheck << "'";
INFO_LOG() << Q_FUNC_INFO << " cmdCheck= '" << cmdCheck << "'";
INFO_LOG(m_logger) << LOGFUNCTION << " bWritten= " << bWritten;
INFO_LOG() << Q_FUNC_INFO << " bWritten= " << bWritten;
return true;
}
void CheckmkHandler::readData()
{
DEBUG_LOG(m_logger) << LOGFUNCTION << " XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
DEBUG_LOG() << Q_FUNC_INFO << " XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
while (m_socket->canReadLine())
processLine(m_socket->readLine().trimmed());
@@ -205,10 +204,10 @@ bool CheckmkHandler::processLine(const QByteArray &line)
if (sl.size() < 2)
{
if (str.startsWith(QStringLiteral("200")))
DEBUG_LOG(m_logger) << LOGFUNCTION << " size to small " << sl.size()
DEBUG_LOG() << Q_FUNC_INFO << " size to small " << sl.size()
<< ", line='" << str << "'";
else
WARNING_LOG(m_logger) << LOGFUNCTION << " size to small " << sl.size()
WARNING_LOG() << Q_FUNC_INFO << " size to small " << sl.size()
<< ", line='" << str << "'";
return false;
}
@@ -239,7 +238,7 @@ bool CheckmkHandler::processLine(const QByteArray &line)
lastCheck = lastCheckStr.toLongLong();
}
DEBUG_LOG(m_logger) << LOGFUNCTION
DEBUG_LOG() << Q_FUNC_INFO
<< " name: '" << name << "'"
<< ", stateInt: '" << stateInt << "'"
<< ", reachable: '" << reachable << "'"