BUILD_RTI=OFF: 1902/1902 Targets erfolgreich, DDS-Stubs vervollständigt
Neue Stub-Header für BUILD_RTI=OFF Konfiguration: - include/DDS/Generic/generic_base.h: Topic-Name-Templates, Helper-Funktionen - include/DDS/Generic/generic_logger.h: Logger-Wrapper mit DataType-Enum - include/DDS/Generic/ddsgen_export.h: Export-Makros (leer für OFF) - include/DDS/Generic/generic_data_reader.h: Data Reader Template-Stub - include/DDS/DTC/generic_dtc.h: Minimale DDS-Typen für DTC - include/LtsUtils/LtsUtilsCore/data_modification_enum.h: DataModification Enum - include/FileManagement/flm_dtc_impl.h: Virtuelle Methoden für Name-Helper - include/OperatorManagement/opm_dtc_impl.h: DtcImpl ohne Q_OBJECT Wichtige Änderungen: - QObject-Basisklasse entfernt für DatabaseInterfaceImpl und DtcImpl (BUILD_RTI=OFF) - Logger-Stub verwendet Qt-Logging (qDebug/qWarning/qCritical) - FileStatus als int-Alias statt enum class für BUILD_RTI=OFF - CMake: DDS-Bibliotheken als leere INTERFACE-Targets für BUILD_RTI=OFF - std::optional: is_set() → has_value(), get() → value() - QList → std::vector Konversionen korrigiert - qAsConst-Fehler mit rvalue expressions behoben Build-Status: 1902/1902 Targets erfolgreich (BUILD_RTI=OFF) Tests: Nicht ausführbar ohne RTI Connext DDS (BUILD_RTI=ON erforderlich)
This commit is contained in:
1 parent
eafbbbbbe9
commit
851d47e114
17 files changed
+606
-40
No files matched your search
@@ -7,6 +7,7 @@
|
||||
*/
|
||||
|
||||
#include "flm_db_impl_custom.h"
|
||||
#include <FileManagement/flm_db_impl.h>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
#include <ngldb/sql_query_janitor.h>
|
||||
#include <QtCore/QRegularExpression>
|
||||
@@ -59,9 +60,9 @@ bool DatabaseInterfaceImplCustom::updateStatus(int fileId, const FileStatus &sta
|
||||
|
||||
DEBUG_LOG(m_logger) << "File name before = " << fileName;
|
||||
|
||||
if (status.underlying() == 1) // Delete
|
||||
if (status == 1) // Delete
|
||||
fileName = QStringLiteral("{")+QString::number(fileId)+QStringLiteral("}_")+fileName;
|
||||
if (status.underlying() == 0 && fileName.startsWith(QStringLiteral("{"))) // Restore
|
||||
if (status == 0 && fileName.startsWith(QStringLiteral("{"))) // Restore
|
||||
fileName.remove(QRegularExpression(QStringLiteral("^[{](\\d+)[}][_]")));
|
||||
|
||||
DEBUG_LOG(m_logger) << "File name after = " << fileName;
|
||||
@@ -76,7 +77,7 @@ bool DatabaseInterfaceImplCustom::updateStatus(int fileId, const FileStatus &sta
|
||||
}
|
||||
|
||||
m_query->bindValue(QStringLiteral(":id"), fileId);
|
||||
m_query->bindValue(QStringLiteral(":st"), status.underlying());
|
||||
m_query->bindValue(QStringLiteral(":st"), static_cast<int>(status));
|
||||
m_query->bindValue(QStringLiteral(":opId"), operatorId);
|
||||
m_query->bindValue(QStringLiteral(":lastMod"), QDateTime::currentMSecsSinceEpoch());
|
||||
m_query->bindValue(QStringLiteral(":name"), fileName);
|
||||
|
||||
Reference in new issue
Block a user