From ba29b5a0ecb14521c5f2571cec9de5fde104fdf2 Mon Sep 17 00:00:00 2001
From: klugier <klugier@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 12 Sep 2020 21:33:18 +0000
Subject: [PATCH] Bazaar: Fix compilation warnings in CMeter.

git-svn-id: svn://ultimatepp.org/upp/trunk@15026 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 bazaar/CMeter/CMeter.cpp |  2 +-
 bazaar/CMeter/CMeter.h   | 51 ++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/bazaar/CMeter/CMeter.cpp b/bazaar/CMeter/CMeter.cpp
index c2fac2265..d6f14a6a0 100644
--- a/bazaar/CMeter/CMeter.cpp
+++ b/bazaar/CMeter/CMeter.cpp
@@ -35,7 +35,7 @@ CMeter::CMeter(double _min, double _max, bool _vertical, bool _reverse)
 
 	, incv(0.0)
 	, inci(0)
-	, __val(min)
+	, __val(_min)
 	, __ii(-1)
 	, px(0)
 	, py(0)
diff --git a/bazaar/CMeter/CMeter.h b/bazaar/CMeter/CMeter.h
index d83917a10..748f44f47 100644
--- a/bazaar/CMeter/CMeter.h
+++ b/bazaar/CMeter/CMeter.h
@@ -29,7 +29,7 @@ public:
 		int mode; //one of the MODES
 	};
 
-	class CVMark 
+	class CVMark
 		: Moveable<CVMark>
 	{
 	public:
@@ -49,7 +49,7 @@ public:
 		IMGCACHE = 0,
 		STATIC,
 		GRADIENT,
-		DYNGRADIENT,	
+		DYNGRADIENT,
 	};
 
 	CMeter(double min = 0.0, double max = 1.0, bool vertical = false, bool reverse = false);
@@ -64,49 +64,49 @@ public:
 	Value GetMin() const { return Min(); }
 	Value GetMax() const { return Max(); }
 
-	CMeter & Set(double val);
-	double Get() const { return val; }
+	CMeter& Set(double val);
+	double  Get() const { return val; }
 
-	CMeter & Val(double val) { return Set(val); }
-	double Val() const { return val; }
+	CMeter& Val(double val) { return Set(val); }
+	double  Val() const { return val; }
 
-	CMeter & Percent(double percent) { Set(min + percent * (max-min) / 100.0); }
-	double Percent() const { return 100.0 * (val-min)/(max-min); }
+	CMeter& Percent(double percent) { Set(min + percent * (max-min) / 100.0); return *this; }
+	double  Percent() const { return 100.0 * (val-min)/(max-min); }
 
-	CMeter & Min(double min);
-	double Min() const { return min; }
+	CMeter& Min(double min);
+	double  Min() const { return min; }
 
-	CMeter & Max(double max);
-	double Max() const { return max; }
+	CMeter& Max(double max);
+	double  Max() const { return max; }
 
-	CMeter & MinMax(double min = 0.0, double max = 1.0);
+	CMeter& MinMax(double min = 0.0, double max = 1.0);
 
-	CMeter & Reverse(bool reverse = true);
+	CMeter& Reverse(bool reverse = true);
 	bool IsReverse() const { return reverse; }
 
-	CMeter & Vertical(bool vertical = true);
+	CMeter& Vertical(bool vertical = true);
 	bool IsVertical() const { return vertical; }
 
-	CMeter & Stepping(bool stepping = true);
+	CMeter& Stepping(bool stepping = true);
 	bool IsStepping() const { return stepping; }
 
-	CMeter & StepLinear(bool steplin = true);
+	CMeter& StepLinear(bool steplin = true);
 	bool IsStepLinear() { return steplin; }
 
-	CMeter & IncDecToStep(bool b = true) { incdectostep = b; return *this; }
+	CMeter& IncDecToStep(bool b = true) { incdectostep = b; return *this; }
 	bool IsIncDecToStep() { return incdectostep; }
 
-	CMeter & Steps(const Vector<double> & vsteps, bool reverse = false);
+	CMeter& Steps(const Vector<double> & vsteps, bool reverse = false);
 	void GetSteps(Vector<double> & vstep) { vsteps <<= this->vsteps; }
 
-	CMeter & ShowValue(bool showvalue = true);
-	CMeter & HideValue() { return ShowValue(false); }
+	CMeter& ShowValue(bool showvalue = true);
+	CMeter& HideValue() { return ShowValue(false); }
 	bool IsShowValue() { return showvalue; }
 
-	CMeter & ShowPercent(bool showpercent = true);
+	CMeter& ShowPercent(bool showpercent = true);
 	bool IsShowPercent() { return showpercent; }
 
-	CMeter & SetMode(int mode);
+	CMeter& SetMode(int mode);
 	int GetMode() const { return drawmode; }
 
 	void Inc();
@@ -134,8 +134,8 @@ protected:
 	virtual void Update();
 	
 	virtual void LeftRepeat(Point p, dword keyflags);
-	virtual void LeftDown(Point p, dword keyflags);			
-	virtual void LeftUp(Point p, dword keyflags) ;	
+	virtual void LeftDown(Point p, dword keyflags);
+	virtual void LeftUp(Point p, dword keyflags);
 	virtual void MouseMove(Point p, dword keyflags);
 	virtual void MouseWheel(Point p, int zdelta, dword keyflags);
 
@@ -209,7 +209,6 @@ protected:
 
 	int drawmode;
 
-
 	Font font;
 	Image draw;
 	Vector<double> vsteps;