diff --git a/source/palette_brushlist.cpp b/source/palette_brushlist.cpp index e77c2a5f..5d26e6d2 100644 --- a/source/palette_brushlist.cpp +++ b/source/palette_brushlist.cpp @@ -101,23 +101,23 @@ PaletteType BrushPalettePanel::GetType() const { return paletteType; } -void BrushPalettePanel::SetListType(BrushListType newTypeList) const { +void BrushPalettePanel::SetListType(BrushListType newListType) const { if (!choicebook) { return; } for (auto pageIndex = 0; pageIndex < choicebook->GetPageCount(); ++pageIndex) { const auto &panel = dynamic_cast(choicebook->GetPage(pageIndex)); - panel->SetListType(newTypeList); + panel->SetListType(newListType); } } -void BrushPalettePanel::SetListType(const wxString &newTypeList) const { +void BrushPalettePanel::SetListType(const wxString &newListType) const { if (!choicebook) { return; } for (auto pageIndex = 0; pageIndex < choicebook->GetPageCount(); ++pageIndex) { const auto &panel = dynamic_cast(choicebook->GetPage(pageIndex)); - panel->SetListType(newTypeList); + panel->SetListType(newListType); } } diff --git a/source/palette_brushlist.h b/source/palette_brushlist.h index 47362a4f..cff1ccfb 100644 --- a/source/palette_brushlist.h +++ b/source/palette_brushlist.h @@ -41,7 +41,7 @@ class BrushBoxInterface { tileset(tileset) { ASSERT(tileset); } - virtual ~BrushBoxInterface() { } + virtual ~BrushBoxInterface() = default; virtual wxWindow* GetSelfWindow() = 0;