chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Make Rainmeter a singleton class

Browse Source 
This change is part of making the Libray project more testable. The old g_Rainmeter global pointer has been replaced with a GetRainmeter() function to guarantee that the object exists in some state.
This commit is contained in:
Birunthan Mohanathas
2013-06-13 17:20:27 +03:00
parent a80c905be9
commit 04090b232a
26 changed files with 272 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Measure.cpp
View File

@@ -63,8 +63,6 @@ static const double g_TblScale[2][4] = {
const int MEDIAN_SIZE = 3;
extern Rainmeter* g_Rainmeter;
/*
** The constructor
**
@@ -501,7 +499,7 @@ bool Measure::Update()
if (!m_IfEqualCommitted)
{
m_IfEqualCommitted = true; // To avoid infinite loop from !Update
g_Rainmeter->ExecuteCommand(m_IfEqualAction.c_str(), m_MeterWindow);
GetRainmeter().ExecuteCommand(m_IfEqualAction.c_str(), m_MeterWindow);
}
}
else
@@ -517,7 +515,7 @@ bool Measure::Update()
if (!m_IfAboveCommitted)
{
m_IfAboveCommitted = true; // To avoid infinite loop from !Update
g_Rainmeter->ExecuteCommand(m_IfAboveAction.c_str(), m_MeterWindow);
GetRainmeter().ExecuteCommand(m_IfAboveAction.c_str(), m_MeterWindow);
}
}
else
@@ -533,7 +531,7 @@ bool Measure::Update()
if (!m_IfBelowCommitted)
{
m_IfBelowCommitted = true; // To avoid infinite loop from !Update
g_Rainmeter->ExecuteCommand(m_IfBelowAction.c_str(), m_MeterWindow);
GetRainmeter().ExecuteCommand(m_IfBelowAction.c_str(), m_MeterWindow);
}
}
else
@@ -771,7 +769,7 @@ void Measure::DoChangeAction(bool execute)
{
if (m_OldValue->IsChanged(newValue, newStringValue))
{
g_Rainmeter->ExecuteCommand(m_OnChangeAction.c_str(), m_MeterWindow);
GetRainmeter().ExecuteCommand(m_OnChangeAction.c_str(), m_MeterWindow);
}
}
else