Cosmetics

rainmeter · May 30, 2012 · e3d92d3 · e3d92d3
1 parent 6efb485
commit e3d92d3
Show file tree

Hide file tree

Showing 59 changed files with 106 additions and 106 deletions.
diff --git a/Library/Measure.cpp b/Library/Measure.cpp
@@ -115,7 +115,7 @@ void CMeasure::Initialize()
 ** must call the base implementation if they overwrite this method.
 **
 */
-void CMeasure::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasure::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
 	// Clear substitutes to prevent from being added more than once.
 	if (!m_Substitute.empty())

diff --git a/Library/Measure.h b/Library/Measure.h
@@ -49,7 +49,7 @@ class CMeasure : public CGroup
 
 	virtual UINT GetTypeID() = 0;
 
-	void ReadConfig(CConfigParser& parser) { ReadConfig(parser, GetName()); }
+	void ReadOptions(CConfigParser& parser) { ReadOptions(parser, GetName()); }
 
 	virtual void Initialize();
 	bool Update();
@@ -85,7 +85,7 @@ class CMeasure : public CGroup
 	static CMeasure* Create(const WCHAR* measure, CMeterWindow* meterWindow, const WCHAR* name);
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue() = 0;
 
 	bool ParseSubstitute(std::wstring buffer);

diff --git a/Library/MeasureCPU.cpp b/Library/MeasureCPU.cpp
@@ -94,9 +94,9 @@ CMeasureCPU::~CMeasureCPU()
 ** Reads the measure specific configs.
 **
 */
-void CMeasureCPU::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureCPU::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	int processor = parser.ReadInt(section, L"Processor", 0);
 

diff --git a/Library/MeasureCPU.h b/Library/MeasureCPU.h
@@ -32,7 +32,7 @@ class CMeasureCPU : public CMeasure
 	virtual UINT GetTypeID() { return TypeID<CMeasureCPU>(); }
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureCalc.cpp b/Library/MeasureCalc.cpp
@@ -75,9 +75,9 @@ void CMeasureCalc::UpdateValue()
 ** Reads the measure specific configs.
 **
 */
-void CMeasureCalc::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureCalc::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	// Store the current values so we know if the value needs to be updated
 	int oldLowBound = m_LowBound;

diff --git a/Library/MeasureCalc.h b/Library/MeasureCalc.h
@@ -32,7 +32,7 @@ class CMeasureCalc : public CMeasure
 	bool GetMeasureValue(const WCHAR* str, int len, double* value);
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureDiskSpace.cpp b/Library/MeasureDiskSpace.cpp
@@ -179,11 +179,11 @@ const WCHAR* CMeasureDiskSpace::GetStringValue(AUTOSCALE autoScale, double scale
 ** Reads the measure specific configs.
 **
 */
-void CMeasureDiskSpace::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureDiskSpace::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
 	double oldMaxValue = m_MaxValue;
 
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	m_Drive = parser.ReadString(section, L"Drive", L"C:\\");
 	if (m_Drive.empty())

diff --git a/Library/MeasureDiskSpace.h b/Library/MeasureDiskSpace.h
@@ -32,7 +32,7 @@ class CMeasureDiskSpace : public CMeasure
 	virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual);
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureMemory.cpp b/Library/MeasureMemory.cpp
@@ -60,9 +60,9 @@ void CMeasureMemory::UpdateValue()
 ** Reads the measure specific configs.
 **
 */
-void CMeasureMemory::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureMemory::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	m_Total = (1 == parser.ReadInt(section, L"Total", 0));
 

diff --git a/Library/MeasureMemory.h b/Library/MeasureMemory.h
@@ -30,7 +30,7 @@ class CMeasureMemory : public CMeasure
 	virtual UINT GetTypeID() { return TypeID<CMeasureMemory>(); }
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureNet.cpp b/Library/MeasureNet.cpp
@@ -438,7 +438,7 @@ ULONG64 CMeasureNet::GetNetStatsValue(NET net)
 ** the net-parameter informs which inherited class called this method.
 **
 */
-void CMeasureNet::ReadConfig(CConfigParser& parser, const WCHAR* section, NET net)
+void CMeasureNet::ReadOptions(CConfigParser& parser, const WCHAR* section, NET net)
 {
 	double value;
 	const WCHAR* netName = NULL;

diff --git a/Library/MeasureNet.h b/Library/MeasureNet.h
@@ -53,7 +53,7 @@ class CMeasureNet : public CMeasure
 	static void FinalizeNewApi();
 
 protected:
-	void ReadConfig(CConfigParser& parser, const WCHAR* section, CMeasureNet::NET net);
+	void ReadOptions(CConfigParser& parser, const WCHAR* section, CMeasureNet::NET net);
 	void UpdateValue();
 
 	ULONG64 GetNetOctets(NET net);

diff --git a/Library/MeasureNetIn.cpp b/Library/MeasureNetIn.cpp
@@ -82,9 +82,9 @@ void CMeasureNetIn::UpdateValue()
 ** Reads the measure specific configs.
 **
 */
-void CMeasureNetIn::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureNetIn::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
-	CMeasureNet::ReadConfig(parser, section, NET_IN);
+	CMeasureNet::ReadOptions(parser, section, NET_IN);
 }
 
diff --git a/Library/MeasureNetIn.h b/Library/MeasureNetIn.h
@@ -28,7 +28,7 @@ class CMeasureNetIn : public CMeasureNet
 	virtual ~CMeasureNetIn();
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureNetOut.cpp b/Library/MeasureNetOut.cpp
@@ -82,8 +82,8 @@ void CMeasureNetOut::UpdateValue()
 ** Reads the measure specific configs.
 **
 */
-void CMeasureNetOut::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureNetOut::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
-	CMeasureNet::ReadConfig(parser, section, NET_OUT);
+	CMeasureNet::ReadOptions(parser, section, NET_OUT);
 }
diff --git a/Library/MeasureNetOut.h b/Library/MeasureNetOut.h
@@ -28,7 +28,7 @@ class CMeasureNetOut : public CMeasureNet
 	virtual ~CMeasureNetOut();
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureNetTotal.cpp b/Library/MeasureNetTotal.cpp
@@ -82,8 +82,8 @@ void CMeasureNetTotal::UpdateValue()
 ** Reads the measure specific configs.
 **
 */
-void CMeasureNetTotal::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureNetTotal::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
-	CMeasureNet::ReadConfig(parser, section, NET_TOTAL);
+	CMeasureNet::ReadOptions(parser, section, NET_TOTAL);
 }
diff --git a/Library/MeasureNetTotal.h b/Library/MeasureNetTotal.h
@@ -28,7 +28,7 @@ class CMeasureNetTotal : public CMeasureNet
 	virtual ~CMeasureNetTotal();
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasurePhysicalMemory.cpp b/Library/MeasurePhysicalMemory.cpp
@@ -60,9 +60,9 @@ void CMeasurePhysicalMemory::UpdateValue()
 ** Reads the measure specific configs.
 **
 */
-void CMeasurePhysicalMemory::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasurePhysicalMemory::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	m_Total = (1 == parser.ReadInt(section, L"Total", 0));
 

diff --git a/Library/MeasurePhysicalMemory.h b/Library/MeasurePhysicalMemory.h
@@ -30,7 +30,7 @@ class CMeasurePhysicalMemory : public CMeasure
 	virtual UINT GetTypeID() { return TypeID<CMeasurePhysicalMemory>(); }
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasurePlugin.cpp b/Library/MeasurePlugin.cpp
@@ -99,11 +99,11 @@ void CMeasurePlugin::UpdateValue()
 ** Reads the configs and loads & initializes the plugin
 **
 */
-void CMeasurePlugin::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasurePlugin::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
 	static UINT id = 0;
 
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	if (m_Initialized)
 	{

diff --git a/Library/MeasurePlugin.h b/Library/MeasurePlugin.h
@@ -48,7 +48,7 @@ class CMeasurePlugin : public CMeasure
 	virtual void Command(const std::wstring& command);
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureRegistry.cpp b/Library/MeasureRegistry.cpp
@@ -104,9 +104,9 @@ void CMeasureRegistry::UpdateValue()
 ** Reads the measure specific configs.
 **
 */
-void CMeasureRegistry::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureRegistry::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	const WCHAR* keyname = parser.ReadString(section, L"RegHKey", L"HKEY_CURRENT_USER").c_str();
 	if (_wcsicmp(keyname, L"HKEY_CURRENT_USER") == 0)

diff --git a/Library/MeasureRegistry.h b/Library/MeasureRegistry.h
@@ -32,7 +32,7 @@ class CMeasureRegistry : public CMeasure
 	virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual);
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureScript.cpp b/Library/MeasureScript.cpp
@@ -110,10 +110,10 @@ const WCHAR* CMeasureScript::GetStringValue(AUTOSCALE autoScale, double scale, i
 ** Reads the measure specific configs.
 **
 */
-void CMeasureScript::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureScript::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
 	// Read common configs
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	std::wstring file = parser.ReadString(section, L"ScriptFile", L"");
 

diff --git a/Library/MeasureScript.h b/Library/MeasureScript.h
@@ -36,7 +36,7 @@ class CMeasureScript : public CMeasure
 	void DeleteLuaScript();
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureTime.cpp b/Library/MeasureTime.cpp
@@ -210,9 +210,9 @@ const WCHAR* CMeasureTime::GetStringValue(AUTOSCALE autoScale, double scale, int
 ** Reads the measure specific configs.
 **
 */
-void CMeasureTime::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureTime::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	m_Format = parser.ReadString(section, L"Format", L"");
 

diff --git a/Library/MeasureTime.h b/Library/MeasureTime.h
@@ -32,7 +32,7 @@ class CMeasureTime : public CMeasure
 	virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual);
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureUptime.cpp b/Library/MeasureUptime.cpp
@@ -42,9 +42,9 @@ CMeasureUptime::~CMeasureUptime()
 ** Reads the measure specific configs.
 **
 */
-void CMeasureUptime::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureUptime::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	m_Format = parser.ReadString(section, L"Format", L"%4!i!d %3!i!:%2!02i!");
 

diff --git a/Library/MeasureUptime.h b/Library/MeasureUptime.h
@@ -32,7 +32,7 @@ class CMeasureUptime : public CMeasure
 	virtual const WCHAR* GetStringValue(AUTOSCALE autoScale, double scale, int decimals, bool percentual);
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/MeasureVirtualMemory.cpp b/Library/MeasureVirtualMemory.cpp
@@ -60,9 +60,9 @@ void CMeasureVirtualMemory::UpdateValue()
 ** Reads the measure specific configs.
 **
 */
-void CMeasureVirtualMemory::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeasureVirtualMemory::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
-	CMeasure::ReadConfig(parser, section);
+	CMeasure::ReadOptions(parser, section);
 
 	m_Total = (1 == parser.ReadInt(section, L"Total", 0));
 

diff --git a/Library/MeasureVirtualMemory.h b/Library/MeasureVirtualMemory.h
@@ -30,7 +30,7 @@ class CMeasureVirtualMemory : public CMeasure
 	virtual UINT GetTypeID() { return TypeID<CMeasureVirtualMemory>(); }
 
 protected:
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 	virtual void UpdateValue();
 
 private:

diff --git a/Library/Meter.cpp b/Library/Meter.cpp
@@ -253,7 +253,7 @@ void CMeter::Hide()
 ** the base implementation if they overwrite this method.
 **
 */
-void CMeter::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeter::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
 	// The MeterStyle defines a template where the values are read if the meter doesn't have it itself
 	const std::wstring& style = parser.ReadString(section, L"MeterStyle", L"");

diff --git a/Library/Meter.h b/Library/Meter.h
@@ -38,7 +38,7 @@ class CMeter : public CGroup
 
 	virtual UINT GetTypeID() = 0;
 
-	void ReadConfig(CConfigParser& parser) { ReadConfig(parser, GetName()); parser.ClearStyleTemplate(); }
+	void ReadOptions(CConfigParser& parser) { ReadOptions(parser, GetName()); parser.ClearStyleTemplate(); }
 
 	virtual void Initialize();
 	virtual bool Update();
@@ -127,7 +127,7 @@ class CMeter : public CGroup
 		POSITION_RELATIVE_BR
 	};
 
-	virtual void ReadConfig(CConfigParser& parser, const WCHAR* section);
+	virtual void ReadOptions(CConfigParser& parser, const WCHAR* section);
 
 	void SetAllMeasures(CMeasure* measure);
 	void SetAllMeasures(const std::vector<CMeasure*>& measures);

diff --git a/Library/MeterBar.cpp b/Library/MeterBar.cpp
@@ -82,15 +82,15 @@ void CMeterBar::Initialize()
 ** Read the meter-specific configs from the ini-file.
 **
 */
-void CMeterBar::ReadConfig(CConfigParser& parser, const WCHAR* section)
+void CMeterBar::ReadOptions(CConfigParser& parser, const WCHAR* section)
 {
 	// Store the current values so we know if the image needs to be updated
 	std::wstring oldImageName = m_ImageName;
 	int oldW = m_W;
 	int oldH = m_H;
 
 	// Read common configs
-	CMeter::ReadConfig(parser, section);
+	CMeter::ReadOptions(parser, section);
 
 	m_Color = parser.ReadColor(section, L"BarColor", Color::Green);
 
@@ -100,7 +100,7 @@ void CMeterBar::ReadConfig(CConfigParser& parser, const WCHAR* section)
 		m_MeterWindow->MakePathAbsolute(m_ImageName);
 
 		// Read tinting configs
-		m_Image.ReadConfig(parser, section);
+		m_Image.ReadOptions(parser, section);
 	}
 	else
 	{