Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix shadow warnings gcc produces

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-13 22:12:16 +02:00
parent 58a26b1e18
commit 7c3f93e211
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/help.cpp
View File

@@ -156,10 +156,10 @@ std::string Help::DisplayKeys(const ActionType at)
return result; return result;
} }
void Help::Section(const char *type, const char *title) void Help::Section(const char *type, const char *title_)
{ {
*w << L"\n " << NC::fmtBold << ToWString(type) << L" - "; *w << L"\n " << NC::fmtBold << ToWString(type) << L" - ";
*w << ToWString(title) << NC::fmtBoldEnd << L"\n\n"; *w << ToWString(title_) << NC::fmtBoldEnd << L"\n\n";
} }
void Help::KeyDesc(const ActionType at, const char *desc) void Help::KeyDesc(const ActionType at, const char *desc)

6
src/help.h
View File

@@ -44,9 +44,9 @@ protected:
virtual bool isLockable() OVERRIDE { return true; } virtual bool isLockable() OVERRIDE { return true; }
private: private:
void KeysSection(const char *title) { Section("Keys", title); } void KeysSection(const char *title_) { Section("Keys", title_); }
void MouseSection(const char *title) { Section("Mouse", title); } void MouseSection(const char *title_) { Section("Mouse", title_); }
void Section(const char *type, const char *title); void Section(const char *type, const char *title_);
void KeyDesc(const ActionType at, const char *desc); void KeyDesc(const ActionType at, const char *desc);
void MouseDesc(std::string action, const char *desc, bool indent = false); void MouseDesc(std::string action, const char *desc, bool indent = false);
void MouseColumn(const char *column); void MouseColumn(const char *column);

4
src/lyrics.cpp
View File

@@ -246,7 +246,7 @@ void Lyrics::DownloadInBackgroundImplHelper(const MPD::Song &s)
void *Lyrics::Download() void *Lyrics::Download()
{ {
std::string artist = Curl::escape(itsSong.getArtist()); std::string artist = Curl::escape(itsSong.getArtist());
std::string title = Curl::escape(itsSong.getTitle()); std::string title_ = Curl::escape(itsSong.getTitle());
LyricsFetcher::Result result; LyricsFetcher::Result result;
@@ -256,7 +256,7 @@ void *Lyrics::Download()
for (LyricsFetcher **plugin = fetcher_defined ? itsFetcher : lyricsPlugins; *plugin != 0; ++plugin) for (LyricsFetcher **plugin = fetcher_defined ? itsFetcher : lyricsPlugins; *plugin != 0; ++plugin)
{ {
*w << L"Fetching lyrics from " << NC::fmtBold << ToWString((*plugin)->name()) << NC::fmtBoldEnd << L"... "; *w << L"Fetching lyrics from " << NC::fmtBold << ToWString((*plugin)->name()) << NC::fmtBoldEnd << L"... ";
result = (*plugin)->fetch(artist, title); result = (*plugin)->fetch(artist, title_);
if (result.first == false) if (result.first == false)
*w << NC::clRed << ToWString(result.second) << NC::clEnd << '\n'; *w << NC::clRed << ToWString(result.second) << NC::clEnd << '\n';
else else