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

fix shadowing warnings

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-03 15:43:50 +02:00
parent 1a4151b189
commit 226fbdd2c9
5 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/display.cpp
View File

@@ -125,7 +125,7 @@ void showSongs(NC::Menu<T> &menu, const MPD::Song &s, HasSongs &screen, const st
buf.removeFormatting();
if (is_now_playing)
buf << Config.now_playing_suffix;
menu << NC::XY(menu.getWidth()-buf.str().length()-(is_selected ? Config.selected_item_suffix_length : 0), menu.y()) << buf;
menu << NC::XY(menu.getWidth()-buf.str().length()-(is_selected ? Config.selected_item_suffix_length : 0), menu.getY()) << buf;
if (separate_albums)
menu << NC::fmtUnderlineEnd;
return;
@@ -162,13 +162,13 @@ void showSongsInColumns(NC::Menu<T> &menu, const MPD::Song &s, HasSongs &screen)
menu << Config.now_playing_prefix;
int width;
int y = menu.y();
int y = menu.getY();
int remained_width = menu.getWidth();
std::vector<Column>::const_iterator it, last = Config.columns.end() - 1;
for (it = Config.columns.begin(); it != Config.columns.end(); ++it)
{
// check current X coordinate
int x = menu.x();
int x = menu.getX();
// column has relative width and all after it have fixed width,
// so stretch it so it fills whole screen along with these after.
if (it->stretch_limit >= 0) // (*)