From 62ba4ce3430a8eb3965c02438679a039967ab5bb Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Sun, 30 Aug 2009 00:13:45 +0200
Subject: [PATCH] make SelectedItemsAdder::{Width,Height} vars follow the rest
 of private members

---
 src/misc.cpp | 12 ++++++------
 src/misc.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/misc.cpp b/src/misc.cpp
index ace26710..3a733d72 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -37,7 +37,7 @@ SelectedItemsAdder *mySelectedItemsAdder = new SelectedItemsAdder;
 void SelectedItemsAdder::Init()
 {
 	SetDimensions();
-	w = new Menu<std::string>((COLS-Width)/2, (MainHeight-Height)/2+MainStartY, Width, Height, "Add selected items to...", Config.main_color, Config.window_border);
+	w = new Menu<std::string>((COLS-itsWidth)/2, (MainHeight-itsHeight)/2+MainStartY, itsWidth, itsHeight, "Add selected items to...", Config.main_color, Config.window_border);
 	w->SetTimeout(ncmpcpp_window_timeout);
 	w->CyclicScrolling(Config.use_cyclic_scrolling);
 	w->HighlightColor(Config.main_highlight_color);
@@ -101,10 +101,10 @@ void SelectedItemsAdder::SwitchTo()
 void SelectedItemsAdder::Resize()
 {
 	SetDimensions();
-	if (Height < 5) // screen to low to display this window
+	if (itsHeight < 5) // screen too low to display this window
 		return myOldScreen->SwitchTo();
-	w->Resize(Width, Height);
-	w->MoveTo((COLS-Width)/2, (MainHeight-Height)/2+MainStartY);
+	w->Resize(itsWidth, itsHeight);
+	w->MoveTo((COLS-itsWidth)/2, (MainHeight-itsHeight)/2+MainStartY);
 	if (myOldScreen && myOldScreen->hasToBeResized) // resize background window
 	{
 		myOldScreen->Resize();
@@ -184,7 +184,7 @@ void SelectedItemsAdder::MouseButtonPressed(MEVENT me)
 
 void SelectedItemsAdder::SetDimensions()
 {
-	Width = COLS*0.6;
-	Height = std::min(size_t(LINES*0.6), MainHeight);
+	itsWidth = COLS*0.6;
+	itsHeight = std::min(size_t(LINES*0.6), MainHeight);
 }
 
diff --git a/src/misc.h b/src/misc.h
index d04cb78b..8a3e6354 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -46,8 +46,8 @@ class SelectedItemsAdder : public Screen< Menu<std::string> >
 	private:
 		void SetDimensions();
 		
-		size_t Width;
-		size_t Height;
+		size_t itsWidth;
+		size_t itsHeight;
 };
 
 extern SelectedItemsAdder *mySelectedItemsAdder;