actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix duplication symbol issue on Mac.

Browse Source 
This may have affected Linux as well.
This commit is contained in:
Jason Felds
2013-04-21 09:31:45 -04:00
parent c7b8664604
commit 0c4fe367cc
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ThemeManager.cpp
+5 -5
View File
@@ -64,7 +64,7 @@ LoadedThemeData *g_pLoadedThemeData = NULL;
// For self-registering metrics
#include "SubscriptionManager.h"
SubscriptionManager<IThemeMetric> & GetSubscribers()
SubscriptionManager<IThemeMetric> & GetMetricSubscribers()
{
static SubscriptionManager<IThemeMetric> subscribers;
return subscribers;
@@ -100,7 +100,7 @@ public:
void ThemeManager::Subscribe( IThemeMetric *p )
{
GetSubscribers().Subscribe( p );
GetMetricSubscribers().Subscribe( p );
// It's ThemeManager's responsibility to make sure all of its subscribers
// are updated with current data. If a metric is created after
@@ -112,7 +112,7 @@ void ThemeManager::Subscribe( IThemeMetric *p )
void ThemeManager::Unsubscribe( IThemeMetric *p )
{
GetSubscribers().Unsubscribe( p );
GetMetricSubscribers().Unsubscribe( p );
}
@@ -434,13 +434,13 @@ void ThemeManager::SwitchThemeAndLanguage( const RString &sThemeName_, const RSt
void ThemeManager::ReloadSubscribers()
{
// reload subscribers
FOREACHS_CONST( IThemeMetric*, GetSubscribers().m_pSubscribers, p )
FOREACHS_CONST( IThemeMetric*, GetMetricSubscribers().m_pSubscribers, p )
(*p)->Read();
}
void ThemeManager::ClearSubscribers()
{
FOREACHS_CONST( IThemeMetric*, GetSubscribers().m_pSubscribers, p )
FOREACHS_CONST( IThemeMetric*, GetMetricSubscribers().m_pSubscribers, p )
(*p)->Clear();
}