From e98bca9d5d16a65b7e3e0f252896f9a784b6acb5 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Thu, 13 Oct 2022 07:12:37 -0500 Subject: [PATCH] Refactor Qt types to avoid namespace conflict --- scwx-qt/scwx-qt.cmake | 6 ++---- scwx-qt/source/scwx/qt/main/main_window.cpp | 3 ++- scwx-qt/source/scwx/qt/model/alert_model.cpp | 4 ++-- scwx-qt/source/scwx/qt/model/radar_site_model.cpp | 4 ++-- .../source/scwx/qt/{common/types.hpp => types/qt_types.hpp} | 4 ++-- scwx-qt/source/scwx/qt/ui/radar_site_dialog.cpp | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) rename scwx-qt/source/scwx/qt/{common/types.hpp => types/qt_types.hpp} (79%) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 1107add2..c36cdeb9 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -38,7 +38,6 @@ set(SRC_EXE_MAIN source/scwx/qt/main/main.cpp) set(HDR_MAIN source/scwx/qt/main/main_window.hpp) set(SRC_MAIN source/scwx/qt/main/main_window.cpp) set(UI_MAIN source/scwx/qt/main/main_window.ui) -set(HDR_COMMON source/scwx/qt/common/types.hpp) set(HDR_CONFIG source/scwx/qt/config/radar_site.hpp) set(SRC_CONFIG source/scwx/qt/config/radar_site.cpp) set(SRC_EXTERNAL source/scwx/qt/external/stb_rect_pack.cpp) @@ -102,7 +101,8 @@ set(HDR_SETTINGS source/scwx/qt/settings/general_settings.hpp set(SRC_SETTINGS source/scwx/qt/settings/general_settings.cpp source/scwx/qt/settings/map_settings.cpp source/scwx/qt/settings/palette_settings.cpp) -set(HDR_TYPES source/scwx/qt/types/radar_product_record.hpp +set(HDR_TYPES source/scwx/qt/types/qt_types.hpp + source/scwx/qt/types/radar_product_record.hpp source/scwx/qt/types/text_event_key.hpp) set(SRC_TYPES source/scwx/qt/types/radar_product_record.cpp source/scwx/qt/types/text_event_key.cpp) @@ -160,7 +160,6 @@ set(TS_FILES ts/scwx_en_US.ts) set(PROJECT_SOURCES ${HDR_MAIN} ${SRC_MAIN} - ${HDR_COMMON} ${HDR_CONFIG} ${SRC_CONFIG} ${SRC_EXTERNAL} @@ -197,7 +196,6 @@ set(EXECUTABLE_SOURCES ${SRC_EXE_MAIN}) source_group("Header Files\\main" FILES ${HDR_MAIN}) source_group("Source Files\\main" FILES ${SRC_MAIN}) -source_group("Header Files\\common" FILES ${HDR_COMMON}) source_group("Header Files\\config" FILES ${HDR_CONFIG}) source_group("Source Files\\config" FILES ${SRC_CONFIG}) source_group("Source Files\\external" FILES ${SRC_EXTERNAL}) diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp index 632748fd..54573647 100644 --- a/scwx-qt/source/scwx/qt/main/main_window.cpp +++ b/scwx-qt/source/scwx/qt/main/main_window.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -80,7 +81,7 @@ public: settings_.setCacheDatabaseMaximumSize(20 * 1024 * 1024); alertProxyModel_->setSourceModel(alertModel_.get()); - alertProxyModel_->setSortRole(Qt::UserRole); // TODO + alertProxyModel_->setSortRole(types::SortRole); alertProxyModel_->setFilterCaseSensitivity(Qt::CaseInsensitive); alertProxyModel_->setFilterKeyColumn(-1); } diff --git a/scwx-qt/source/scwx/qt/model/alert_model.cpp b/scwx-qt/source/scwx/qt/model/alert_model.cpp index e1598c44..3283da57 100644 --- a/scwx-qt/source/scwx/qt/model/alert_model.cpp +++ b/scwx-qt/source/scwx/qt/model/alert_model.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -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()); diff --git a/scwx-qt/source/scwx/qt/model/radar_site_model.cpp b/scwx-qt/source/scwx/qt/model/radar_site_model.cpp index 96343b00..6e9b321c 100644 --- a/scwx-qt/source/scwx/qt/model/radar_site_model.cpp +++ b/scwx-qt/source/scwx/qt/model/radar_site_model.cpp @@ -1,6 +1,6 @@ #include -#include #include +#include #include #include @@ -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()); diff --git a/scwx-qt/source/scwx/qt/common/types.hpp b/scwx-qt/source/scwx/qt/types/qt_types.hpp similarity index 79% rename from scwx-qt/source/scwx/qt/common/types.hpp rename to scwx-qt/source/scwx/qt/types/qt_types.hpp index 1347e2e4..b867ec14 100644 --- a/scwx-qt/source/scwx/qt/common/types.hpp +++ b/scwx-qt/source/scwx/qt/types/qt_types.hpp @@ -6,7 +6,7 @@ namespace scwx { namespace qt { -namespace common +namespace types { enum ItemDataRole @@ -14,6 +14,6 @@ enum ItemDataRole SortRole = Qt::UserRole }; -} // namespace common +} // namespace types } // namespace qt } // namespace scwx diff --git a/scwx-qt/source/scwx/qt/ui/radar_site_dialog.cpp b/scwx-qt/source/scwx/qt/ui/radar_site_dialog.cpp index d66587e2..ece1cf9f 100644 --- a/scwx-qt/source/scwx/qt/ui/radar_site_dialog.cpp +++ b/scwx-qt/source/scwx/qt/ui/radar_site_dialog.cpp @@ -1,8 +1,8 @@ #include "radar_site_dialog.hpp" #include "./ui_radar_site_dialog.h" -#include #include +#include #include #include @@ -31,7 +31,7 @@ public: selectedRadarSite_ {"?"} { proxyModel_->setSourceModel(radarSiteModel_); - proxyModel_->setSortRole(common::SortRole); + proxyModel_->setSortRole(types::SortRole); proxyModel_->setFilterCaseSensitivity(Qt::CaseInsensitive); proxyModel_->setFilterKeyColumn(-1); }