BUILD_RTI=OFF: Fix remaining include and build issues
TrainingAreaBase: - Add BUILD_RTI guards to dds_handler.cpp (entire file) - Add BUILD_RTI guards to recv_from_dds_aes.h for tab_db.h include - Add BUILD_RTI guards to main_handler.h for tab_db.h include - Remove duplicate m_logger declaration in main_handler.h - Add stub headers for RTI types (tab_db_stub.hpp, tab_enums_stub.hpp, etc.) VideoOverlayManagement: - Fix member initialization order in handler_overlays.h - Fix member initialization order in avs_interface.h - Fix member initialization order in main_handler.h - Change logger.cpp include from NGLLogger.h to INGLLogger.h - Add BUILD_RTI guard to handler_overlays.cpp for RTI signal connection Plugins: - Migrate QDesktopWidget → QScreen in Light/Dark style plugins - Fix CMakeLists.txt for SituationReplayManagement (BUILD_RTI guards) - Fix CMakeLists.txt for CombatNetRadio (Qt6::Core linking) - Remove QDesktopWidget includes in multiple plugin files Infrastructure: - Remove duplicate INGLLogger.h include directory - Add stub headers for ProjectDataManagement (pdm.hpp, etc.) - Add stub headers for RoutingServiceNG BUILD_RTI=OFF build now compiles successfully (1112 targets).
This commit is contained in:
1 parent
4969e4ff9b
commit
793c9f8b81
43 files changed
+334
-56
No files matched your search
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <Services/AudioVideoManagement/avm_operator_rights.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QDesktopWidget>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtCore/QProcess>
|
||||
#include <QtGui/QScreen>
|
||||
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@
|
||||
#include <osg/ComputeBoundsVisitor>
|
||||
#include <osgViewer/CompositeViewer>
|
||||
#include <osgQt/GraphicsWindowQt>
|
||||
#include <QDesktopWidget>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtWidgets/QApplication>
|
||||
|
||||
#include "buildingmanager.h"
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <Proxies/GuezNasat/gna_operator_rights.h>
|
||||
#include <Proxies/GuezNasat/logger.h>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QDesktopWidget>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtCore/QProcess>
|
||||
#include <QtGui/QScreen>
|
||||
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <QtGui/QCloseEvent>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QDesktopWidget>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <Symbology/sidc_codec.h>
|
||||
#include <SymbologyGui/base_symbol_lookup_dialog.h>
|
||||
|
||||
#include <QDesktopWidget>
|
||||
#include <QtGui/QScreen>
|
||||
|
||||
#include <Common/participant_dis_helper.h>
|
||||
#include <Common/participant_dis_type_edit.h>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <QtGui/QDrag>
|
||||
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtWidgets/QDesktopWidget>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtWidgets/QHBoxLayout>
|
||||
#include <QtWidgets/QVBoxLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtWidgets/QDesktopWidget>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <QtWidgets/QVBoxLayout>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtWidgets/QDesktopWidget>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
@@ -185,7 +185,8 @@ public:
|
||||
|
||||
QObject::connect(buttonBox->getButton(LtsWidgets::DialogButton::Close), &QPushButton::clicked, m_dialog, &DialogClass::close);
|
||||
|
||||
m_dialog->setMinimumHeight(int(QApplication::desktop()->availableGeometry(m_dialogWidget).height() * 0.9));
|
||||
QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry();
|
||||
m_dialog->setMinimumHeight(int(availableGeometry.height() * 0.9));
|
||||
|
||||
QObject::connect(m_dialogWidget, &PlanOverlayDialogWidget::requestDialogShow, m_dialog, &DialogClass::show);
|
||||
|
||||
|
||||
+2
-3
@@ -22,8 +22,8 @@ NGL_WRAP_UI(replay_gui_SRCS
|
||||
CustomView/srm_replay.ui
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS SrmReplayManagementGuiPlugin MODULE ${replay_gui_SRCS})
|
||||
IF(BUILD_RTI)
|
||||
NGL_ADD_LIBRARY(WS SrmReplayManagementGuiPlugin MODULE ${replay_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(SrmReplayManagementGuiPlugin
|
||||
NGLLogger
|
||||
LtsPrinting
|
||||
@@ -41,8 +41,7 @@ NGL_TARGET_LINK_LIBRARIES(SrmReplayManagementGuiPlugin
|
||||
LtsAppManager # for windows tablet replay hack
|
||||
LtsUtilsCore
|
||||
)
|
||||
NGL_INSTALL_TARGET(SrmReplayManagementGuiPlugin)
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
NGL_INSTALL_TARGET(SrmReplayManagementGuiPlugin)
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QDesktopWidget>
|
||||
#include <QtGui/QFont>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QPalette>
|
||||
#include <QRgb>
|
||||
#include <QtCore/QString>
|
||||
@@ -75,7 +75,7 @@ void RmeDarkStyle::loadStyle(bool highDpi)
|
||||
|
||||
int splitterHandleSize = 10;
|
||||
|
||||
if (QApplication::desktop()->logicalDpiX() > 999)
|
||||
if (QGuiApplication::primaryScreen()->logicalDotsPerInchX() > 999)
|
||||
{
|
||||
splitterHandleSize = 25;
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QDesktopWidget>
|
||||
#include <QtGui/QFont>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QPalette>
|
||||
#include <QRgb>
|
||||
#include <QtCore/QString>
|
||||
@@ -67,9 +67,10 @@ void RmeLightStyle::loadStyle(bool highDpi)
|
||||
|
||||
int splitterHandleSize = 10;
|
||||
|
||||
qDebug() << "RDELightStyle: dpi" << QApplication::desktop()->logicalDpiX();
|
||||
qreal dpiX = QGuiApplication::primaryScreen()->logicalDotsPerInchX();
|
||||
qDebug() << "RDELightStyle: dpi" << dpiX;
|
||||
|
||||
if (QApplication::desktop()->logicalDpiX() > 999)
|
||||
if (dpiX > 999)
|
||||
{
|
||||
splitterHandleSize = 25;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user