From 4ae9696a7e21a9fbb4b7986319eb74a17b9c1f85 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 18 Apr 2015 19:35:30 +0200 Subject: [PATCH] get rid of name shadow warnings --- src/actions.cpp | 10 +++++----- src/lastfm_service.cpp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/actions.cpp b/src/actions.cpp index 32d51af3..49087996 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -671,20 +671,20 @@ bool DeleteBrowserItems::canBeRun() const void DeleteBrowserItems::run() { auto get_name = [](const MPD::Item &item) -> std::string { - std::string name; + std::string iname; switch (item.type()) { case MPD::Item::Type::Directory: - name = getBasename(item.directory().path()); + iname = getBasename(item.directory().path()); break; case MPD::Item::Type::Song: - name = item.song().getName(); + iname = item.song().getName(); break; case MPD::Item::Type::Playlist: - name = getBasename(item.playlist().path()); + iname = getBasename(item.playlist().path()); break; } - return name; + return iname; }; boost::format question; diff --git a/src/lastfm_service.cpp b/src/lastfm_service.cpp index 9eec5e50..24749575 100644 --- a/src/lastfm_service.cpp +++ b/src/lastfm_service.cpp @@ -155,12 +155,12 @@ Service::Result ArtistInfo::processData(const std::string &data) auto add_similars = [&result](boost::sregex_iterator &it, const boost::sregex_iterator &last) { for (; it != last; ++it) { - std::string name = it->str(1); + std::string value = it->str(1); std::string url = it->str(2); - stripHtmlTags(name); + stripHtmlTags(value); stripHtmlTags(url); result.second += "\n * "; - result.second += name; + result.second += value; result.second += " ("; result.second += url; result.second += ")";