From 6c75d0fc88096de7ba20ed80b199e3770373ab34 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Fri, 6 Jan 2023 13:48:59 +0100 Subject: [PATCH] Fixed some Clang compiler warnings. --- es-app/src/views/GamelistBase.cpp | 4 ++-- es-core/src/components/primary/CarouselComponent.h | 2 +- es-core/src/components/primary/GridComponent.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/es-app/src/views/GamelistBase.cpp b/es-app/src/views/GamelistBase.cpp index 512cf994f..1980c6304 100644 --- a/es-app/src/views/GamelistBase.cpp +++ b/es-app/src/views/GamelistBase.cpp @@ -580,12 +580,12 @@ void GamelistBase::populateList(const std::vector& files, FileData* f std::string defaultImage; if (mCarousel != nullptr) { - defaultImage = mCarousel->getDefaultImage(); + defaultImage = mCarousel->getDefaultCarouselImage(); if (!ResourceManager::getInstance().fileExists(defaultImage)) defaultImage = ""; } else if (mGrid != nullptr) { - defaultImage = mGrid->getDefaultImage(); + defaultImage = mGrid->getDefaultGridImage(); if (!ResourceManager::getInstance().fileExists(defaultImage)) defaultImage = ""; } diff --git a/es-core/src/components/primary/CarouselComponent.h b/es-core/src/components/primary/CarouselComponent.h index 0ea9e42df..227966976 100644 --- a/es-core/src/components/primary/CarouselComponent.h +++ b/es-core/src/components/primary/CarouselComponent.h @@ -61,7 +61,7 @@ public: Entry& getEntry(int index) { return mEntries.at(index); } void onDemandTextureLoad() override; const CarouselType getType() { return mType; } - const std::string& getDefaultImage() { return mDefaultImage; } + const std::string& getDefaultCarouselImage() const { return mDefaultImage; } void setDefaultImage(std::string defaultImage) { mDefaultImage = defaultImage; } bool isScrolling() const override { return List::isScrolling(); } const LetterCase getLetterCase() const override { return mLetterCase; } diff --git a/es-core/src/components/primary/GridComponent.h b/es-core/src/components/primary/GridComponent.h index b4eba3d7e..a65a55cc6 100644 --- a/es-core/src/components/primary/GridComponent.h +++ b/es-core/src/components/primary/GridComponent.h @@ -63,7 +63,7 @@ public: { return mLetterCaseGroupedCollections; } - const std::string& getDefaultImage() { return mDefaultImage; } + const std::string& getDefaultGridImage() const { return mDefaultImage; } void setDefaultImage(std::string defaultImage) { mDefaultImage = defaultImage; } bool input(InputConfig* config, Input input) override; void update(int deltaTime) override;