diff options
| author | George Hazan <ghazan@miranda.im> | 2017-03-01 01:33:11 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-03-01 01:33:19 +0300 |
| commit | 5165df4565a63dceaccbb89ce94d841d413895ed (patch) | |
| tree | df6102a85963551146ad3e4a616332c39d31cf05 /plugins/TabSRMM/src/contactcache.cpp | |
| parent | 5b244e78a5c920acc08931d52298cd919fdb70d4 (diff) | |
name conflict resolution
Diffstat (limited to 'plugins/TabSRMM/src/contactcache.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/contactcache.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp index 0728b81e00..9154c69739 100644 --- a/plugins/TabSRMM/src/contactcache.cpp +++ b/plugins/TabSRMM/src/contactcache.cpp @@ -303,7 +303,7 @@ void CContactCache::inputHistoryEvent(WPARAM wParam) HWND hwndEdit = ::GetDlgItem(m_hwnd, IDC_MESSAGE); SETTEXTEX stx = { ST_DEFAULT, CP_UTF8 }; - if (m_dat->dwFlags & MWF_NEEDHISTORYSAVE) { + if (m_dat->m_dwFlags & MWF_NEEDHISTORYSAVE) { m_iHistoryCurrent = m_iHistoryTop; if (::GetWindowTextLength(hwndEdit) > 0) saveHistory(m_iHistorySize, 0); @@ -336,7 +336,7 @@ void CContactCache::inputHistoryEvent(WPARAM wParam) else ::SetWindowText(hwndEdit, L""); } ::SendMessage(m_hwnd, WM_COMMAND, MAKEWPARAM(::GetDlgCtrlID(hwndEdit), EN_CHANGE), (LPARAM)hwndEdit); - m_dat->dwFlags &= ~MWF_NEEDHISTORYSAVE; + m_dat->m_dwFlags &= ~MWF_NEEDHISTORYSAVE; } } @@ -533,20 +533,20 @@ HICON CContactCache::getIcon(int &iSize) const if (!m_dat || !m_hwnd) return Skin_LoadProtoIcon(cc->szProto, getStatus()); - if (m_dat->dwFlags & MWF_ERRORSTATE) + if (m_dat->m_dwFlags & MWF_ERRORSTATE) return PluginConfig.g_iconErr; if (m_dat->m_bCanFlashTab) - return m_dat->iFlashIcon; + return m_dat->m_iFlashIcon; - if (m_dat->si && m_dat->iFlashIcon) { + if (m_dat->si && m_dat->m_iFlashIcon) { int sizeX, sizeY; - Utils::getIconSize(m_dat->iFlashIcon, sizeX, sizeY); + Utils::getIconSize(m_dat->m_iFlashIcon, sizeX, sizeY); iSize = sizeX; - return m_dat->iFlashIcon; + return m_dat->m_iFlashIcon; } - if (m_dat->hTabIcon == m_dat->hTabStatusIcon && m_dat->hXStatusIcon) - return m_dat->hXStatusIcon; - return m_dat->hTabIcon; + if (m_dat->m_hTabIcon == m_dat->m_hTabStatusIcon && m_dat->m_hXStatusIcon) + return m_dat->m_hXStatusIcon; + return m_dat->m_hTabIcon; } size_t CContactCache::getMaxMessageLength() |