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

Location Markers Part2 clang-format/tidy suggestions

Browse source
This commit is contained in:
AdenKoperczak 2025-01-11 10:46:04 -05:00
parent 2fd94c6575
commit 7edafe8d78
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scwx-qt/source/scwx/qt/manager/marker_manager.cpp
View file

@ -470,7 +470,7 @@ std::optional<types::MarkerIconInfo>
MarkerManager::get_icon(const std::string& name)
{
const std::shared_lock lock(p->markerIconsLock_);
auto it = p->markerIcons_.find(name);
auto it = p->markerIcons_.find(name);
if (it != p->markerIcons_.end())
{
return it->second;

4
scwx-qt/source/scwx/qt/manager/resource_manager.cpp
View file

@ -110,8 +110,8 @@ static void LoadTextures()
void BuildAtlas()
{
util::TextureAtlas& textureAtlas = util::TextureAtlas::Instance();
textureAtlas.BuildAtlas(atlasWidth, atlasHeight);
util::TextureAtlas& textureAtlas = util::TextureAtlas::Instance();
textureAtlas.BuildAtlas(atlasWidth, atlasHeight);
}
} // namespace ResourceManager

2
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -219,7 +219,7 @@ public:
std::shared_ptr<model::LayerModel> layerModel_ {
model::LayerModel::Instance()};
ui::EditMarkerDialog* editMarkerDialog_;
ui::EditMarkerDialog* editMarkerDialog_ {nullptr};
std::shared_ptr<manager::HotkeyManager> hotkeyManager_ {
manager::HotkeyManager::Instance()};

4
scwx-qt/source/scwx/qt/types/marker_types.hpp
View file

@ -50,9 +50,9 @@ struct MarkerIconInfo
qIcon {QIcon(QString::fromStdString(path))},
image {}
{
auto qName = QString::fromStdString(name);
auto qName = QString::fromStdString(name);
QStringList parts = qName.split("location-");
shortName = parts.last().toStdString();
shortName = parts.last().toStdString();
}
// Initializer for custom icons (which use a file path)