blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 18:10:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor Qt types to avoid namespace conflict

Browse source
This commit is contained in:
Dan Paulat 2022-10-13 07:12:37 -05:00
parent 78f57698f6
commit e98bca9d5d
6 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scwx-qt/source/scwx/qt/model/alert_model.cpp
View file

@ -1,5 +1,5 @@
#include <scwx/qt/model/alert_model.hpp>
#include <scwx/qt/common/types.hpp>
#include <scwx/qt/types/qt_types.hpp>
#include <scwx/common/geographic.hpp>
#include <scwx/util/logger.hpp>
@ -68,7 +68,7 @@ QVariant AlertModel::data(const QModelIndex& index, int role) const
{
if (index.isValid() && index.row() >= 0 &&
index.row() < p->textEventKeys_.size() &&
(role == Qt::DisplayRole || role == common::SortRole))
(role == Qt::DisplayRole || role == types::SortRole))
{
const auto& textEventKey = p->textEventKeys_.at(index.row());

4
scwx-qt/source/scwx/qt/model/radar_site_model.cpp
View file

@ -1,6 +1,6 @@
#include <scwx/qt/model/radar_site_model.hpp>
#include <scwx/qt/common/types.hpp>
#include <scwx/qt/config/radar_site.hpp>
#include <scwx/qt/types/qt_types.hpp>
#include <scwx/common/geographic.hpp>
#include <scwx/util/logger.hpp>
@ -63,7 +63,7 @@ QVariant RadarSiteModel::data(const QModelIndex& index, int role) const
{
if (index.isValid() && index.row() >= 0 &&
index.row() < p->radarSites_.size() &&
(role == Qt::DisplayRole || role == common::SortRole))
(role == Qt::DisplayRole || role == types::SortRole))
{
const auto& site = p->radarSites_.at(index.row());