- Renamed bool ReadFormula() to ParseFormula.

- Changed ReadConfig() in Measure/Meter to protected.
- Other code tweaks and cleanups.

Library/MeterString.h

@@ -23,11 +23,6 @@
 #include "Measure.h"
 #include <unordered_map>
 
-namespace Gdiplus
-{
-class Font;
-}
-
 class CMeterString : public CMeter
 {
 public:
@@ -36,7 +31,6 @@ public:
 
 	virtual int GetX(bool abs = false);
 
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
 	virtual void Initialize();
 	virtual bool Update();
 	void SetText(const WCHAR* text) { m_Text = text; }
@@ -47,6 +41,9 @@ public:
 	static void FreeFontCache(Gdiplus::PrivateFontCollection* collection = NULL);
 	static void EnumerateInstalledFontFamilies();
 
+protected:
+	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+
 private:
 	enum TEXTSTYLE
 	{