From bf0b1a3ddd390f0c62a70d64ead2e87165d869e6 Mon Sep 17 00:00:00 2001 From: twi-devel Date: Mon, 24 Aug 2026 20:28:34 +0200 Subject: [PATCH] =?UTF-8?q?QDesktopWidget=20=E2=86=92=20QScreen:=20Complet?= =?UTF-8?q?e=20migration=20in=20AVM=20and=20TetraIF=20modules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - avm_mvs_video_team_gui_plugin.cpp: QApplication::desktop() → QGuiApplication::primaryScreen() - LogViewTelegramDialog.cpp: QApplication::desktop() → QGuiApplication::primaryScreen() - Added QGuiApplication includes where needed - Removed duplicate QScreen include This completes the QDesktopWidget API migration across all modules. QApplication::desktop() is deprecated in Qt5 and removed in Qt6. Replacement: QGuiApplication::primaryScreen()->geometry() or availableGeometry(). Refs: Qt6 migration, C++17 constraint due to RTI Connext DDS 7.7.0 incompatibility --- .../Gui/MobileVideoSystem/avm_mvs_video_team_gui_plugin.cpp | 4 ++-- .../TetraIF/LogView/LogViewTelegramDialog.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_gui_plugin.cpp index caf6bb3f3..6511cda0b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_gui_plugin.cpp @@ -11,8 +11,8 @@ #include #include #include +#include #include -#include namespace AudioVideoManagement { @@ -116,7 +116,7 @@ LtsWidgets::LtsDialog *InterfaceImpl::onMvsRemoteDesktop(const QString &rdesktop LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance(); const QString username = ps->value(QStringLiteral("avm"), QStringLiteral("mvsUser")).toString(); const QString password = ps->value(QStringLiteral("avm"), QStringLiteral("mvsPassword")).toString(); - QSize s = QApplication::desktop()->screenGeometry(parent).size(); + QSize s = QGuiApplication::primaryScreen()->geometry().size(); if (s.isEmpty()) s = QSize(1920, 1080); s = s * 7 / 8; diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp index de6f633fd..0c247a0b5 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.cpp @@ -16,6 +16,7 @@ #include "LogViewTelegram.hpp" #include #include +#include #include #include #include @@ -173,7 +174,7 @@ void LogViewTelegramDialog::makePretty() int sbWidth = m_ScrollArea->width() - m_ScrollArea->viewport()->width(); int wDiff = m_contentsWidget->width() - m_ScrollArea->width(); int hDiff = m_contentsWidget->height() - m_ScrollArea->viewport()->height(); - const QRect screenSize = QApplication::desktop()->screenGeometry(this); + const QRect screenSize = QGuiApplication::primaryScreen()->geometry(); int newWidth = std::min(width() + wDiff + sbWidth, screenSize.width() * 9 / 10); int newHeight = std::min(height() + hDiff, screenSize.height() * 9 / 10);