diff options
| author | George Hazan <ghazan@miranda.im> | 2019-02-21 15:58:11 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-02-21 15:58:11 +0300 |
| commit | 7f4db3773e723059ddd50b63b21717cc941ca424 (patch) | |
| tree | e7c904de02cfd308070b3e5ee779183804e5f505 /plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp | |
| parent | 98e5dab950ab976bbf244dc21e7bfe2353722d45 (diff) | |
the less boost and other C++ perversions - the better
Diffstat (limited to 'plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp')
| -rw-r--r-- | plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp b/plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp index 6193a85389..93f904b28a 100644 --- a/plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp +++ b/plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp @@ -122,8 +122,8 @@ CXMLFileInfo init_xml_info(LPCTSTR pszFileName, bool& rbSucceded) return parse_ini_file(sIniFile, rbSucceded); } -CCurrencyRatesProviderBase::CCurrencyRatesProviderBase() - : m_hEventSettingsChanged(::CreateEvent(nullptr, FALSE, FALSE, nullptr)), +CCurrencyRatesProviderBase::CCurrencyRatesProviderBase() : + m_hEventSettingsChanged(::CreateEvent(nullptr, FALSE, FALSE, nullptr)), m_hEventRefreshContact(::CreateEvent(nullptr, FALSE, FALSE, nullptr)), m_bRefreshInProgress(false) { @@ -131,37 +131,34 @@ CCurrencyRatesProviderBase::CCurrencyRatesProviderBase() CCurrencyRatesProviderBase::~CCurrencyRatesProviderBase() { + delete m_pXMLInfo; + ::CloseHandle(m_hEventSettingsChanged); ::CloseHandle(m_hEventRefreshContact); } bool CCurrencyRatesProviderBase::Init() { - bool bSucceded = m_pXMLInfo != nullptr; + bool bSucceded = (m_pXMLInfo == nullptr); if (!m_pXMLInfo) - m_pXMLInfo.reset(new CXMLFileInfo(init_xml_info(DB_DEF_IniFileName, bSucceded))); + m_pXMLInfo = new CXMLFileInfo(init_xml_info(DB_DEF_IniFileName, bSucceded)); return bSucceded; } -CXMLFileInfo* CCurrencyRatesProviderBase::GetXMLFileInfo() const -{ - return m_pXMLInfo.get(); -} - const CCurrencyRatesProviderBase::CProviderInfo& CCurrencyRatesProviderBase::GetInfo() const { - return GetXMLFileInfo()->m_pi; + return m_pXMLInfo->m_pi; } const CCurrencyRateSection& CCurrencyRatesProviderBase::GetCurrencyRates() const { - return GetXMLFileInfo()->m_qs; + return m_pXMLInfo->m_qs; } const tstring& CCurrencyRatesProviderBase::GetURL() const { - return GetXMLFileInfo()->m_sURL; + return m_pXMLInfo->m_sURL; } bool CCurrencyRatesProviderBase::IsOnline() @@ -391,7 +388,7 @@ tstring format_rate(const ICurrencyRatesProvider *pProvider, MCONTACT hContact, return sResult; } -void log_to_file(const ICurrencyRatesProvider* pProvider, +void log_to_file(const ICurrencyRatesProvider *pProvider, MCONTACT hContact, const tstring& rsLogFileName, const tstring& rsFormat) @@ -406,7 +403,7 @@ void log_to_file(const ICurrencyRatesProvider* pProvider, } } -void log_to_history(const ICurrencyRatesProvider* pProvider, +void log_to_history(const ICurrencyRatesProvider *pProvider, MCONTACT hContact, time_t nTime, const tstring& rsFormat) @@ -440,7 +437,7 @@ bool do_set_contact_extra_icon(MCONTACT hContact, const CTendency& tendency) return false; } -bool show_popup(const ICurrencyRatesProvider* pProvider, +bool show_popup(const ICurrencyRatesProvider *pProvider, MCONTACT hContact, const CTendency& tendency, const tstring& rsFormat, |