Qt6 migration: Fix BUILD_RTI=OFF build errors in TrainingAreaBase
- training_area_telegrams.cpp: Fixed QJsonObject initializer syntax (Qt6 requires {{}} not ({}))
- training_area_telegrams.cpp: Fixed fromJson() methods to access m_* members directly
- training_area_telegrams.cpp: Fixed brace mismatches in multiple toJson() methods
- training_area_telegrams.h: Changed Header struct to public members for consistency
- tx_mixin.cpp: Fixed getEquipmentNumber() template for direct member access
- lts_coordinate.cpp: Added missing #include <iomanip>
- MIGRATION_STATUS.md: Added migration progress tracking document
C++17 constraint enforced due to RTI Connext DDS 7.7.0 incompatibility with C++20+
Build status: BUILD_RTI=OFF successful (0 errors, warnings only)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
@@ -7,12 +7,12 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QList>
|
||||
#include <QPointF>
|
||||
#include <QRect>
|
||||
#include <QRectF>
|
||||
#include <QSize>
|
||||
#include <QString>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtCore/QRectF>
|
||||
#include <QtCore/QSize>
|
||||
#include <QtCore/QString>
|
||||
#include <ngllogger_export.h>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
#include <mutex>
|
||||
#include <unordered_map>
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QFileInfo>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QFileInfo>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include "NGLLoggerBootstrap.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
|
||||
#include "qtlocalpeer.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QDataStream>
|
||||
#include <QTime>
|
||||
#include <QRegularExpression>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDataStream>
|
||||
#include <QtCore/QTime>
|
||||
#include <QtCore/QRegularExpression>
|
||||
|
||||
#if defined(Q_OS_WIN)
|
||||
#include <QLibrary>
|
||||
#include <QtCore/QLibrary>
|
||||
#include <qt_windows.h>
|
||||
typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
|
||||
static PProcessIdToSessionId pProcessIdToSessionId = 0;
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#ifndef QTLOCALPEER_H
|
||||
#define QTLOCALPEER_H
|
||||
|
||||
#include <QLocalServer>
|
||||
#include <QLocalSocket>
|
||||
#include <QDir>
|
||||
#include <QtNetwork/QLocalServer>
|
||||
#include <QtNetwork/QLocalSocket>
|
||||
#include <QtCore/QDir>
|
||||
|
||||
#include "qtlockedfile.h"
|
||||
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#ifndef QTLOCKEDFILE_H
|
||||
#define QTLOCKEDFILE_H
|
||||
|
||||
#include <QFile>
|
||||
#include <QtCore/QFile>
|
||||
#ifdef Q_OS_WIN
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#endif
|
||||
|
||||
#if defined(Q_OS_WIN)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "qtlockedfile.h"
|
||||
#include <utility>
|
||||
#include <qt_windows.h>
|
||||
#include <QFileInfo>
|
||||
#include <QtCore/QFileInfo>
|
||||
|
||||
#define MUTEX_PREFIX "QtLockedFile mutex "
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "qtsingleapplication.h"
|
||||
#include "qtlocalpeer.h"
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#ifndef QTSINGLEAPPLICATION_H
|
||||
#define QTSINGLEAPPLICATION_H
|
||||
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
|
||||
class QtLocalPeer;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#ifndef QTSINGLECOREAPPLICATION_H
|
||||
#define QTSINGLECOREAPPLICATION_H
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
class QtLocalPeer;
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QMap>
|
||||
#include <QSet>
|
||||
#include <QMetaType>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QMetaType>
|
||||
|
||||
class IWMS2ECC
|
||||
{
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
|
||||
#include "wms_ecc_equipRequirements.h"
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
QJsonObject EquipRequirements::toJson() const
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include "wms_ecc_equipmenttypes.h"
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
QJsonObject EquipmentTypes::toJson(const IWMS2ECC::EquipmentType &et)
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "wms_ecc_ibase.h"
|
||||
#include "IWMS2ECC.h"
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QVariantMap>
|
||||
|
||||
class WMS_JSON_DS_EXPORT EquipmentTypes : public IBase
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
|
||||
#include "wms_ecc_exercises.h"
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace EXCON
|
||||
{
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
|
||||
#include "wms_ecc_playerInfo.h"
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
QJsonObject PlayerInfo::toJson(const IWMS2ECC::PlayerInfo &pi)
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include "wms_ecc_registration.h"
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
QJsonObject Registration::toJson() const
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#include "wms_ecc_unregister.h"
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
QJsonObject Unregister::toJson() const
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include "nglloggerhandler.h"
|
||||
|
||||
#ifndef NGLAPPLICATION_EXPORT
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QString>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#ifndef LOGGERHANDLER_EXPORT
|
||||
# ifdef BUILD_STATIC_LIBRARIES
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
#include "nglcomp_bzip2iodevice.h"
|
||||
|
||||
#include <QIODevice>
|
||||
#include <QString>
|
||||
#include <QtCore/QIODevice>
|
||||
#include <QtCore/QString>
|
||||
#include <bzlib.h>
|
||||
|
||||
class BZip2IODevice::Private
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
#ifndef BZIP2IODEVICE_H
|
||||
#define BZIP2IODEVICE_H
|
||||
|
||||
#include <QString>
|
||||
#include <QIODevice>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QIODevice>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
#include "nglcomp_tarfilter.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <QBuffer>
|
||||
#include <QCoreApplication>
|
||||
#include <QDebug>
|
||||
#include <QDir>
|
||||
#include <QFileInfo>
|
||||
#include <QFutureWatcher>
|
||||
#include <QIODevice>
|
||||
#include <QStringList>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtCore/QFutureWatcher>
|
||||
#include <QtCore/QIODevice>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtConcurrent>
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QFuture>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QFuture>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
class QIODevice;
|
||||
class TarFilter;
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
|
||||
|
||||
#include <QBuffer>
|
||||
#include <QFile>
|
||||
#include <QIODevice>
|
||||
#include <QFileInfo>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QIODevice>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtCore/QDateTime>
|
||||
// Use UTF-8 conversions instead of QTextCodec (Qt6)
|
||||
|
||||
#include <time.h>
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
#ifndef TARFILTER_H
|
||||
#define TARFILTER_H
|
||||
|
||||
#include <QString>
|
||||
#include <QFile>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QFile>
|
||||
#include <functional>
|
||||
|
||||
class QIODevice;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtTest>
|
||||
#include <QtTest/QtTest>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QHash>
|
||||
#include <QObject>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QObject>
|
||||
#include <QTemporaryDir>
|
||||
#include <QTemporaryFile>
|
||||
#include <QtCore/QTemporaryFile>
|
||||
|
||||
class nglcomp_test : public QObject
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "ngldb_export.h"
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
#include "nglsettings_connections.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QMap>
|
||||
#include <QPair>
|
||||
#include <QSettings>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QPair>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtNetwork/QHostAddress>
|
||||
#include <QtNetwork/QHostInfo>
|
||||
#include <QtNetwork/QNetworkInterface>
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDir>
|
||||
#include <QSettings>
|
||||
#include <QSize>
|
||||
#include <QStandardPaths>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtCore/QSize>
|
||||
#include <QtCore/QStandardPaths>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "ngltools_convert.h"
|
||||
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
|
||||
#include "ngltools_export.h"
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "ngltools_dtg.h"
|
||||
|
||||
#include <QString>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QTimeZone>
|
||||
|
||||
namespace DTG
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <QStringList>
|
||||
#include <QtCore/QStringList>
|
||||
#include "ngltools_export.h"
|
||||
|
||||
class QDateTime;
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
#include "ngltools_filesystem.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDir>
|
||||
#include <QSettings>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QSettings>
|
||||
#include <utility>
|
||||
|
||||
namespace NGL
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <QObject>
|
||||
#include <QtTest>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtTest/QtTest>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
#include "ngltools_dtg.h"
|
||||
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
#include <utility>
|
||||
#include "ngltranslator_p.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDir>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDir>
|
||||
#include <QTranslator>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QLibraryInfo>
|
||||
#include <QLocale>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace NGL
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#pragma once
|
||||
|
||||
#include "ngltranslator_export.h"
|
||||
#include <QByteArray>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "ngltranslator.h"
|
||||
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
#include <QTranslator>
|
||||
|
||||
namespace NGL
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
#include "ngldialog.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDir>
|
||||
#include <QFrame>
|
||||
#include <QIcon>
|
||||
#include <QKeyEvent>
|
||||
#include <QScreen>
|
||||
#include <QVBoxLayout>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtWidgets/QFrame>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtWidgets/QVBoxLayout>
|
||||
#include <ngltools/ngltools_helpevent.h>
|
||||
|
||||
#include <time.h>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
#include <QDialog>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include "nglstandardbutton.h"
|
||||
|
||||
class NGLWIDGETS_EXPORT NGLDialog : public QDialog
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "ngldialogbuttonbox.h"
|
||||
|
||||
#include <QAction>
|
||||
#include <QHBoxLayout>
|
||||
#include <QFrame>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtWidgets/QHBoxLayout>
|
||||
#include <QtWidgets/QFrame>
|
||||
|
||||
NGLDialogButtonBox::NGLDialogButtonBox(QWidget *parent)
|
||||
: NGLDialogButtonBox(Qt::Horizontal, parent)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QMultiMap>
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
#include "nglstandardbutton.h"
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <QtCore/QLibraryInfo>
|
||||
#include <QtCore/QTextStream>
|
||||
#include <QGuiApplication>
|
||||
#include <QMenu>
|
||||
#include <QMenuBar>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtWidgets/QMenuBar>
|
||||
|
||||
NGLMainWindow::NGLMainWindow(QWidget *parent)
|
||||
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QMap>
|
||||
#include <QProcess>
|
||||
#include <QtWidgets/QMainWindow>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QProcess>
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
namespace NGL
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
#include "nglpdfpage.h"
|
||||
|
||||
#include <QtCore/QUrl>
|
||||
#include <QLabel>
|
||||
#include <QScrollArea>
|
||||
#include <QScrollBar>
|
||||
#include <QVBoxLayout>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QScrollArea>
|
||||
#include <QtWidgets/QScrollBar>
|
||||
#include <QtWidgets/QVBoxLayout>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <QWidget>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QPointer>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QPointer>
|
||||
#include <poppler/qt6/poppler-qt6.h>
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QSizeF>
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <poppler/qt6/poppler-qt6.h>
|
||||
#include <vector>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <memory>
|
||||
#include <poppler/qt6/poppler-qt6.h>
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
|
||||
|
||||
#include "nglstandardbutton.h"
|
||||
#include <QMenu>
|
||||
#include <QEvent>
|
||||
#include <QAction>
|
||||
#include <QKeySequence>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtCore/QEvent>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtGui/QKeySequence>
|
||||
|
||||
NGLStandardButton::NGLStandardButton(QWidget *parent)
|
||||
: NGLStandardButton(NoButton, parent)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QIcon>
|
||||
#include <QVariant>
|
||||
#include <QVector>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
#include "nglpdfwidget.h"
|
||||
|
||||
class TestPDFWidget : public QObject
|
||||
|
||||
@@ -12,19 +12,19 @@
|
||||
#include <math.h>
|
||||
|
||||
|
||||
#include <QAtomicInt>
|
||||
#include <QDateTime>
|
||||
#include <QMutex>
|
||||
#include <QSqlError>
|
||||
#include <QSqlField>
|
||||
#include <QSqlIndex>
|
||||
#include <QSqlRecord>
|
||||
#include <QSqlQuery>
|
||||
#include <QStringList>
|
||||
#include <QTextCodec>
|
||||
#include <QTimer>
|
||||
#include <QVariant>
|
||||
#include <QMetaType>
|
||||
#include <QtCore/QAtomicInt>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtSql/QSqlError>
|
||||
#include <QtSql/QSqlField>
|
||||
#include <QtSql/QSqlIndex>
|
||||
#include <QtSql/QSqlRecord>
|
||||
#include <QtSql/QSqlQuery>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QTextCodec>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtCore/QMetaType>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
|
||||
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtTest/QtTest>
|
||||
#include <QDebug>
|
||||
#include <QSqlDatabase>
|
||||
#include <QSqlQuery>
|
||||
#include <QSqlError>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtSql/QSqlDatabase>
|
||||
#include <QtSql/QSqlQuery>
|
||||
#include <QtSql/QSqlError>
|
||||
#include <QLocale>
|
||||
|
||||
#include "qsql_informix.h"
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QStringList>
|
||||
|
||||
#ifndef Q_EXPORT_SQLDRIVER_INFORMIX
|
||||
# ifdef MAKE_QSQL_INFORMIX_LIB
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
#include "commandinterface.h"
|
||||
#include "tcpserver_export.h"
|
||||
|
||||
#include <QMap>
|
||||
#include <QPair>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QPair>
|
||||
|
||||
class QIODevice;
|
||||
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
|
||||
#include "tcpserver_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
class QAbstractSocket;
|
||||
class QByteArray;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "tcpserver_export.h"
|
||||
|
||||
#include <QTcpServer>
|
||||
#include <QtNetwork/QTcpServer>
|
||||
|
||||
class WorkerInstance;
|
||||
class CommandInterface;
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
|
||||
#include "tcpserver_export.h"
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QPointer>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QPointer>
|
||||
|
||||
class QAbstractSocket;
|
||||
class CommandInterface;
|
||||
|
||||
Reference in new issue
Block a user