From 9b119cadd74e1343cad493e8b366e69743a620d0 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 21 Dec 2014 09:49:05 +0000 Subject: Quotes: changed warning level to w4 git-svn-id: http://svn.miranda-ng.org/main/trunk@11552 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Quotes/src/OptionDukasCopy.cpp | 286 ++++++++++++++++----------------- 1 file changed, 143 insertions(+), 143 deletions(-) (limited to 'plugins/Quotes/src/OptionDukasCopy.cpp') diff --git a/plugins/Quotes/src/OptionDukasCopy.cpp b/plugins/Quotes/src/OptionDukasCopy.cpp index 9f2397020c..074b545f14 100644 --- a/plugins/Quotes/src/OptionDukasCopy.cpp +++ b/plugins/Quotes/src/OptionDukasCopy.cpp @@ -26,32 +26,32 @@ namespace int nImage, LPARAM lp = 0) { -// USES_CONVERSION; + // USES_CONVERSION; TVINSERTSTRUCT tvi; memset(&tvi, 0, sizeof(tvi)); tvi.hParent = htiParent; tvi.hInsertAfter = TVI_LAST; - tvi.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE|TVIF_SELECTEDIMAGE; + tvi.item.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE; + + // CA2T name(rsName.c_str()); -// CA2T name(rsName.c_str()); - tvi.item.pszText = const_cast(rsName.c_str());//name; tvi.item.lParam = lp; tvi.item.iImage = nImage; tvi.item.iSelectedImage = nImage; - return TreeView_InsertItem(hwndTree,&tvi); + return TreeView_InsertItem(hwndTree, &tvi); } - bool add_quote_to_tree(const CQuotesProviderDukasCopy::CQuote& q,HWND hwndTree,HTREEITEM htiParent,const CQuotesProviderDukasCopy* pQuotesProvier) + bool add_quote_to_tree(const CQuotesProviderDukasCopy::CQuote& q, HWND hwndTree, HTREEITEM htiParent, const CQuotesProviderDukasCopy* pQuotesProvier) { bool bChecked = pQuotesProvier->IsQuoteWatched(q); - HTREEITEM hti = tree_insert_item(hwndTree,((false == q.GetName().empty()) ? q.GetName() : q.GetSymbol()),htiParent,IMAGE_INDEX_QUOTE); - if(hti && bChecked) + HTREEITEM hti = tree_insert_item(hwndTree, ((false == q.GetName().empty()) ? q.GetName() : q.GetSymbol()), htiParent, IMAGE_INDEX_QUOTE); + if (hti && bChecked) { HWND hDlg = ::GetParent(hwndTree); assert(::IsWindow(hDlg)); - ::PostMessage(hDlg,TREE_VIEW_CHECK_STATE_CHANGE,MAKEWPARAM(0,TCBS_CHECKED),reinterpret_cast(hti)); + ::PostMessage(hDlg, TREE_VIEW_CHECK_STATE_CHANGE, MAKEWPARAM(0, TCBS_CHECKED), reinterpret_cast(hti)); } return (NULL != hti && bChecked); @@ -67,78 +67,78 @@ namespace { rbIsChecked = false; rbIsExpended = false; - HTREEITEM hti = tree_insert_item(hwndTree,qs.GetName(),htiParent,IMAGE_INDEX_SECTION); + HTREEITEM hti = tree_insert_item(hwndTree, qs.GetName(), htiParent, IMAGE_INDEX_SECTION); size_t cCheckedItems = 0; size_t cSection = qs.GetSectionCount(); - for(size_t i = 0;i < cSection;++i) + for (size_t i = 0; i < cSection; ++i) { bool bIsChecked = false; bool bIsExpanded = false; CQuotesProviderDukasCopy::CQuoteSection other = qs.GetSection(i); - add_section_to_tree(other,hwndTree,hti,pQuotesProvier,bIsChecked,bIsExpanded); + add_section_to_tree(other, hwndTree, hti, pQuotesProvier, bIsChecked, bIsExpanded); - if(bIsChecked) + if (bIsChecked) { ++cCheckedItems; } - if(bIsExpanded) + if (bIsExpanded) { bExpand = true; } } size_t cQuotes = qs.GetQuoteCount(); - for(size_t i = 0;i < cQuotes;++i) + for (size_t i = 0; i < cQuotes; ++i) { CQuotesProviderDukasCopy::CQuote q = qs.GetQuote(i); - if(true == add_quote_to_tree(q,hwndTree,hti,pQuotesProvier)) + if (true == add_quote_to_tree(q, hwndTree, hti, pQuotesProvier)) { - ++ cCheckedItems; + ++cCheckedItems; } } - if(bExpand || cCheckedItems > 0) + if (bExpand || cCheckedItems > 0) { rbIsExpended = true; - TreeView_Expand(hwndTree,hti,TVE_EXPAND); + TreeView_Expand(hwndTree, hti, TVE_EXPAND); } - if(cCheckedItems == (cSection+cQuotes)) + if (cCheckedItems == (cSection + cQuotes)) { rbIsChecked = true; HWND hDlg = ::GetParent(hwndTree); assert(::IsWindow(hDlg)); - ::PostMessage(hDlg,TREE_VIEW_CHECK_STATE_CHANGE,MAKEWPARAM(0,TCBS_CHECKED),reinterpret_cast(hti)); + ::PostMessage(hDlg, TREE_VIEW_CHECK_STATE_CHANGE, MAKEWPARAM(0, TCBS_CHECKED), reinterpret_cast(hti)); } } - void add_provider_to_tree(const CQuotesProviderDukasCopy* pQuotesProvier,HWND hwndTree) + void add_provider_to_tree(const CQuotesProviderDukasCopy* pQuotesProvier, HWND hwndTree) { CQuotesProviderDukasCopy::CQuoteSection qs = pQuotesProvier->GetQuotes(); bool bIsChecked = false; bool bIsExpanded = false; - add_section_to_tree(qs,hwndTree,TVI_ROOT,pQuotesProvier,bIsChecked,bIsExpanded,true); + add_section_to_tree(qs, hwndTree, TVI_ROOT, pQuotesProvier, bIsChecked, bIsExpanded, true); } - inline HTREEITEM tree_get_child_item(HWND hwndTree,HTREEITEM hti) + inline HTREEITEM tree_get_child_item(HWND hwndTree, HTREEITEM hti) { - return reinterpret_cast(::SendMessage(hwndTree, TVM_GETNEXTITEM, TVGN_CHILD,reinterpret_cast(hti))); + return reinterpret_cast(::SendMessage(hwndTree, TVM_GETNEXTITEM, TVGN_CHILD, reinterpret_cast(hti))); } - inline HTREEITEM tree_get_next_sibling_item(HWND hwndTree,HTREEITEM hti) + inline HTREEITEM tree_get_next_sibling_item(HWND hwndTree, HTREEITEM hti) { - return reinterpret_cast(::SendMessage(hwndTree, TVM_GETNEXTITEM, TVGN_NEXT,reinterpret_cast(hti))); + return reinterpret_cast(::SendMessage(hwndTree, TVM_GETNEXTITEM, TVGN_NEXT, reinterpret_cast(hti))); } - inline ETreeCheckBoxState tree_get_state_image(HWND hwndTree,HTREEITEM hti) + inline ETreeCheckBoxState tree_get_state_image(HWND hwndTree, HTREEITEM hti) { TVITEM tvi; tvi.hItem = hti; - tvi.mask = TVIF_STATE|TVIF_HANDLE; + tvi.mask = TVIF_STATE | TVIF_HANDLE; tvi.stateMask = TVIS_STATEIMAGEMASK; - if(TRUE == ::SendMessage(hwndTree,TVM_GETITEM,0,reinterpret_cast(&tvi))) + if (TRUE == ::SendMessage(hwndTree, TVM_GETITEM, 0, reinterpret_cast(&tvi))) { UINT nState = (tvi.state >> 12); return static_cast(nState); @@ -149,61 +149,61 @@ namespace } } - void tree_do_set_item_state(HWND hwndTree,HTREEITEM hti,ETreeCheckBoxState nState) + void tree_do_set_item_state(HWND hwndTree, HTREEITEM hti, ETreeCheckBoxState nState) { TVITEM tvi; memset(&tvi, 0, sizeof(tvi)); - tvi.mask = TVIF_STATE|TVIF_HANDLE; + tvi.mask = TVIF_STATE | TVIF_HANDLE; tvi.hItem = hti; tvi.stateMask = TVIS_STATEIMAGEMASK; tvi.state = INDEXTOSTATEIMAGEMASK(nState); - ::SendMessage(hwndTree,TVM_SETITEM,0,reinterpret_cast(&tvi)); + ::SendMessage(hwndTree, TVM_SETITEM, 0, reinterpret_cast(&tvi)); } - void tree_set_item_state(HWND hwndTree,HTREEITEM hti,ETreeCheckBoxState nState,bool bRecursively) + void tree_set_item_state(HWND hwndTree, HTREEITEM hti, ETreeCheckBoxState nState, bool bRecursively) { - if(true == bRecursively) + if (true == bRecursively) { - for(hti = tree_get_child_item(hwndTree,hti);hti;hti = tree_get_next_sibling_item(hwndTree,hti)) + for (hti = tree_get_child_item(hwndTree, hti); hti; hti = tree_get_next_sibling_item(hwndTree, hti)) { - tree_do_set_item_state(hwndTree,hti,nState); - tree_set_item_state(hwndTree,hti,nState,bRecursively); + tree_do_set_item_state(hwndTree, hti, nState); + tree_set_item_state(hwndTree, hti, nState, bRecursively); } } else { - tree_do_set_item_state(hwndTree,hti,nState); + tree_do_set_item_state(hwndTree, hti, nState); } } - void save_quote_selection(HWND hwndTree,HTREEITEM h,const CQuotesProviderDukasCopy::CQuote& q,CQuotesProviderDukasCopy* pQuotesProvier) + void save_quote_selection(HWND hwndTree, HTREEITEM h, const CQuotesProviderDukasCopy::CQuote& q, CQuotesProviderDukasCopy* pQuotesProvier) { - ETreeCheckBoxState nState = tree_get_state_image(hwndTree,h); - pQuotesProvier->WatchForQuote(q,(TCBS_CHECKED == nState)); + ETreeCheckBoxState nState = tree_get_state_image(hwndTree, h); + pQuotesProvier->WatchForQuote(q, (TCBS_CHECKED == nState)); } - void recursive_save_quote_section_selection(HWND hwndTree,HTREEITEM h,const CQuotesProviderDukasCopy::CQuoteSection& qs,CQuotesProviderDukasCopy* pQuotesProvier) + void recursive_save_quote_section_selection(HWND hwndTree, HTREEITEM h, const CQuotesProviderDukasCopy::CQuoteSection& qs, CQuotesProviderDukasCopy* pQuotesProvier) { size_t cSection = qs.GetSectionCount(); - h = tree_get_child_item(hwndTree,h); - for(size_t i = 0;h && (i < cSection);++i,h = tree_get_next_sibling_item(hwndTree,h)) + h = tree_get_child_item(hwndTree, h); + for (size_t i = 0; h && (i < cSection); ++i, h = tree_get_next_sibling_item(hwndTree, h)) { CQuotesProviderDukasCopy::CQuoteSection other = qs.GetSection(i); - recursive_save_quote_section_selection(hwndTree,h,other,pQuotesProvier); + recursive_save_quote_section_selection(hwndTree, h, other, pQuotesProvier); } size_t cQuotes = qs.GetQuoteCount(); - for(size_t i = 0;h && (i < cQuotes);++i,h = tree_get_next_sibling_item(hwndTree,h)) + for (size_t i = 0; h && (i < cQuotes); ++i, h = tree_get_next_sibling_item(hwndTree, h)) { CQuotesProviderDukasCopy::CQuote q = qs.GetQuote(i); - save_quote_selection(hwndTree,h,q,pQuotesProvier); + save_quote_selection(hwndTree, h, q, pQuotesProvier); } } - void recursive_save_selection(HWND hwndTree,CQuotesProviderDukasCopy* pQuotesProvider) + void recursive_save_selection(HWND hwndTree, CQuotesProviderDukasCopy* pQuotesProvider) { // CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); // const TQuotesProviders& rapQuotesProviders = pProviders->GetProviders(); @@ -214,7 +214,7 @@ namespace // { // const TQuotesProviderPtr& pQuotesProvier = *i; CQuotesProviderDukasCopy::CQuoteSection qs = pQuotesProvider->GetQuotes(); - recursive_save_quote_section_selection(hwndTree,tree_get_child_item(hwndTree,TVI_ROOT),qs,pQuotesProvider); + recursive_save_quote_section_selection(hwndTree, tree_get_child_item(hwndTree, TVI_ROOT), qs, pQuotesProvider); // } } @@ -224,18 +224,18 @@ namespace CImageListWrapper() : m_hImageList(ImageList_Create(::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON), - ILC_COLOR24|ILC_MASK,2,0)) + ILC_COLOR24 | ILC_MASK, 2, 0)) { - if(m_hImageList) + if (m_hImageList) { - ImageList_AddIcon(m_hImageList,Quotes_LoadIconEx(ICON_STR_SECTION)); - ImageList_AddIcon(m_hImageList,Quotes_LoadIconEx(ICON_STR_QUOTE)); + ImageList_AddIcon(m_hImageList, Quotes_LoadIconEx(ICON_STR_SECTION)); + ImageList_AddIcon(m_hImageList, Quotes_LoadIconEx(ICON_STR_QUOTE)); } } ~CImageListWrapper() { - if(m_hImageList) + if (m_hImageList) { ImageList_Destroy(m_hImageList); } @@ -260,11 +260,11 @@ namespace { CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr(); const CQuotesProviders::TQuotesProviders& rapQuotesProviders = pProviders->GetProviders(); - for(CQuotesProviders::TQuotesProviders::const_iterator i = rapQuotesProviders.begin();i != rapQuotesProviders.end();++i) + for (CQuotesProviders::TQuotesProviders::const_iterator i = rapQuotesProviders.begin(); i != rapQuotesProviders.end(); ++i) { const CQuotesProviders::TQuotesProviderPtr& pProvider = *i; CQuotesProviderDukasCopy* pDukas = dynamic_cast(pProvider.get()); - if(pDukas) + if (pDukas) { return pDukas; } @@ -274,131 +274,131 @@ namespace return NULL; } - INT_PTR CALLBACK EconomicRatesDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam) + INT_PTR CALLBACK EconomicRatesDlgProc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) { CCommonDlgProcData d(get_dukas_copy_provider()); - CommonOptionDlgProc(hdlg,message,wParam,lParam,d); + CommonOptionDlgProc(hdlg, message, wParam, lParam, d); - switch(message) + switch (message) { case WM_INITDIALOG: - { - TranslateDialogDefault(hdlg); + { + TranslateDialogDefault(hdlg); - HWND hwndTree = ::GetDlgItem(hdlg,IDC_TREE_ECONOMIC_RATES); - HIMAGELIST hImage = get_image_list(); - if(hImage) - { - TreeView_SetImageList(hwndTree,hImage,TVSIL_NORMAL); - } + HWND hwndTree = ::GetDlgItem(hdlg, IDC_TREE_ECONOMIC_RATES); + HIMAGELIST hImage = get_image_list(); + if (hImage) + { + TreeView_SetImageList(hwndTree, hImage, TVSIL_NORMAL); + } - const CQuotesProviderDukasCopy* pDukasProvider = get_dukas_copy_provider(); - if(pDukasProvider) - { - add_provider_to_tree(pDukasProvider,hwndTree); - } - // Window_SetIcon_IcoLib(hdlg, SKINICON_OTHER_MIRANDA); + const CQuotesProviderDukasCopy* pDukasProvider = get_dukas_copy_provider(); + if (pDukasProvider) + { + add_provider_to_tree(pDukasProvider, hwndTree); } - return TRUE; + // Window_SetIcon_IcoLib(hdlg, SKINICON_OTHER_MIRANDA); + } + return TRUE; case WM_NOTIFY: + { + LPNMHDR pNMHDR = reinterpret_cast(lParam); + switch (pNMHDR->code) { - LPNMHDR pNMHDR = reinterpret_cast(lParam); - switch(pNMHDR->code) + case TVN_KEYDOWN: + if (IDC_TREE_ECONOMIC_RATES == wParam) { - case TVN_KEYDOWN: - if(IDC_TREE_ECONOMIC_RATES == wParam) + LPNMTVKEYDOWN pKeyDown = reinterpret_cast(lParam); + if (VK_SPACE == pKeyDown->wVKey) { - LPNMTVKEYDOWN pKeyDown = reinterpret_cast(lParam); - if(VK_SPACE == pKeyDown->wVKey) - { - HTREEITEM hti = TreeView_GetSelection(::GetDlgItem(hdlg,IDC_TREE_ECONOMIC_RATES)); - ::PostMessage(hdlg,TREE_VIEW_CHECK_STATE_CHANGE,MAKEWPARAM(1,0),reinterpret_cast(hti)); - PropSheet_Changed(::GetParent(hdlg),hdlg); - } + HTREEITEM hti = TreeView_GetSelection(::GetDlgItem(hdlg, IDC_TREE_ECONOMIC_RATES)); + ::PostMessage(hdlg, TREE_VIEW_CHECK_STATE_CHANGE, MAKEWPARAM(1, 0), reinterpret_cast(hti)); + PropSheet_Changed(::GetParent(hdlg), hdlg); } - break; - case NM_CLICK: - if(IDC_TREE_ECONOMIC_RATES == wParam) - { - DWORD pos = ::GetMessagePos(); + } + break; + case NM_CLICK: + if (IDC_TREE_ECONOMIC_RATES == wParam) + { + DWORD pos = ::GetMessagePos(); - HWND hwndTree = ::GetDlgItem(hdlg,IDC_TREE_ECONOMIC_RATES); + HWND hwndTree = ::GetDlgItem(hdlg, IDC_TREE_ECONOMIC_RATES); - TVHITTESTINFO tvhti; - tvhti.pt.x = LOWORD(pos); - tvhti.pt.y = HIWORD(pos); - ::ScreenToClient(hwndTree,&(tvhti.pt)); + TVHITTESTINFO tvhti; + tvhti.pt.x = LOWORD(pos); + tvhti.pt.y = HIWORD(pos); + ::ScreenToClient(hwndTree, &(tvhti.pt)); - HTREEITEM hti = reinterpret_cast(::SendMessage(hwndTree,TVM_HITTEST,0,reinterpret_cast(&tvhti))); - if(hti && (tvhti.flags&TVHT_ONITEMSTATEICON)) - { - ::PostMessage(hdlg,TREE_VIEW_CHECK_STATE_CHANGE,MAKEWPARAM(1,0),reinterpret_cast(hti)); - PropSheet_Changed(::GetParent(hdlg),hdlg); - } - } - break; - case PSN_APPLY: + HTREEITEM hti = reinterpret_cast(::SendMessage(hwndTree, TVM_HITTEST, 0, reinterpret_cast(&tvhti))); + if (hti && (tvhti.flags&TVHT_ONITEMSTATEICON)) { - CQuotesProviderDukasCopy* pDukasProvider = get_dukas_copy_provider(); - if(pDukasProvider) - { - recursive_save_selection(::GetDlgItem(hdlg,IDC_TREE_ECONOMIC_RATES),pDukasProvider); - pDukasProvider->RefreshSettings(); - } + ::PostMessage(hdlg, TREE_VIEW_CHECK_STATE_CHANGE, MAKEWPARAM(1, 0), reinterpret_cast(hti)); + PropSheet_Changed(::GetParent(hdlg), hdlg); } - break; + } + break; + case PSN_APPLY: + { + CQuotesProviderDukasCopy* pDukasProvider = get_dukas_copy_provider(); + if (pDukasProvider) + { + recursive_save_selection(::GetDlgItem(hdlg, IDC_TREE_ECONOMIC_RATES), pDukasProvider); + pDukasProvider->RefreshSettings(); } } - return TRUE; + break; + } + } + return TRUE; case TREE_VIEW_CHECK_STATE_CHANGE: - { - HWND hwndTree = ::GetDlgItem(hdlg,IDC_TREE_ECONOMIC_RATES); - HTREEITEM hti = reinterpret_cast(lParam); - - ETreeCheckBoxState nState; + { + HWND hwndTree = ::GetDlgItem(hdlg, IDC_TREE_ECONOMIC_RATES); + HTREEITEM hti = reinterpret_cast(lParam); - bool bRecursively = 1 == LOWORD(wParam); - if(bRecursively) - { - nState = tree_get_state_image(hwndTree,hti); - } - else - { - nState = static_cast(HIWORD(wParam)); - } + ETreeCheckBoxState nState; - tree_set_item_state(hwndTree,hti,nState,bRecursively); + bool bRecursively = 1 == LOWORD(wParam); + if (bRecursively) + { + nState = tree_get_state_image(hwndTree, hti); } - break; - // case WM_CLOSE: - // DestroyWindow(hdlg); - // break; - // case WM_DESTROY: - // g_hwndEconomicRates = NULL; - // break; + else + { + nState = static_cast(HIWORD(wParam)); + } + + tree_set_item_state(hwndTree, hti, nState, bRecursively); + } + break; + // case WM_CLOSE: + // DestroyWindow(hdlg); + // break; + // case WM_DESTROY: + // g_hwndEconomicRates = NULL; + // break; } return FALSE; } } -void ShowDukasCopyPropPage(CQuotesProviderDukasCopy* pProvider,WPARAM wp,OPTIONSDIALOGPAGE& odp) +void ShowDukasCopyPropPage(CQuotesProviderDukasCopy* pProvider, WPARAM wp, OPTIONSDIALOGPAGE& odp) { const IQuotesProvider::CProviderInfo& pi = pProvider->GetInfo(); odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_ECONOMIC_RATES); odp.pfnDlgProc = EconomicRatesDlgProc; -// #if MIRANDA_VER >= 0x0600 + // #if MIRANDA_VER >= 0x0600 //odp.ptszTab = TranslateTS(const_cast(pi.m_sName.c_str())); odp.ptszTab = const_cast(pi.m_sName.c_str()); -// #else -// tostringstream o; -// o << TranslateTS(QUOTES_PROTOCOL_NAME) << _T(" - ") << TranslateTS(pi.m_sName.c_str()); -// tstring sTitle = o.str(); -// odp.ptszTitle = TranslateTS(const_cast(sTitle.c_str())); -// #endif + // #else + // tostringstream o; + // o << TranslateTS(QUOTES_PROTOCOL_NAME) << _T(" - ") << TranslateTS(pi.m_sName.c_str()); + // tstring sTitle = o.str(); + // odp.ptszTitle = TranslateTS(const_cast(sTitle.c_str())); + // #endif Options_AddPage(wp, &odp); } -- cgit v1.2.3