From 0f8566dd046d34ea0ff6b747f7383ffb17f6761e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 14 Jun 2015 21:33:38 +0000 Subject: WindowList_* functions are not services anymore; unneeded helpers removed git-svn-id: http://svn.miranda-ng.org/main/trunk@14168 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Quotes/src/CurrencyConverter.cpp | 6 +++--- plugins/Quotes/src/ModuleInfo.cpp | 4 ++-- plugins/Quotes/src/ModuleInfo.h | 4 ++-- plugins/Quotes/src/QuoteInfoDlg.cpp | 6 +++--- plugins/Quotes/src/SettingsDlg.cpp | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/Quotes/src') diff --git a/plugins/Quotes/src/CurrencyConverter.cpp b/plugins/Quotes/src/CurrencyConverter.cpp index 5e5de39f81..9a3d45cb50 100644 --- a/plugins/Quotes/src/CurrencyConverter.cpp +++ b/plugins/Quotes/src/CurrencyConverter.cpp @@ -96,7 +96,7 @@ namespace { case WM_INITDIALOG: { - HANDLE hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX, false); + MWindowList hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX, false); assert(hWL); WindowList_Add(hWL, hDlg, NULL); @@ -155,7 +155,7 @@ namespace return (TRUE); case WM_CLOSE: { - HANDLE hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX, false); + MWindowList hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX, false); assert(hWL); WindowList_Remove(hWL, hDlg); Utils_SaveWindowPosition(hDlg, NULL, QUOTES_PROTOCOL_NAME, WINDOW_PREFIX); @@ -282,7 +282,7 @@ namespace INT_PTR QuotesMenu_CurrencyConverter(WPARAM, LPARAM) { - HANDLE hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX, true); + MWindowList hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX, true); HWND hWnd = WindowList_Find(hWL, NULL); if (NULL != hWnd) { diff --git a/plugins/Quotes/src/ModuleInfo.cpp b/plugins/Quotes/src/ModuleInfo.cpp index 656d17ad64..65d2593482 100644 --- a/plugins/Quotes/src/ModuleInfo.cpp +++ b/plugins/Quotes/src/ModuleInfo.cpp @@ -22,9 +22,9 @@ CModuleInfo& CModuleInfo::GetInstance() return mi; } -HANDLE CModuleInfo::GetWindowList(const std::string& rsKey, bool bAllocateIfNonExist /*= true*/) +MWindowList CModuleInfo::GetWindowList(const std::string& rsKey, bool bAllocateIfNonExist /*= true*/) { - HANDLE hResult = NULL; + MWindowList hResult = NULL; THandles::const_iterator i = m_ahWindowLists.find(rsKey); if (i != m_ahWindowLists.end()) { diff --git a/plugins/Quotes/src/ModuleInfo.h b/plugins/Quotes/src/ModuleInfo.h index 6f4676bb1a..fdc67ccd6a 100644 --- a/plugins/Quotes/src/ModuleInfo.h +++ b/plugins/Quotes/src/ModuleInfo.h @@ -21,7 +21,7 @@ public: static CModuleInfo& GetInstance(); void OnMirandaShutdown(); - HANDLE GetWindowList(const std::string& rsKey, bool bAllocateIfNonExist = true); + MWindowList GetWindowList(const std::string& rsKey, bool bAllocateIfNonExist = true); bool GetExtendedStatusFlag()const; static bool Verify(); @@ -35,7 +35,7 @@ public: static void SetHTMLEngine(THTMLEnginePtr pEngine); private: - typedef std::map THandles; + typedef std::map THandles; THandles m_ahWindowLists; bool m_bExtendedStatusInfo; }; diff --git a/plugins/Quotes/src/QuoteInfoDlg.cpp b/plugins/Quotes/src/QuoteInfoDlg.cpp index e94245e3c3..64f5012243 100644 --- a/plugins/Quotes/src/QuoteInfoDlg.cpp +++ b/plugins/Quotes/src/QuoteInfoDlg.cpp @@ -206,7 +206,7 @@ namespace case WM_INITDIALOG: { hContact = MCONTACT(lParam); - HANDLE hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_INFO, false); + MWindowList hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_INFO, false); assert(hWL); WindowList_Add(hWL, hdlg, hContact); @@ -225,7 +225,7 @@ namespace { SetWindowLongPtr(hdlg, GWLP_USERDATA, 0); - HANDLE hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_INFO, false); + MWindowList hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_INFO, false); assert(hWL); WindowList_Remove(hWL, hdlg); Utils_SaveWindowPosition(hdlg, hContact, QUOTES_MODULE_NAME, WINDOW_PREFIX_INFO); @@ -253,7 +253,7 @@ int Quotes_OnContactDoubleClick(WPARAM wp, LPARAM/* lp*/) MCONTACT hContact = MCONTACT(wp); if (CModuleInfo::GetQuoteProvidersPtr()->GetContactProviderPtr(hContact)) { - HANDLE hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_INFO, true); + MWindowList hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_INFO, true); assert(hWL); HWND hWnd = WindowList_Find(hWL, hContact); if (NULL != hWnd) { diff --git a/plugins/Quotes/src/SettingsDlg.cpp b/plugins/Quotes/src/SettingsDlg.cpp index 6e14d26137..268b9a1c1b 100644 --- a/plugins/Quotes/src/SettingsDlg.cpp +++ b/plugins/Quotes/src/SettingsDlg.cpp @@ -271,7 +271,7 @@ namespace MCONTACT hContact = MCONTACT(lp); TranslateDialogDefault(hWnd); - HANDLE hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_SETTINGS, false); + MWindowList hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_SETTINGS, false); assert(hWL); WindowList_Add(hWL, hWnd, hContact); @@ -493,7 +493,7 @@ namespace CSettingWindowParam* pParam = get_param(hWnd); SetWindowLongPtr(hWnd, GWLP_USERDATA, 0); - HANDLE hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_SETTINGS, false); + MWindowList hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_SETTINGS, false); assert(hWL); WindowList_Remove(hWL, hWnd); Utils_SaveWindowPosition(hWnd, pParam->m_hContact, QUOTES_MODULE_NAME, WINDOW_PREFIX_SETTINGS); @@ -509,7 +509,7 @@ namespace void ShowSettingsDlg(MCONTACT hContact) { - HANDLE hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_SETTINGS, true); + MWindowList hWL = CModuleInfo::GetInstance().GetWindowList(WINDOW_PREFIX_SETTINGS, true); assert(hWL); HWND hWnd = WindowList_Find(hWL, hContact); if (NULL != hWnd) -- cgit v1.2.3