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
@@ -50,7 +50,7 @@ bool ScreenRecordingDialog::init(LtsSession::LtsSession *session)
|
||||
|
||||
if (m_baseLayoutPtr == nullptr)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "base layout is nullptr";
|
||||
ERROR_LOG() << "base layout is nullptr";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -79,7 +79,6 @@ private slots:
|
||||
|
||||
private:
|
||||
Ui::ScreenRecordingDialog *m_ui{nullptr};
|
||||
NGL::INGLLogger &m_logger;
|
||||
LtsWidgets::LtsBaseLayoutWidget *m_baseLayoutPtr{nullptr};
|
||||
QWidget *m_recAreaWidget{nullptr};
|
||||
|
||||
|
||||
+7
-7
@@ -188,7 +188,7 @@ bool ScreenRecordingWorker::takeScreenshot(const QFileInfo &fileInfo, LtsWidgets
|
||||
{
|
||||
if (!s_imageFormats.contains(fileInfo.suffix()))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "file format not supported (must be .jpg, .jpeg or .png)";
|
||||
DEBUG_LOG() << "file format not supported (must be .jpg, .jpeg or .png)";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -205,7 +205,7 @@ bool ScreenRecordingWorker::takeScreenshot(const QFileInfo &fileInfo, LtsWidgets
|
||||
|
||||
if (!proc->waitForStarted())
|
||||
{
|
||||
ERROR_LOG(m_logger) << QLatin1String("Could not start process '") + EXECUTABLE
|
||||
ERROR_LOG() << QLatin1String("Could not start process '") + EXECUTABLE
|
||||
+ QLatin1String("' with arguments '") + args.join(QLatin1String("', '")) + QLatin1String("'\n");
|
||||
proc->deleteLater();
|
||||
return false;
|
||||
@@ -213,7 +213,7 @@ bool ScreenRecordingWorker::takeScreenshot(const QFileInfo &fileInfo, LtsWidgets
|
||||
|
||||
if (!proc->waitForFinished())
|
||||
{
|
||||
ERROR_LOG(m_logger) << QLatin1String("Could not finish process '") + EXECUTABLE
|
||||
ERROR_LOG() << QLatin1String("Could not finish process '") + EXECUTABLE
|
||||
+ QLatin1String("' with arguments '") + args.join(QLatin1String("', '")) + QLatin1String("'\n");
|
||||
proc->deleteLater();
|
||||
return false;
|
||||
@@ -226,7 +226,7 @@ bool ScreenRecordingWorker::stopRecording()
|
||||
{
|
||||
if (!m_isBusy)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "no running process";
|
||||
DEBUG_LOG() << "no running process";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -247,13 +247,13 @@ bool ScreenRecordingWorker::onStartRecording(const RecordingData &data)
|
||||
{
|
||||
if (m_isBusy)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "process is already running";
|
||||
DEBUG_LOG() << "process is already running";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (data.filePath.suffix() != s_videoFormat)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "file format not supported (must be .mp4)";
|
||||
DEBUG_LOG() << "file format not supported (must be .mp4)";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -263,7 +263,7 @@ bool ScreenRecordingWorker::onStartRecording(const RecordingData &data)
|
||||
|
||||
if (!m_recProc->waitForStarted())
|
||||
{
|
||||
ERROR_LOG(m_logger) << QLatin1String("Could not start process '") + EXECUTABLE
|
||||
ERROR_LOG() << QLatin1String("Could not start process '") + EXECUTABLE
|
||||
+ QLatin1String("' with arguments '") + data.toStringList().join(QLatin1String("', '")) + QLatin1String("'\n");
|
||||
m_recProc->deleteLater();
|
||||
m_isBusy = false;
|
||||
|
||||
-1
@@ -102,7 +102,6 @@ public slots:
|
||||
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
QProcess *m_recProc{nullptr};
|
||||
bool m_isBusy{false};
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user