From e3d92d354ca0f250ad428ac40ec7f6b150b448a6 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Wed, 30 May 2012 21:53:44 +0300 Subject: [PATCH] Cosmetics --- Library/Measure.cpp | 2 +- Library/Measure.h | 4 ++-- Library/MeasureCPU.cpp | 4 ++-- Library/MeasureCPU.h | 2 +- Library/MeasureCalc.cpp | 4 ++-- Library/MeasureCalc.h | 2 +- Library/MeasureDiskSpace.cpp | 4 ++-- Library/MeasureDiskSpace.h | 2 +- Library/MeasureMemory.cpp | 4 ++-- Library/MeasureMemory.h | 2 +- Library/MeasureNet.cpp | 2 +- Library/MeasureNet.h | 2 +- Library/MeasureNetIn.cpp | 6 +++--- Library/MeasureNetIn.h | 2 +- Library/MeasureNetOut.cpp | 6 +++--- Library/MeasureNetOut.h | 2 +- Library/MeasureNetTotal.cpp | 6 +++--- Library/MeasureNetTotal.h | 2 +- Library/MeasurePhysicalMemory.cpp | 4 ++-- Library/MeasurePhysicalMemory.h | 2 +- Library/MeasurePlugin.cpp | 4 ++-- Library/MeasurePlugin.h | 2 +- Library/MeasureRegistry.cpp | 4 ++-- Library/MeasureRegistry.h | 2 +- Library/MeasureScript.cpp | 4 ++-- Library/MeasureScript.h | 2 +- Library/MeasureTime.cpp | 4 ++-- Library/MeasureTime.h | 2 +- Library/MeasureUptime.cpp | 4 ++-- Library/MeasureUptime.h | 2 +- Library/MeasureVirtualMemory.cpp | 4 ++-- Library/MeasureVirtualMemory.h | 2 +- Library/Meter.cpp | 2 +- Library/Meter.h | 4 ++-- Library/MeterBar.cpp | 6 +++--- Library/MeterBar.h | 2 +- Library/MeterBitmap.cpp | 6 +++--- Library/MeterBitmap.h | 2 +- Library/MeterButton.cpp | 6 +++--- Library/MeterButton.h | 2 +- Library/MeterHistogram.cpp | 10 +++++----- Library/MeterHistogram.h | 2 +- Library/MeterImage.cpp | 6 +++--- Library/MeterImage.h | 2 +- Library/MeterLine.cpp | 4 ++-- Library/MeterLine.h | 2 +- Library/MeterRotator.cpp | 6 +++--- Library/MeterRotator.h | 2 +- Library/MeterRoundLine.cpp | 4 ++-- Library/MeterRoundLine.h | 2 +- Library/MeterString.cpp | 4 ++-- Library/MeterString.h | 2 +- Library/MeterWindow.cpp | 22 +++++++++++----------- Library/MeterWindow.h | 2 +- Library/Rainmeter.cpp | 2 +- Library/TintedImage.cpp | 2 +- Library/TintedImage.h | 2 +- Library/TrayWindow.cpp | 4 ++-- Library/TrayWindow.h | 2 +- 59 files changed, 106 insertions(+), 106 deletions(-) diff --git a/Library/Measure.cpp b/Library/Measure.cpp index 173622e3..0b335e97 100644 --- 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 index b2ba88c4..9f607539 100644 --- a/Library/Measure.h +++ b/Library/Measure.h @@ -49,7 +49,7 @@ public: 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 @@ public: 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 index 8cd0ea60..05a712ed 100644 --- 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 index 65e20eb7..f3a3ffec 100644 --- a/Library/MeasureCPU.h +++ b/Library/MeasureCPU.h @@ -32,7 +32,7 @@ public: virtual UINT GetTypeID() { return TypeID(); } 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 index 0edeaea3..9e882470 100644 --- 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 index b5a64722..6ed63bb8 100644 --- a/Library/MeasureCalc.h +++ b/Library/MeasureCalc.h @@ -32,7 +32,7 @@ public: 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 index fa3369ed..bf7d3b92 100644 --- 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 index 28fb9778..b45d2a55 100644 --- a/Library/MeasureDiskSpace.h +++ b/Library/MeasureDiskSpace.h @@ -32,7 +32,7 @@ public: 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 index e84198c6..0925354c 100644 --- 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 index 6f0faf9e..0f033f9b 100644 --- a/Library/MeasureMemory.h +++ b/Library/MeasureMemory.h @@ -30,7 +30,7 @@ public: virtual UINT GetTypeID() { return TypeID(); } 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 index 9b45d8ed..4bf1ac80 100644 --- 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 index 4e4c66ad..fd10b80e 100644 --- a/Library/MeasureNet.h +++ b/Library/MeasureNet.h @@ -53,7 +53,7 @@ public: 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 index d633bca0..fd77852b 100644 --- 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); - CMeasureNet::ReadConfig(parser, section, NET_IN); + CMeasure::ReadOptions(parser, section); + CMeasureNet::ReadOptions(parser, section, NET_IN); } diff --git a/Library/MeasureNetIn.h b/Library/MeasureNetIn.h index e9397cb4..39515f19 100644 --- a/Library/MeasureNetIn.h +++ b/Library/MeasureNetIn.h @@ -28,7 +28,7 @@ public: 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 index 0b6a083a..018a4e51 100644 --- 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); - CMeasureNet::ReadConfig(parser, section, NET_OUT); + CMeasure::ReadOptions(parser, section); + CMeasureNet::ReadOptions(parser, section, NET_OUT); } diff --git a/Library/MeasureNetOut.h b/Library/MeasureNetOut.h index 44421e5c..804b9f50 100644 --- a/Library/MeasureNetOut.h +++ b/Library/MeasureNetOut.h @@ -28,7 +28,7 @@ public: 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 index 6092a64f..973d5a6d 100644 --- 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); - CMeasureNet::ReadConfig(parser, section, NET_TOTAL); + CMeasure::ReadOptions(parser, section); + CMeasureNet::ReadOptions(parser, section, NET_TOTAL); } diff --git a/Library/MeasureNetTotal.h b/Library/MeasureNetTotal.h index 63850997..92f6db5d 100644 --- a/Library/MeasureNetTotal.h +++ b/Library/MeasureNetTotal.h @@ -28,7 +28,7 @@ public: 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 index db45082a..e071e90e 100644 --- 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 index 2b6df1fc..72e33744 100644 --- a/Library/MeasurePhysicalMemory.h +++ b/Library/MeasurePhysicalMemory.h @@ -30,7 +30,7 @@ public: virtual UINT GetTypeID() { return TypeID(); } 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 index 7e156722..4b6c2e5b 100644 --- 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 index 0e6d825f..3dedb406 100644 --- a/Library/MeasurePlugin.h +++ b/Library/MeasurePlugin.h @@ -48,7 +48,7 @@ public: 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 index bf0a0dc0..20abdedd 100644 --- 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 index acfd2b8b..dda358cb 100644 --- a/Library/MeasureRegistry.h +++ b/Library/MeasureRegistry.h @@ -32,7 +32,7 @@ public: 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 index 7387db0e..90a191a1 100644 --- 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 index 2ec261ef..a10376a9 100644 --- a/Library/MeasureScript.h +++ b/Library/MeasureScript.h @@ -36,7 +36,7 @@ public: 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 index 37d0df11..3aeb9591 100644 --- 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 index 59161713..67717a03 100644 --- a/Library/MeasureTime.h +++ b/Library/MeasureTime.h @@ -32,7 +32,7 @@ public: 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 index 4d6f51ce..0738903b 100644 --- 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 index ad2dcbe3..f3961d82 100644 --- a/Library/MeasureUptime.h +++ b/Library/MeasureUptime.h @@ -32,7 +32,7 @@ public: 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 index f3e617f6..b2beee0f 100644 --- 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 index 51de7877..38382921 100644 --- a/Library/MeasureVirtualMemory.h +++ b/Library/MeasureVirtualMemory.h @@ -30,7 +30,7 @@ public: virtual UINT GetTypeID() { return TypeID(); } 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 index 1b10413c..96c5ba91 100644 --- 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 index dc50ec37..2978bd5f 100644 --- a/Library/Meter.h +++ b/Library/Meter.h @@ -38,7 +38,7 @@ public: 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 @@ protected: 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& measures); diff --git a/Library/MeterBar.cpp b/Library/MeterBar.cpp index 503578ac..ab87121b 100644 --- a/Library/MeterBar.cpp +++ b/Library/MeterBar.cpp @@ -82,7 +82,7 @@ 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; @@ -90,7 +90,7 @@ void CMeterBar::ReadConfig(CConfigParser& parser, const WCHAR* section) 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 { diff --git a/Library/MeterBar.h b/Library/MeterBar.h index 1666998c..1134940f 100644 --- a/Library/MeterBar.h +++ b/Library/MeterBar.h @@ -35,7 +35,7 @@ public: virtual bool Draw(Gdiplus::Graphics& graphics); protected: - virtual void ReadConfig(CConfigParser& parser, const WCHAR* section); + virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); private: enum ORIENTATION diff --git a/Library/MeterBitmap.cpp b/Library/MeterBitmap.cpp index 027a9dec..7daf9a20 100644 --- a/Library/MeterBitmap.cpp +++ b/Library/MeterBitmap.cpp @@ -154,7 +154,7 @@ bool CMeterBitmap::HitTest(int x, int y) ** Read the meter-specific configs from the ini-file. ** */ -void CMeterBitmap::ReadConfig(CConfigParser& parser, const WCHAR* section) +void CMeterBitmap::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; @@ -162,7 +162,7 @@ void CMeterBitmap::ReadConfig(CConfigParser& parser, const WCHAR* section) int oldH = m_H; // Read common configs - CMeter::ReadConfig(parser, section); + CMeter::ReadOptions(parser, section); m_ImageName = parser.ReadString(section, L"BitmapImage", L""); if (!m_ImageName.empty()) @@ -170,7 +170,7 @@ void CMeterBitmap::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 { diff --git a/Library/MeterBitmap.h b/Library/MeterBitmap.h index 026160e3..6df71fc6 100644 --- a/Library/MeterBitmap.h +++ b/Library/MeterBitmap.h @@ -38,7 +38,7 @@ public: virtual bool HasActiveTransition(); protected: - virtual void ReadConfig(CConfigParser& parser, const WCHAR* section); + virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); private: CTintedImage m_Image; diff --git a/Library/MeterButton.cpp b/Library/MeterButton.cpp index c5aabc57..524fcc57 100644 --- a/Library/MeterButton.cpp +++ b/Library/MeterButton.cpp @@ -126,7 +126,7 @@ void CMeterButton::Initialize() ** Read the meter-specific configs from the ini-file. ** */ -void CMeterButton::ReadConfig(CConfigParser& parser, const WCHAR* section) +void CMeterButton::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; @@ -134,7 +134,7 @@ void CMeterButton::ReadConfig(CConfigParser& parser, const WCHAR* section) int oldH = m_H; // Read common configs - CMeter::ReadConfig(parser, section); + CMeter::ReadOptions(parser, section); m_ImageName = parser.ReadString(section, L"ButtonImage", L""); if (!m_ImageName.empty()) @@ -142,7 +142,7 @@ void CMeterButton::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 { diff --git a/Library/MeterButton.h b/Library/MeterButton.h index ad4d5c58..2e477744 100644 --- a/Library/MeterButton.h +++ b/Library/MeterButton.h @@ -44,7 +44,7 @@ public: void SetFocus(bool f) { m_Focus = f; } protected: - virtual void ReadConfig(CConfigParser& parser, const WCHAR* section); + virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); private: bool HitTest2(int px, int py, bool checkAlpha); diff --git a/Library/MeterHistogram.cpp b/Library/MeterHistogram.cpp index a9334574..041878d2 100644 --- a/Library/MeterHistogram.cpp +++ b/Library/MeterHistogram.cpp @@ -182,7 +182,7 @@ void CMeterHistogram::Initialize() ** Read the meter-specific configs from the ini-file. ** */ -void CMeterHistogram::ReadConfig(CConfigParser& parser, const WCHAR* section) +void CMeterHistogram::ReadOptions(CConfigParser& parser, const WCHAR* section) { // Store the current values so we know if the image needs to be updated std::wstring oldPrimaryImageName = m_PrimaryImageName; @@ -192,7 +192,7 @@ void CMeterHistogram::ReadConfig(CConfigParser& parser, const WCHAR* section) int oldH = m_H; // Read common configs - CMeter::ReadConfig(parser, section); + CMeter::ReadOptions(parser, section); m_PrimaryColor = parser.ReadColor(section, L"PrimaryColor", Color::Green); m_SecondaryColor = parser.ReadColor(section, L"SecondaryColor", Color::Red); @@ -213,7 +213,7 @@ void CMeterHistogram::ReadConfig(CConfigParser& parser, const WCHAR* section) m_MeterWindow->MakePathAbsolute(m_PrimaryImageName); // Read tinting configs - m_PrimaryImage.ReadConfig(parser, section); + m_PrimaryImage.ReadOptions(parser, section); } else { @@ -226,7 +226,7 @@ void CMeterHistogram::ReadConfig(CConfigParser& parser, const WCHAR* section) m_MeterWindow->MakePathAbsolute(m_SecondaryImageName); // Read tinting configs - m_SecondaryImage.ReadConfig(parser, section); + m_SecondaryImage.ReadOptions(parser, section); } else { @@ -239,7 +239,7 @@ void CMeterHistogram::ReadConfig(CConfigParser& parser, const WCHAR* section) m_MeterWindow->MakePathAbsolute(m_OverlapImageName); // Read tinting configs - m_OverlapImage.ReadConfig(parser, section); + m_OverlapImage.ReadOptions(parser, section); } else { diff --git a/Library/MeterHistogram.h b/Library/MeterHistogram.h index 6620d7d6..1c46f739 100644 --- a/Library/MeterHistogram.h +++ b/Library/MeterHistogram.h @@ -36,7 +36,7 @@ public: virtual void BindMeasure(const std::list& measures); protected: - virtual void ReadConfig(CConfigParser& parser, const WCHAR* section); + virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); private: void DisposeBuffer(); diff --git a/Library/MeterImage.cpp b/Library/MeterImage.cpp index ef5d8ea1..656d95b0 100644 --- a/Library/MeterImage.cpp +++ b/Library/MeterImage.cpp @@ -106,10 +106,10 @@ void CMeterImage::LoadImage(const std::wstring& imageName, bool bLoadAlways) ** Read the meter-specific configs from the ini-file. ** */ -void CMeterImage::ReadConfig(CConfigParser& parser, const WCHAR* section) +void CMeterImage::ReadOptions(CConfigParser& parser, const WCHAR* section) { // Read common configs - CMeter::ReadConfig(parser, section); + CMeter::ReadOptions(parser, section); // Check for extra measures if (!m_Initialized && !m_MeasureName.empty()) @@ -135,7 +135,7 @@ void CMeterImage::ReadConfig(CConfigParser& parser, const WCHAR* section) m_ScaleMargins = parser.ReadRECT(section, L"ScaleMargins", defMargins); // Read tinting configs - m_Image.ReadConfig(parser, section); + m_Image.ReadOptions(parser, section); if (m_Initialized && !m_Measure && !m_DynamicVariables) diff --git a/Library/MeterImage.h b/Library/MeterImage.h index b248622d..e68355d4 100644 --- a/Library/MeterImage.h +++ b/Library/MeterImage.h @@ -36,7 +36,7 @@ public: virtual void BindMeasure(const std::list& measures); protected: - virtual void ReadConfig(CConfigParser& parser, const WCHAR* section); + virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); private: void LoadImage(const std::wstring& imageName, bool bLoadAlways); diff --git a/Library/MeterLine.cpp b/Library/MeterLine.cpp index 9be0651e..d3dfc8d2 100644 --- a/Library/MeterLine.cpp +++ b/Library/MeterLine.cpp @@ -99,7 +99,7 @@ void CMeterLine::Initialize() ** Read the meter-specific configs from the ini-file. ** */ -void CMeterLine::ReadConfig(CConfigParser& parser, const WCHAR* section) +void CMeterLine::ReadOptions(CConfigParser& parser, const WCHAR* section) { WCHAR tmpName[64]; @@ -108,7 +108,7 @@ void CMeterLine::ReadConfig(CConfigParser& parser, const WCHAR* section) int oldW = m_W; // Read common configs - CMeter::ReadConfig(parser, section); + CMeter::ReadOptions(parser, section); int lineCount = parser.ReadInt(section, L"LineCount", 1); diff --git a/Library/MeterLine.h b/Library/MeterLine.h index 8828eff5..65c407d7 100644 --- a/Library/MeterLine.h +++ b/Library/MeterLine.h @@ -35,7 +35,7 @@ public: virtual void BindMeasure(const std::list& measures); protected: - virtual void ReadConfig(CConfigParser& parser, const WCHAR* section); + virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); private: std::vector m_MeasureNames; diff --git a/Library/MeterRotator.cpp b/Library/MeterRotator.cpp index 064ff1be..833280f6 100644 --- a/Library/MeterRotator.cpp +++ b/Library/MeterRotator.cpp @@ -76,13 +76,13 @@ void CMeterRotator::Initialize() ** Read the meter-specific configs from the ini-file. ** */ -void CMeterRotator::ReadConfig(CConfigParser& parser, const WCHAR* section) +void CMeterRotator::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; // Read common configs - CMeter::ReadConfig(parser, section); + CMeter::ReadOptions(parser, section); m_ImageName = parser.ReadString(section, L"ImageName", L""); if (!m_ImageName.empty()) @@ -90,7 +90,7 @@ void CMeterRotator::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 { diff --git a/Library/MeterRotator.h b/Library/MeterRotator.h index 9d30b5d1..77973c06 100644 --- a/Library/MeterRotator.h +++ b/Library/MeterRotator.h @@ -35,7 +35,7 @@ public: virtual bool Draw(Gdiplus::Graphics& graphics); protected: - virtual void ReadConfig(CConfigParser& parser, const WCHAR* section); + virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); private: CTintedImage m_Image; diff --git a/Library/MeterRoundLine.cpp b/Library/MeterRoundLine.cpp index d4cf0228..16387522 100644 --- a/Library/MeterRoundLine.cpp +++ b/Library/MeterRoundLine.cpp @@ -60,10 +60,10 @@ CMeterRoundLine::~CMeterRoundLine() ** Read the meter-specific configs from the ini-file. ** */ -void CMeterRoundLine::ReadConfig(CConfigParser& parser, const WCHAR* section) +void CMeterRoundLine::ReadOptions(CConfigParser& parser, const WCHAR* section) { // Read common configs - CMeter::ReadConfig(parser, section); + CMeter::ReadOptions(parser, section); m_LineWidth = parser.ReadFloat(section, L"LineWidth", 1.0); m_LineLength = parser.ReadFloat(section, L"LineLength", 20.0); diff --git a/Library/MeterRoundLine.h b/Library/MeterRoundLine.h index 2c1ec052..4634424c 100644 --- a/Library/MeterRoundLine.h +++ b/Library/MeterRoundLine.h @@ -33,7 +33,7 @@ public: virtual bool Draw(Gdiplus::Graphics& graphics); protected: - virtual void ReadConfig(CConfigParser& parser, const WCHAR* section); + virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); private: bool m_Solid; diff --git a/Library/MeterString.cpp b/Library/MeterString.cpp index a609ed90..c87956ac 100644 --- a/Library/MeterString.cpp +++ b/Library/MeterString.cpp @@ -310,7 +310,7 @@ void CMeterString::Initialize() ** Read the meter-specific configs from the ini-file. ** */ -void CMeterString::ReadConfig(CConfigParser& parser, const WCHAR* section) +void CMeterString::ReadOptions(CConfigParser& parser, const WCHAR* section) { // Store the current font values so we know if the font needs to be updated std::wstring oldFontFace = m_FontFace; @@ -318,7 +318,7 @@ void CMeterString::ReadConfig(CConfigParser& parser, const WCHAR* section) TEXTSTYLE oldStyle = m_Style; // Read common configs - CMeter::ReadConfig(parser, section); + CMeter::ReadOptions(parser, section); // Check for extra measures if (!m_Initialized && !m_MeasureName.empty()) diff --git a/Library/MeterString.h b/Library/MeterString.h index d75959b4..26dafb15 100644 --- a/Library/MeterString.h +++ b/Library/MeterString.h @@ -45,7 +45,7 @@ public: static void EnumerateInstalledFontFamilies(); protected: - virtual void ReadConfig(CConfigParser& parser, const WCHAR* section); + virtual void ReadOptions(CConfigParser& parser, const WCHAR* section); private: enum TEXTSTYLE diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp index 673163f3..baebc2c5 100644 --- a/Library/MeterWindow.cpp +++ b/Library/MeterWindow.cpp @@ -394,7 +394,7 @@ void CMeterWindow::Refresh(bool init, bool all) ZPOSITION oldZPos = m_WindowZPosition; //TODO: Should these be moved to a Reload command instead of hitting the disk on every refresh - ReadConfig(); // Read the general settings + ReadOptions(); // Read the general settings if (!ReadSkin()) { Rainmeter->DeactivateConfig(this, -1); @@ -1361,7 +1361,7 @@ void CMeterWindow::SetOption(const std::wstring& section, const std::wstring& op { if ((*j)->BelongsToGroup(section)) { - // Force DynamicVariables temporarily (it will reset back to original setting in ReadConfig()) + // Force DynamicVariables temporarily (it will reset back to original setting in ReadOptions()) (*j)->SetDynamicVariables(true); if (value.empty()) @@ -1379,7 +1379,7 @@ void CMeterWindow::SetOption(const std::wstring& section, const std::wstring& op { if ((*i)->BelongsToGroup(section)) { - // Force DynamicVariables temporarily (it will reset back to original setting in ReadConfig()) + // Force DynamicVariables temporarily (it will reset back to original setting in ReadOptions()) (*i)->SetDynamicVariables(true); if (value.empty()) @@ -1398,7 +1398,7 @@ void CMeterWindow::SetOption(const std::wstring& section, const std::wstring& op CMeter* meter = GetMeter(section); if (meter) { - // Force DynamicVariables temporarily (it will reset back to original setting in ReadConfig()) + // Force DynamicVariables temporarily (it will reset back to original setting in ReadOptions()) meter->SetDynamicVariables(true); if (value.empty()) @@ -1416,7 +1416,7 @@ void CMeterWindow::SetOption(const std::wstring& section, const std::wstring& op CMeasure* measure = GetMeasure(section); if (measure) { - // Force DynamicVariables temporarily (it will reset back to original setting in ReadConfig()) + // Force DynamicVariables temporarily (it will reset back to original setting in ReadOptions()) measure->SetDynamicVariables(true); if (value.empty()) @@ -1776,7 +1776,7 @@ void CMeterWindow::ScreenToWindow() ** Reads the current config ** */ -void CMeterWindow::ReadConfig() +void CMeterWindow::ReadOptions() { WCHAR buffer[32]; const std::wstring& iniFile = Rainmeter->GetIniFile(); @@ -2170,7 +2170,7 @@ bool CMeterWindow::ReadSkin() measure = CMeasure::Create(measureName.c_str(), this, section); if (measure) { - measure->ReadConfig(m_Parser); + measure->ReadOptions(m_Parser); m_Measures.push_back(measure); m_Parser.AddMeasure(measure); @@ -2202,7 +2202,7 @@ bool CMeterWindow::ReadSkin() meter = CMeter::Create(meterName.c_str(), this, section); if (meter) { - meter->ReadConfig(m_Parser); + meter->ReadOptions(m_Parser); m_Meters.push_back(meter); @@ -2338,7 +2338,7 @@ bool CMeterWindow::ResizeWindow(bool reset) { // Load the background CTintedImage* tintedBackground = new CTintedImage(L"Background"); - tintedBackground->ReadConfig(m_Parser, L"Rainmeter"); + tintedBackground->ReadOptions(m_Parser, L"Rainmeter"); tintedBackground->LoadImage(m_BackgroundName, true); if (!tintedBackground->IsLoaded()) @@ -2652,7 +2652,7 @@ bool CMeterWindow::UpdateMeasure(CMeasure* measure, bool force) { try { - measure->ReadConfig(m_Parser); + measure->ReadOptions(m_Parser); } catch (CError& error) { @@ -2690,7 +2690,7 @@ bool CMeterWindow::UpdateMeter(CMeter* meter, bool& bActiveTransition, bool forc { try { - meter->ReadConfig(m_Parser); + meter->ReadOptions(m_Parser); } catch (CError& error) { diff --git a/Library/MeterWindow.h b/Library/MeterWindow.h index 80915df5..a61b4b4d 100644 --- a/Library/MeterWindow.h +++ b/Library/MeterWindow.h @@ -322,7 +322,7 @@ private: bool UpdateMeter(CMeter* meter, bool& bActiveTransition, bool force); void Update(bool refresh); void UpdateWindow(int alpha, bool reset); - void ReadConfig(); + void ReadOptions(); void WriteConfig(INT setting = SETTING_ALL); bool ReadSkin(); void InitializeMeasures(); diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp index d3bc4b9c..82526348 100644 --- a/Library/Rainmeter.cpp +++ b/Library/Rainmeter.cpp @@ -2174,7 +2174,7 @@ void CRainmeter::ReadGeneralSettings(const std::wstring& iniFile) if (m_TrayWindow) { - m_TrayWindow->ReadConfig(parser); + m_TrayWindow->ReadOptions(parser); } m_GlobalConfig.netInSpeed = parser.ReadFloat(L"Rainmeter", L"NetInSpeed", 0.0); diff --git a/Library/TintedImage.cpp b/Library/TintedImage.cpp index 4361a0dd..0a37a5e5 100644 --- a/Library/TintedImage.cpp +++ b/Library/TintedImage.cpp @@ -566,7 +566,7 @@ void CTintedImage::ApplyTransform() ** Read the meter-specific configs from the ini-file. ** */ -void CTintedImage::ReadConfig(CConfigParser& parser, const WCHAR* section) +void CTintedImage::ReadOptions(CConfigParser& parser, const WCHAR* section) { // Store the current values so we know if the image needs to be tinted or transformed Rect oldCrop = m_Crop; diff --git a/Library/TintedImage.h b/Library/TintedImage.h index 41ac8774..b6dd07b6 100644 --- a/Library/TintedImage.h +++ b/Library/TintedImage.h @@ -68,7 +68,7 @@ public: CTintedImage(const WCHAR* name = L"Image", const WCHAR** configArray = c_DefaultOptionArray, bool disableTransform = false); ~CTintedImage(); - void ReadConfig(CConfigParser& parser, const WCHAR* section); + void ReadOptions(CConfigParser& parser, const WCHAR* section); bool IsLoaded() { return (m_Bitmap != NULL); } bool IsTinted() { return (m_BitmapTint != NULL); } diff --git a/Library/TrayWindow.cpp b/Library/TrayWindow.cpp index 3df80f10..4bcd5790 100644 --- a/Library/TrayWindow.cpp +++ b/Library/TrayWindow.cpp @@ -301,7 +301,7 @@ void CTrayWindow::ShowUpdateNotification(const WCHAR* newVersion) ShowNotification(TRAY_NOTIFICATION_UPDATE, GetString(ID_STR_UPDATEAVAILABLE), text.c_str()); } -void CTrayWindow::ReadConfig(CConfigParser& parser) +void CTrayWindow::ReadOptions(CConfigParser& parser) { // Clear old Settings KillTimer(m_Window, TIMER_TRAY); @@ -337,7 +337,7 @@ void CTrayWindow::ReadConfig(CConfigParser& parser) m_Measure = CMeasure::Create(measureName.c_str(), NULL, L"TrayMeasure"); if (m_Measure) { - m_Measure->ReadConfig(parser); + m_Measure->ReadOptions(parser); } } catch (CError& error) diff --git a/Library/TrayWindow.h b/Library/TrayWindow.h index 864ecab8..dcf64ff4 100644 --- a/Library/TrayWindow.h +++ b/Library/TrayWindow.h @@ -44,7 +44,7 @@ public: void Initialize(); - void ReadConfig(CConfigParser& parser); + void ReadOptions(CConfigParser& parser); HWND GetWindow() { return m_Window; } bool IsTrayIconEnabled() { return m_IconEnabled; }