Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310

No files matched your search

@@ -17,8 +17,8 @@
//other
#include "awss_websocket_interface.h"
#include <QAction>
#include <QMenu>
#include <QtWidgets/QAction>
#include <QtWidgets/QMenu>
namespace AdlerWebSocketSimulator {
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QMainWindow>
#include <QtWidgets/QMainWindow>
#include "logger.h"
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include <QtCore/QMap>
#include "logger.h"
@@ -15,10 +15,10 @@
#include <QCheckBox>
#include <QInputDialog>
#include <QtCore/QJsonDocument>
#include <QLineEdit>
#include <QtWidgets/QLineEdit>
#include <QPushButton>
#include <QtCore/QString>
#include <QTime>
#include <QtCore/QTime>
#include <QVBoxLayout>
#include <AdlerJson/generatetelegrams.h>
@@ -9,7 +9,7 @@
#pragma once
#include <QtCore/QTimer>
#include <QWidget>
#include <QtWidgets/QWidget>
namespace Ui
{
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include "logger.h"
@@ -31,13 +31,13 @@
#include <nglapplication/nglcoreapplication.h>
#include <NGLLogger/INGLLogger.h>
#include <QFile>
#include <QtCore/QFile>
#include <QSaveFile>
#include <QtCore/QJsonDocument>
#include <QJsonParseError>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonArray>
#include <QTextStream>
#include <QtCore/QTextStream>
using namespace Botan;
@@ -29,7 +29,9 @@ ADD_SUBDIRECTORY(Splash)
ADD_SUBDIRECTORY(SqlBrowser)
ADD_SUBDIRECTORY(DateTimeSyncer)
ADD_SUBDIRECTORY(Times)
ADD_SUBDIRECTORY(TopicDiscover)
IF(BUILD_RTI)
ADD_SUBDIRECTORY(TopicDiscover)
ENDIF()
ADD_SUBDIRECTORY(VapixConfig)
ADD_SUBDIRECTORY(Automount)
ADD_SUBDIRECTORY(EgcuSimulator)
@@ -5,6 +5,8 @@
# Created by Hannes Fritsche, SLSE, 2017-09-05
#
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
SET(SRCS
mainwindow.cpp
mainwindow.h
@@ -2,12 +2,12 @@
#include "guez2018/guez2018.h"
#include <QApplication>
#include <QtWidgets/QApplication>
#include <QScreen>
#include <QPushButton>
#include <QMessageBox>
#include <QtWidgets/QMessageBox>
#include <QStyle>
#include <QFile>
#include <QtCore/QFile>
#include <QCheckBox>
#include <QProcess>
#include <QtCore/QDebug>
@@ -1,6 +1,6 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include <QtCore/QMap>
@@ -2,7 +2,7 @@
#include "configurator.h"
#include <QWidget>
#include <QtWidgets/QWidget>
namespace Ui
@@ -2,8 +2,8 @@
#include <unistd.h>
#include <QApplication>
#include <QMessageBox>
#include <QtWidgets/QApplication>
#include <QtWidgets/QMessageBox>
#include <QProcess>
#include <QtCore/QDebug>
@@ -5,6 +5,8 @@
# Created by Hanna Rathje, SLSE, 2017-12-14
#
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
SET(SRCS_copy
copy_exercise.cpp
copy_exercise.h
@@ -15,8 +15,8 @@
#include <ngltools/ngltools_filesystem.h>
#include <QProcess>
#include <QFile>
#include <QDir>
#include <QtCore/QFile>
#include <QtCore/QDir>
#include <QSqlError>
#include <QtCore/QVariant>
@@ -18,11 +18,11 @@
#include <nglsettings/nglsettings_settings.h>
#include <ngltools/ngltools_filesystem.h>
#include <QMessageBox>
#include <QtWidgets/QMessageBox>
#include <QtCore/QTimer>
#include <QMenu>
#include <QtWidgets/QMenu>
#include <QSettings>
#include <QDir>
#include <QtCore/QDir>
#include <QNetworkInterface>
#include <QHostInfo>
@@ -9,14 +9,14 @@
#pragma once
#include <QMainWindow>
#include <QtWidgets/QMainWindow>
#include <QtCore/QMap>
#include <QStandardItemModel>
#include <QtGui/QStandardItemModel>
#include <QtCore/QVector>
#include <QCloseEvent>
#include <QProcess>
#include <QProgressDialog>
#include <QMenuBar>
#include <QtWidgets/QMenuBar>
#include <QSqlDatabase>
#include "logger.h"
@@ -12,11 +12,11 @@
#include <ngldb/dbtransaction.h>
#include <QtCore/QVariant>
#include <QDir>
#include <QtCore/QDir>
#include <QDirIterator>
#include <QFile>
#include <QtCore/QFile>
#include <QSqlError>
#include <QTextStream>
#include <QtCore/QTextStream>
namespace DBAdministration
{
@@ -9,7 +9,7 @@
#include <QElapsedTimer>
#include <QtCore/QString>
#include <QStringList>
#include <QtCore/QStringList>
#include <QtCore/QMap>
#include <QSqlDatabase>
@@ -12,8 +12,8 @@
#include "logger.h"
#include <QAbstractTableModel>
#include <QSortFilterProxyModel>
#include <QtCore/QAbstractTableModel>
#include <QtCore/QSortFilterProxyModel>
class QSqlDatabase;
namespace DBAdministration
@@ -12,8 +12,8 @@
#include "logger.h"
#include <QAbstractTableModel>
#include <QSortFilterProxyModel>
#include <QtCore/QAbstractTableModel>
#include <QtCore/QSortFilterProxyModel>
class QSqlDatabase;
namespace DBAdministration
@@ -9,7 +9,7 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include "logger.h"
@@ -5,10 +5,10 @@
#include <QSqlRecord>
#include <QSqlError>
#include <QtCore/QVariant>
#include <QDataStream>
#include <QtCore/QDataStream>
#include <QtCore/QDebug>
#include <QtCore/QDateTime>
#include <QFile>
#include <QtCore/QFile>
/**
* This application needs two (2) arguments and would otherwise crash.
@@ -290,6 +290,8 @@ SET(UPDATES_QATARMOUT
NGL_WRAP_UI(SRCS ui/db_update.ui ui/show_history.ui)
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
NGL_ADD_EXECUTABLE(SV dbUpdate ${SRCS})
NGL_TARGET_LINK_LIBRARIES(dbUpdate
@@ -17,10 +17,10 @@
#include <nglsettings/nglsettings_settings.h>
#include <ngltools/ngltools_filesystem.h>
#include <QMessageBox>
#include <QtWidgets/QMessageBox>
#include <QtCore/QDateTime>
#include <QDir>
#include <QFileDialog>
#include <QtCore/QDir>
#include <QtWidgets/QFileDialog>
#include <QSqlError>
namespace DBUpdate
@@ -9,8 +9,8 @@
#pragma once
#include <QMainWindow>
#include <QStandardItemModel>
#include <QtWidgets/QMainWindow>
#include <QtGui/QStandardItemModel>
#include <QtCore/QVector>
#include <QSqlDatabase>
#include <QProcess>
@@ -13,7 +13,7 @@
#include <ngltools/ngltools_dtg.h>
#include <ngldb/nsqlquery.h>
#include <QColor>
#include <QtGui/QColor>
namespace DBUpdate
{
@@ -11,8 +11,8 @@
#include "logger.h"
#include <QAbstractTableModel>
#include <QSortFilterProxyModel>
#include <QtCore/QAbstractTableModel>
#include <QtCore/QSortFilterProxyModel>
#include <QSqlDatabase>
namespace DBUpdate
@@ -11,7 +11,7 @@
#include "global_updates_model.h"
#include <ngldb/nsqlquery.h>
#include <ngltools/ngltools_dtg.h>
#include <QStringList>
#include <QtCore/QStringList>
namespace DBUpdate
{
@@ -11,8 +11,8 @@
#include "logger.h"
#include <QAbstractTableModel>
#include <QSortFilterProxyModel>
#include <QtCore/QAbstractTableModel>
#include <QtCore/QSortFilterProxyModel>
#include <QSqlDatabase>
namespace DBUpdate
@@ -11,8 +11,8 @@
#include "logger.h"
#include <QAbstractTableModel>
#include <QSortFilterProxyModel>
#include <QtCore/QAbstractTableModel>
#include <QtCore/QSortFilterProxyModel>
#include <QSqlDatabase>
namespace DBUpdate
@@ -11,7 +11,7 @@
#include "logger.h"
#include "history_model.h"
#include <QWidget>
#include <QtWidgets/QWidget>
#include <QSqlDatabase>
namespace Ui {
@@ -18,7 +18,7 @@ NGL_TARGET_LINK_LIBRARIES(tDataSampleGenerator
Qt6::Core
ddsdts
ddsgen
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
svcExmCommon
svcPpmCommon
ProjectConfig
@@ -17,8 +17,8 @@
#include <ParticipantManagement/ppm.hpp>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QSet>
#include <QThread>
#include <QtCore/QSet>
#include <QtCore/QThread>
#include <QtCore/QVector>
#include <string>
@@ -20,7 +20,7 @@ NGL_TARGET_LINK_LIBRARIES(tDataSampleReceiver
Qt6::Core
ddsdtc
ddsgen
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
svcExmCommon
svcPpmCommon
ProjectConfig
@@ -16,7 +16,7 @@
#include <LtsPluginManager/lts_plugin_loader.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QSet>
#include <QtCore/QSet>
// static
static QVector<DDSGeneric::TopicDescription> getAvailableTopicTypes() // get topicTypes per plugin mechanism
@@ -10,7 +10,7 @@
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QTcpSocket>
#include <QThread>
#include <QtCore/QThread>
#include "tcp_server.h"
@@ -6,6 +6,8 @@
# CMakeLists.txt fuer DdsView
#
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
SET(ddsview_SRCS
detailview.cpp
detailviewdlg.cpp
@@ -68,7 +70,7 @@ NGL_ADD_TOOL_ICON(ddsview_SRCS "dds")
NGL_ADD_EXECUTABLE(ddsview TOOLSWS TOOLSSV NO_TRANSLATION WIN32 ${ddsview_SRCS} ${ddsview_UICS})
NGL_TARGET_LINK_LIBRARIES(ddsview
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
LtsCommandLineParser
LtsCoordTrans
ltsCoordWidget
@@ -9,7 +9,7 @@
#pragma once
#include <QDialog>
#include <QtWidgets/QDialog>
namespace Ui
{
@@ -15,18 +15,18 @@
#include "sequences/listsequencewidget.h"
#include <QGridLayout>
#include <QGroupBox>
#include <QtWidgets/QGroupBox>
#include <QtCore/QMap>
#include <QHBoxLayout>
#include <QTabWidget>
#include <QtWidgets/QTabWidget>
#include <QPushButton>
#include <QMouseEvent>
#include <QRegularExpression>
#include <QtCore/QRegularExpression>
#include <limits>
#include <functional>
#include <QMessageBox>
#include <QtWidgets/QMessageBox>
#include <LtsCoordTrans/lts_coord_trans.h>
#include "coorddetaildlg.h"
@@ -17,7 +17,7 @@
#include <DDS/QosProfile/DDS_DefaultQos.h>
#include <QInputDialog>
#include <QUrl>
#include <QtCore/QUrl>
class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
@@ -24,7 +24,7 @@
#include <TopicDiscover/topic_discoverer.h>
#include <LtsPluginManager/lts_plugin_loader.h>
#include <QMenuBar>
#include <QtWidgets/QMenuBar>
MainWindow::MainWindow(int domainId, int exerciseId, DDS::QosProfile::ConnectionType ct, const QUrl &tcpDiscoveryUrl, QWidget *parent)
: NGLMainWindow(parent)
@@ -15,7 +15,7 @@
#include <nglwidgets/nglmainwindow.h>
#include <DDS/DDSConnector/subscriber.h>
#include <QtCore/QVariant>
#include <QItemSelection>
#include <QtCore/QItemSelection>
namespace Ui
{
@@ -9,13 +9,13 @@
*/
#include "rwwidgets.h"
#include <QStackedWidget>
#include <QSpinBox>
#include <QtWidgets/QStackedWidget>
#include <QtWidgets/QSpinBox>
#include <QVBoxLayout>
#include <QCheckBox>
#include <QDoubleSpinBox>
#include <QLineEdit>
#include <QComboBox>
#include <QtWidgets/QDoubleSpinBox>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QComboBox>
#include <LtsWidgets/lts_bitfield_widget.h>
void MyLabel::mousePressEvent(QMouseEvent *ev)
@@ -66,7 +66,7 @@ RWWidget::RWWidget(QWidget *parent)
, m_editableWidget(nullptr)
{
QVBoxLayout *l = new QVBoxLayout(this);
l->setMargin(0);
l->setContentsMargins(0, 0, 0, 0);
l->setSpacing(0);
l->addWidget(m_stackedWidget);
m_stackedWidget->insertWidget(0, m_label);
@@ -9,9 +9,9 @@
*/
#pragma once
#include <QWidget>
#include <QLabel>
#include <QStackedWidget>
#include <QtWidgets/QWidget>
#include <QtWidgets/QLabel>
#include <QtWidgets/QStackedWidget>
#include <QtCore/QMap>
class QSpinBox;
@@ -10,7 +10,7 @@
#include "samplemodel.h"
#include <QMimeData>
#include <QStringList>
#include <QtCore/QStringList>
#include <QDomDocument>
#include "detailviewdlg.h"
#include "nglsettings.h"
@@ -10,10 +10,10 @@
#pragma once
#include <QAbstractItemModel>
#include <QSortFilterProxyModel>
#include <QtCore/QAbstractItemModel>
#include <QtCore/QSortFilterProxyModel>
#include <QtCore/QVector>
#include <QSharedPointer>
#include <QtCore/QSharedPointer>
#include <QDomDocument>
#include <dds/dds.hpp>
@@ -14,11 +14,11 @@
#include "topicselector.h"
#include "detailviewdlg.h"
#include <QHeaderView>
#include <QMenu>
#include <QFile>
#include <QFileDialog>
#include <QMessageBox>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QMenu>
#include <QtCore/QFile>
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QMessageBox>
SampleView::SampleView(QWidget *parent)
: QTableView(parent)
@@ -10,7 +10,7 @@
#pragma once
#include <QTableView>
#include <QtWidgets/QTableView>
#include <QtCore/QTimer>
#include <dds/dds.hpp>
#include "logger.h"
@@ -8,7 +8,7 @@
*/
#include "abstractsequencewidget.h"
#include <QRegularExpression>
#include <QtCore/QRegularExpression>
#include <QToolButton>
AbstractSequenceWidget::AbstractSequenceWidget(const RwMode &readOnly,
@@ -13,7 +13,7 @@
#include <dds/dds.hpp>
#endif
#include <QGroupBox>
#include <QtWidgets/QGroupBox>
#include <QtCore/QList>
#include <detailview.h>
@@ -9,7 +9,7 @@
#include "tabsequencewidget.h"
#include <QTabBar>
#include <QTabWidget>
#include <QtWidgets/QTabWidget>
#include <QToolButton>
TabSequenceWidget::TabSequenceWidget(const RwMode &readOnly,
@@ -13,10 +13,10 @@
#include "samplemodel.h"
#include "xmlhelper.h"
#include <QDataStream>
#include <QtCore/QDataStream>
#include <QMimeData>
#include <QIODevice>
#include <QIcon>
#include <QtCore/QIODevice>
#include <QtGui/QIcon>
TelegramModel::TelegramModel(QObject *parent)
: QAbstractTableModel(parent)
@@ -10,12 +10,12 @@
#pragma once
#include <QAbstractItemModel>
#include <QSortFilterProxyModel>
#include <QtCore/QAbstractItemModel>
#include <QtCore/QSortFilterProxyModel>
#include <QtCore/QVector>
#include <QtCore/QDateTime>
#include <QSharedPointer>
#include <QStringList>
#include <QtCore/QSharedPointer>
#include <QtCore/QStringList>
#include <dds/core/xtypes/DynamicData.hpp>
@@ -14,10 +14,10 @@
#include "detailviewdlg.h"
#include "nglsettings.h"
#include <QHeaderView>
#include <QMenu>
#include <QFileDialog>
#include <QFile>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QMenu>
#include <QtWidgets/QFileDialog>
#include <QtCore/QFile>
#include <QDomDocument>
TelegramView::TelegramView(QWidget *parent)
@@ -10,7 +10,7 @@
#pragma once
#include <QTableView>
#include <QtWidgets/QTableView>
#include "telegrammodel.h"
#include "logger.h"
@@ -9,15 +9,15 @@
*/
#include "topic_tree_model.h"
#include <QBuffer>
#include <QDataStream>
#include <QtCore/QBuffer>
#include <QtCore/QDataStream>
#include <QtCore/QDateTime>
#include <QImage>
#include <QtGui/QImage>
#include <QMimeData>
#include <QPainter>
#include <QPolygonF>
#include <QSet>
#include <QTransform>
#include <QtGui/QPainter>
#include <QtGui/QPolygonF>
#include <QtCore/QSet>
#include <QtGui/QTransform>
#include <rti/core/xtypes/DynamicDataMemberInfo.hpp>
#include <dds/core/xtypes/EnumType.hpp>
#include <LtsCoordTrans/lts_coord_trans.h>
@@ -9,8 +9,8 @@
*/
#pragma once
#include <QSortFilterProxyModel>
#include <QModelIndex>
#include <QtCore/QSortFilterProxyModel>
#include <QtCore/QModelIndex>
#include "logger.h"
#include "nglsettings.h"
@@ -2,8 +2,8 @@
#include <QGridLayout>
#include <QCheckBox>
#include <QGroupBox>
#include <QScrollArea>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QScrollArea>
TypeCodeSelector::TypeCodeSelector(QWidget *parent)
@@ -1,6 +1,6 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include <dds/dds.hpp>
#include "logger.h"
@@ -1,6 +1,8 @@
# copy of displayPanelSimulator for testing with dotMatrixDisplay
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
SET(displayPanelSimulator_SRCS
cmdlineparser.cpp
displayPanelSimulatorMain.cpp
@@ -10,7 +10,7 @@
#include "ui_debugmessages.h"
#include <QtCore/QDateTime>
#include <QMessageBox>
#include <QtWidgets/QMessageBox>
DebugMessages::DebugMessages(QWidget *parent)
@@ -15,11 +15,11 @@
#include "ui_debugmessages.h"
#include <QCloseEvent>
#include <QLabel>
#include <QStatusBar>
#include <QtWidgets/QLabel>
#include <QtWidgets/QStatusBar>
#include <QSettings>
#include <QBoxLayout>
#include <QImage>
#include <QtGui/QImage>
#include <QLedLine/qledline.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
@@ -11,7 +11,7 @@
//===Include specifications==================================================
#include "customMapsAndEnum.h"
#include <QMainWindow>
#include <QtWidgets/QMainWindow>
#include <QtCore/QVector>
#include <NGLLogger/INGLLogger.h>
@@ -6,11 +6,12 @@
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonArray>
#include <QUrl>
#include <QtCore/QUrl>
#include <QUrlQuery>
#include <QtCore/QCoreApplication>
#include <QtCore/QRandomGenerator>
#include <QtCore/QString>
#include <QStringList>
#include <QtCore/QStringList>
#include <QtCore/QDebug>
@@ -18,16 +19,13 @@ Server::Server()
: QObject(nullptr)
, m_server(new QWebSocketServer(QString(), QWebSocketServer::NonSecureMode, this))
{
qsrand(time(nullptr));
QRandomGenerator::global()->seed(time(nullptr));
}
qint64 randomBetween(qint64 min, qint64 max)
{
qint64 val = qrand(); // qrand returns int (32 bit)
val <<= 32;
val |= qrand();
return val % (max - min) + min;
return QRandomGenerator::global()->bounded(min, max);
}
@@ -156,7 +154,7 @@ bool Server::init(quint16 port)
if (!k)
limit = -1;
QStringList typesStringList(typesString.split(QLatin1Char(','), QString::SkipEmptyParts));
QStringList typesStringList(typesString.split(QLatin1Char(','), Qt::SkipEmptyParts));
qWarning() << "new request" << from << to << typesString << "limit" << limit;
@@ -200,7 +198,7 @@ bool Server::init(quint16 port)
//int eventTypeId = eventObj[QStringLiteral("eventTypeId")].toInt(-1);
//qint64 startTime = eventObj[QStringLiteral("sampleTime")].toDouble(-1);
eObj[QStringLiteral("id")] = e.m_id;
eObj[QStringLiteral("id")] = e.id;
eObj[QStringLiteral("eventTypeId")] = e.type;
eObj[QStringLiteral("partyId")] = e.partyId;
eObj[QStringLiteral("sampleTime")] = e.time;
@@ -21,12 +21,11 @@ NGL_ADD_EXECUTABLE(WS egcuSimulator ${webserver_SRCS} ${webserver_HDRS})
NGL_TARGET_COMPILE_DEFINITIONS(egcuSimulator
PRIVATE
${VLC_DEFINES}
)
NGL_TARGET_LINK_LIBRARIES(egcuSimulator
PUBLIC
${VLC_LIBRARIES}
$<$<TARGET_EXISTS:PkgConfig::VLC>:PkgConfig::VLC>
NGLLogger
LtsWidgets
Qt6::Core
@@ -5,6 +5,7 @@
# Created by Malte Schroeder, SLSE, 2016-03-03
#
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
SET(lt_SRCS
licenceedit.cpp
@@ -11,9 +11,9 @@
#include "ui_mainwindow.h"
#include "sortfilter.h"
#include <QCloseEvent>
#include <QFileDialog>
#include <QMessageBox>
#include <QModelIndex>
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QMessageBox>
#include <QtCore/QModelIndex>
#include <LtsLicence/aes_crypt.h>
MainWindow::MainWindow(QWidget *parent)
@@ -9,9 +9,9 @@
#pragma once
#include <QMainWindow>
#include <QtWidgets/QMainWindow>
#include <QtCore/QMap>
#include <QStandardItemModel>
#include <QtGui/QStandardItemModel>
#include <LtsLicence/lts_licence.h>
#include "licenceedit.h"
@@ -9,7 +9,7 @@
#include "sortfilter.h"
#include <QtCore/QDateTime>
#include <QStandardItemModel>
#include <QtGui/QStandardItemModel>
SortFilter::SortFilter(QObject *parent)
: QSortFilterProxyModel(parent)
@@ -9,7 +9,7 @@
#pragma once
#include <QSortFilterProxyModel>
#include <QtCore/QSortFilterProxyModel>
class SortFilter : public QSortFilterProxyModel
{
@@ -5,6 +5,8 @@
# Created by Malte Schroeder, SLSE, 2016-03-03
#
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
SET(logView_SRCS
cmbfilterwidget.h
datafilterwidget.cpp
@@ -11,7 +11,7 @@
#include "filterwidget.h"
#include <QStringList>
#include <QtCore/QStringList>
class CMBFilterWidget : public FilterWidget
{
@@ -9,8 +9,8 @@
#pragma once
#include <QWidget>
#include <QPoint>
#include <QtWidgets/QWidget>
#include <QtCore/QPoint>
class FilterWidget : public QWidget
{
@@ -11,7 +11,7 @@
#include "cmbfilterwidget.h"
#include <QStringList>
#include <QtCore/QStringList>
namespace Ui
{
@@ -11,7 +11,7 @@
#include "lefilterwidget.h"
#include <QWidget>
#include <QtWidgets/QWidget>
#include <QtCore/QString>
#include <QKeyEvent>
@@ -11,7 +11,7 @@
#include "cmbfilterwidget.h"
#include <QStringList>
#include <QtCore/QStringList>
namespace Ui
{
@@ -9,7 +9,7 @@
#include "logviewtablemodel.h"
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QFont>
#include <QtGui/QFont>
LogViewTableModel::LogViewTableModel(QObject *parent)
: QAbstractTableModel(parent)
@@ -9,11 +9,11 @@
#pragma once
#include <QAbstractTableModel>
#include <QtCore/QAbstractTableModel>
#include <QtCore/QVariant>
#include <QtCore/QVector>
#include <QtCore/QDateTime>
#include <QColor>
#include <QtGui/QColor>
#include <NGLLogger/INGLLogger.h>
class LogViewTableModel : public QAbstractTableModel
@@ -10,11 +10,11 @@
#include "logviewtableview.h"
#include "logviewtablemodel.h"
#include <QAction>
#include <QColor>
#include <QtWidgets/QAction>
#include <QtGui/QColor>
#include <QColorDialog>
#include <QIcon>
#include <QMenu>
#include <QtGui/QIcon>
#include <QtWidgets/QMenu>
#include <QMouseEvent>
LogViewTableView::LogViewTableView(QWidget *parent)
@@ -9,8 +9,8 @@
#pragma once
#include <QTableView>
#include <QPoint>
#include <QtWidgets/QTableView>
#include <QtCore/QPoint>
class QAction;
class QMenu;
@@ -12,11 +12,11 @@
#include "sortfiltermodel.h"
#include "ui_mainwindow.h"
#include <QFileDialog>
#include <QtWidgets/QFileDialog>
#include <QtCore/QDateTime>
#include <QSortFilterProxyModel>
#include <QtCore/QSortFilterProxyModel>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QMessageBox>
#include <QtWidgets/QMessageBox>
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
@@ -16,9 +16,9 @@
#include "datafilterwidget.h"
#include "locationfilterwidget.h"
#include <QMainWindow>
#include <QLabel>
#include <QPoint>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QLabel>
#include <QtCore/QPoint>
namespace Ui
{
@@ -10,14 +10,15 @@
#include "sortfiltermodel.h"
#include "logviewtablemodel.h"
#include <QRegularExpression>
#include <QtCore/QRegularExpression>
void SortFilterModel::setStartDateFilter(const QDateTime &start)
{
if (m_start == start)
return;
m_start = start;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
@@ -26,7 +27,8 @@ void SortFilterModel::setEndDateFilter(const QDateTime &end)
if (m_end == end)
return;
m_end = end;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void SortFilterModel::figureFilterOut()
@@ -41,7 +43,8 @@ void SortFilterModel::resetAllFilter()
m_start = QDateTime();
m_end = QDateTime();
figureFilterOut();
invalidateFilter();
beginFilterChange();
endFilterChange();
}
@@ -9,7 +9,7 @@
#pragma once
#include <QSortFilterProxyModel>
#include <QtCore/QSortFilterProxyModel>
#include <QtCore/QDateTime>
#include <QtCore/QMap>
#include <QtCore/QVector>
@@ -4,11 +4,11 @@
#include <QtCore/QSettings>
#include <QApplication>
#include <QtWidgets/QApplication>
#include <QScreen>
#include <QStyle>
#include <QtCore/QDebug>
#include <QMessageBox>
#include <QtWidgets/QMessageBox>
#include <QGraphicsDropShadowEffect>
@@ -1,6 +1,6 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include <QtCore/QTimer>
#include <QMoveEvent>
@@ -1,6 +1,6 @@
#include "login_window.h"
#include <QApplication>
#include <QtWidgets/QApplication>
int main(int argc, char *argv[])
@@ -19,7 +19,7 @@ NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION ParticipantDataGenerator ${participantD
NGL_TARGET_LINK_LIBRARIES(ParticipantDataGenerator
Qt6::Core
Qt6::Network
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
LtsCommandLineParser
nglcoreapplication
NGLLogger
@@ -9,9 +9,9 @@
#include "proxy_emulator.h"
#include <QtCore/QDateTime>
#include <QHash>
#include <QtCore/QHash>
#include <QtCore/QMap>
#include <QPointF>
#include <QtCore/QPointF>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
@@ -11,7 +11,7 @@
#pragma once
#include <QtCore/QVariant>
#include <QWidget>
#include <QtWidgets/QWidget>
namespace Ui
{
@@ -13,15 +13,15 @@
#include <NGLLogger/INGLLogger.h>
#include <QAction>
#include <QFile>
#include <QFileDialog>
#include <QtWidgets/QAction>
#include <QtCore/QFile>
#include <QtWidgets/QFileDialog>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonValue>
#include <QMenu>
#include <QMessageBox>
#include <QtWidgets/QMenu>
#include <QtWidgets/QMessageBox>
namespace SettingsEditor
{
@@ -13,7 +13,7 @@
#include <nglwidgets/nglmainwindow.h>
#include <QtCore/QMap>
#include <QPair>
#include <QtCore/QPair>
#include <QTreeWidgetItem>
#include <QtCore/QString>
#include <QtCore/QVariant>
@@ -6,6 +6,8 @@
# CMakeLists.txt fuer test_qledline
#
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
SET(test_qledline_SRCS
content.cpp
@@ -1,6 +1,6 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include <QtCore/QVector>
class QVBoxLayout;
@@ -1,6 +1,6 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
namespace Ui {
class FullLine;
@@ -1,4 +1,4 @@
#include <QApplication>
#include <QtWidgets/QApplication>
#include "mainwindow.h"
@@ -1,6 +1,6 @@
#pragma once
#include <QMainWindow>
#include <QtWidgets/QMainWindow>
namespace Ui {
class MainWindow;
@@ -1,6 +1,6 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
namespace Ui {
class Props;
@@ -10,7 +10,7 @@
#include "qledchar.h"
#include <QFontMetrics>
#include <QPainter>
#include <QtGui/QPainter>
#define s_fontName QStringLiteral("monospace")
Loaded 100 of 18635 files, more files were not shown because too many files have changed in this diff. Show more