diff options
| -rw-r--r-- | src/help.cpp | 4 | ||||
| -rw-r--r-- | src/help.h | 6 | ||||
| -rw-r--r-- | src/lyrics.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/help.cpp b/src/help.cpp index b7e3101a..c65aa06b 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -156,10 +156,10 @@ std::string Help::DisplayKeys(const ActionType at) 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 << ToWString(title) << NC::fmtBoldEnd << L"\n\n"; + *w << ToWString(title_) << NC::fmtBoldEnd << L"\n\n"; } void Help::KeyDesc(const ActionType at, const char *desc) @@ -44,9 +44,9 @@ protected: virtual bool isLockable() OVERRIDE { return true; } private: - void KeysSection(const char *title) { Section("Keys", title); } - void MouseSection(const char *title) { Section("Mouse", title); } - void Section(const char *type, const char *title); + void KeysSection(const char *title_) { Section("Keys", title_); } + void MouseSection(const char *title_) { Section("Mouse", title_); } + void Section(const char *type, const char *title_); void KeyDesc(const ActionType at, const char *desc); void MouseDesc(std::string action, const char *desc, bool indent = false); void MouseColumn(const char *column); diff --git a/src/lyrics.cpp b/src/lyrics.cpp index 1a4898ec..86c0bc9a 100644 --- a/src/lyrics.cpp +++ b/src/lyrics.cpp @@ -246,7 +246,7 @@ void Lyrics::DownloadInBackgroundImplHelper(const MPD::Song &s) void *Lyrics::Download() { std::string artist = Curl::escape(itsSong.getArtist()); - std::string title = Curl::escape(itsSong.getTitle()); + std::string title_ = Curl::escape(itsSong.getTitle()); LyricsFetcher::Result result; @@ -256,7 +256,7 @@ void *Lyrics::Download() for (LyricsFetcher **plugin = fetcher_defined ? itsFetcher : lyricsPlugins; *plugin != 0; ++plugin) { *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) *w << NC::clRed << ToWString(result.second) << NC::clEnd << '\n'; else |