Fix TetraIF build warnings
- LogViewModels: replace deprecated invalidateFilter() with begin/endFilterChange() (11 sites) - LogViewTelegramEdit: move m_logger to match member declaration order (-Wreorder) and consume QFile::open results - PrtCnvBroadcastMgr: move m_logger to match member declaration order (-Wreorder) - PrtCnvCentralThread: add remaining AreaEffectSimulationType values to the silent-ignore switch group (-Wswitch) - PrtCnvMain: consume freopen results in daemonize (-Wunused-result)
This commit is contained in:
1 parent
23e694afc2
commit
52df1c8ae9
5 files changed
+56
-18
No files matched your search
@@ -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<int> &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<int> &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<int> &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<int> &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();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
|
||||
@@ -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"))
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user