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
+13
-13
@@ -48,7 +48,7 @@ bool VncServerManager::init(const QList<QScreen *> &screens)
|
||||
|
||||
const auto sortedScreens = sortScreen(screens);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Setup VNCScreens with " << screens.size() << " screens";
|
||||
DEBUG_LOG() << "Setup VNCScreens with " << screens.size() << " screens";
|
||||
|
||||
int count = 1;
|
||||
|
||||
@@ -77,13 +77,13 @@ bool VncServerManager::init(const QList<QScreen *> &screens)
|
||||
count++;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << m_vncScreens.size() << " VNCScreen(s) created - Setup completed.";
|
||||
DEBUG_LOG() << m_vncScreens.size() << " VNCScreen(s) created - Setup completed.";
|
||||
return true;
|
||||
}
|
||||
|
||||
void VncServerManager::startScreens()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Starting " << m_vncScreens.size() << " VNCScreen(s) ... ";
|
||||
DEBUG_LOG() << "Starting " << m_vncScreens.size() << " VNCScreen(s) ... ";
|
||||
for (const VncScreen &s : std::as_const(m_vncScreens))
|
||||
{
|
||||
connect(s.proc, &QProcess::readyReadStandardOutput,
|
||||
@@ -95,16 +95,16 @@ void VncServerManager::startScreens()
|
||||
for (const VncScreen &s : std::as_const(m_vncScreens))
|
||||
{
|
||||
if (!s.proc->waitForStarted(2000))
|
||||
ERROR_LOG(m_logger) << "Can not start process '" << s.proc->program() << "': "
|
||||
ERROR_LOG() << "Can not start process '" << s.proc->program() << "': "
|
||||
<< s.proc->errorString();
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Done";
|
||||
DEBUG_LOG() << "Done";
|
||||
}
|
||||
|
||||
|
||||
void VncServerManager::stopScreens()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Stopping " << m_vncScreens.size() << " VNCScreen(s) ...";
|
||||
DEBUG_LOG() << "Stopping " << m_vncScreens.size() << " VNCScreen(s) ...";
|
||||
|
||||
for (const VncScreen &s : std::as_const(m_vncScreens))
|
||||
{
|
||||
@@ -116,28 +116,28 @@ void VncServerManager::stopScreens()
|
||||
if (!s.proc->waitForFinished(2000))
|
||||
s.proc->kill();
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Done";
|
||||
DEBUG_LOG() << "Done";
|
||||
}
|
||||
|
||||
|
||||
void VncServerManager::killScreens()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Killing all exisiting x11vnc processes ...";
|
||||
DEBUG_LOG() << "Killing all exisiting x11vnc processes ...";
|
||||
|
||||
SingleShotProcess ssp(QStringLiteral("killall x11vnc"));
|
||||
ssp.execute();
|
||||
DEBUG_LOG(m_logger) << "Done";
|
||||
DEBUG_LOG() << "Done";
|
||||
}
|
||||
|
||||
|
||||
void VncServerManager::createPwdFile()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "(Re)creating x11vnc password-file ...";
|
||||
DEBUG_LOG() << "(Re)creating x11vnc password-file ...";
|
||||
|
||||
SingleShotProcess ssp(QStringLiteral("x11vnc -storepasswd ctc11de %1/.vnc/passwd")
|
||||
.arg(QDir::home().absolutePath()));
|
||||
ssp.execute();
|
||||
DEBUG_LOG(m_logger) << "Done";
|
||||
DEBUG_LOG() << "Done";
|
||||
}
|
||||
|
||||
|
||||
@@ -151,7 +151,7 @@ void VncServerManager::slotReadStandardOutput()
|
||||
QRegularExpressionMatch match = QRegularExpression(QStringLiteral("PORT=(.*?)\\s")).match(stdOut);
|
||||
if (!match.hasMatch())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not retrieve port information from stdout of " << p->program();
|
||||
WARNING_LOG() << "Could not retrieve port information from stdout of " << p->program();
|
||||
return;
|
||||
}
|
||||
const quint16 port = match.capturedRef(1).toInt();
|
||||
@@ -172,7 +172,7 @@ void VncServerManager::slotErrorOccured()
|
||||
{
|
||||
QProcess *p = qobject_cast<QProcess *>(QObject::sender());
|
||||
if (p)
|
||||
ERROR_LOG(m_logger) << p->errorString();
|
||||
ERROR_LOG() << p->errorString();
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user