diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp index 7ba669ece..6e444b569 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewModels.cpp @@ -298,7 +298,10 @@ void TelegramProxyModel::setFilterByEquipmentIds(bool bFilterByEquipmentIds) if (m_bFilterByEquipmentIds == bFilterByEquipmentIds) return; m_bFilterByEquipmentIds = bFilterByEquipmentIds; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } @@ -307,7 +310,10 @@ void TelegramProxyModel::setAllowedEquipmentIds(const std::set &allowedEqui if (m_allowedEquipmentIds == allowedEquipmentIds) return; m_allowedEquipmentIds = allowedEquipmentIds; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } @@ -316,7 +322,10 @@ void TelegramProxyModel::setFilteredCentralTelegramIds(const std::set &filt if (m_filteredCentralTelegramIds == filteredCentralTelegramIds) return; m_filteredCentralTelegramIds = filteredCentralTelegramIds; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } @@ -325,7 +334,10 @@ void TelegramProxyModel::setFilteredTetraTelegramIds(const std::set &filter if (m_filteredTetraTelegramIds == filteredTetraTelegramIds) return; m_filteredTetraTelegramIds = filteredTetraTelegramIds; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } @@ -334,7 +346,10 @@ void TelegramProxyModel::setFilteredWlsTelegramIds(const std::set &filtered if (m_filteredWlsTelegramIds == filteredWlsTelegramIds) return; m_filteredWlsTelegramIds = filteredWlsTelegramIds; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } @@ -350,7 +365,10 @@ void TelegramProxyModel::setFilterCentralTelegrams(N_CoPrtCnv::CoPrtCnvLogHeader if (curFilter == m_filterCentralTelegrams) return; m_filterCentralTelegrams = curFilter; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } @@ -365,7 +383,10 @@ void TelegramProxyModel::setFilterTetraTelegrams(N_CoPrtCnv::CoPrtCnvLogHeader:: if (curFilter == m_filterTetraTelegrams) return; m_filterTetraTelegrams = curFilter; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } @@ -380,7 +401,10 @@ void TelegramProxyModel::setFilterTetraPDU(N_CoPrtCnv::CoPrtCnvRadioTelegram::E_ if (curFilter == m_filterTetraPDU) return; m_filterTetraPDU = curFilter; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } void TelegramProxyModel::setFilterWlsTelegrams(N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnvProtocol direction, @@ -394,7 +418,10 @@ void TelegramProxyModel::setFilterWlsTelegrams(N_CoPrtCnv::CoPrtCnvLogHeader::E_ if (curFilter == m_filterWlsTelegrams) return; m_filterWlsTelegrams = curFilter; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } @@ -403,7 +430,10 @@ void TelegramProxyModel::setFilterTetraLogin(bool bFilter) if (m_bFilterLoginTelegrams == bFilter) return; m_bFilterLoginTelegrams = bFilter; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } @@ -412,7 +442,10 @@ void TelegramProxyModel::setFilterTetraFragmented(bool bFilter) if (m_bFilterFragmentedTelegrams == bFilter) return; m_bFilterFragmentedTelegrams = bFilter; - invalidateFilter(); + // invalidateFilter() is deprecated in Qt6 - begin/endFilterChange() is the + // documented replacement (re-filters the model) + beginFilterChange(); + endFilterChange(); } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp index 1927856a6..cde907d8f 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramEdit.cpp @@ -43,7 +43,6 @@ QString TelegramEdit::s_TELEGRAMLIST_FILES() TelegramEdit::TelegramEdit(QWidget *parent) : QObject(parent) - , m_logger(getLogger("LogViewTelegramEdit")) , m_addTeleAction(new QAction(QIcon(QLatin1String(":icons/16x16/list-add.png")), tr("Add Telegram"), this)) , m_editTeleAction(new QAction(QIcon(QLatin1String(":/image/Edit.png")), tr("Edit Telegram"), this)) , m_copyTeleAction(new QAction(QIcon(QLatin1String(":icons/16x16/edit-copy.png")), tr("Copy Telegram"), this)) @@ -58,6 +57,7 @@ TelegramEdit::TelegramEdit(QWidget *parent) , m_DoLoop(false) , m_InjectionThread(nullptr) , m_EditModel(new TelegramEditModel(this)) + , m_logger(getLogger("LogViewTelegramEdit")) { m_addTeleAction->setShortcut(tr("Ctrl+A")); m_editTeleAction->setShortcut(tr("Ctrl+E")); @@ -451,7 +451,7 @@ void TelegramEdit::saveTelegramList() QFile telegramFile(newFilename); - telegramFile.open(QIODevice::WriteOnly); + (void)telegramFile.open(QIODevice::WriteOnly); QDataStream stream(&telegramFile); @@ -515,7 +515,7 @@ void TelegramEdit::loadTelegramList(bool checkAppend) QFile telegramFile(newFilename); - telegramFile.open(QIODevice::ReadOnly); + (void)telegramFile.open(QIODevice::ReadOnly); QDataStream stream(&telegramFile); diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp index 07832bb3a..3b897c195 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvBroadcastMgr.cpp @@ -35,8 +35,8 @@ PrtCnvBroadcastMgr::PrtCnvBroadcastMgr() : m_ClaimWindow(0) , m_IsFullLoad(false) , m_FinishedBroadcastIndex(0) , m_FirstBroadcastIndexOfBc1(0) - , m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest")) , m_logger(getLogger("PrtCnvBroadcastMgr")) + , m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest")) { } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp index 15ec28de2..c09d83d70 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvCentralThread.cpp @@ -386,6 +386,8 @@ void PrtCnvCentralThread::handleTelegram(N_CoPrtCnv::CoPrtCnvCentralTelegram *a_ Q_ASSERT(false); break; case AreaEffectSimulationType::BeStillWarning: + case AreaEffectSimulationType::DangerZoneExplosion: + case AreaEffectSimulationType::AirSupport: break; } } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvMain.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvMain.cpp index 627585784..32a5f65bf 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvMain.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/PrtCnvMain.cpp @@ -65,9 +65,12 @@ static void daemonize() } - freopen( "/dev/null", "r", stdin); - freopen( "/dev/null", "w", stdout); - freopen( "/dev/null", "w", stderr); + if (freopen( "/dev/null", "r", stdin ) == nullptr + || freopen( "/dev/null", "w", stdout ) == nullptr + || freopen( "/dev/null", "w", stderr ) == nullptr) + { + exit(EXIT_FAILURE); + } #endif }