From a20215d9dad76f5a13eb741a474af3eb18c4d6c1 Mon Sep 17 00:00:00 2001 From: germanaizek Date: Thu, 12 May 2022 16:37:52 +0300 Subject: [PATCH] Replace 'push*' -> 'emplace*' if possible and use std::move() --- Src/Lib/LanguageSettingsHelper.cpp | 2 +- Src/Lib/Settings.cpp | 4 +-- Src/Lib/SettingsUIHelper.cpp | 2 +- Src/Setup/Utility/Utility.cpp | 2 +- Src/StartMenu/StartMenuDLL/ItemManager.cpp | 30 +++++++++---------- Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 2 +- Src/StartMenu/StartMenuDLL/SearchManager.cpp | 2 +- Src/StartMenu/StartMenuDLL/SkinManager.cpp | 2 +- .../StartMenuHelper/ModernSettings.cpp | 2 +- .../DesktopNotificationManagerCompat.cpp | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Src/Lib/LanguageSettingsHelper.cpp b/Src/Lib/LanguageSettingsHelper.cpp index 09555397d..ad35b04c0 100644 --- a/Src/Lib/LanguageSettingsHelper.cpp +++ b/Src/Lib/LanguageSettingsHelper.cpp @@ -405,7 +405,7 @@ LRESULT CLanguageSettingsDlg::OnSelChange( int idCtrl, LPNMHDR pnmh, BOOL& bHand CComVariant val(name); if (m_pSetting->value!=val) SetSettingsDirty(); - m_pSetting->value=val; + m_pSetting->value=std::move(val); if (_wcsicmp(m_pSetting->value.bstrVal,m_pSetting->defValue.bstrVal)==0) m_pSetting->flags|=CSetting::FLAG_DEFAULT; diff --git a/Src/Lib/Settings.cpp b/Src/Lib/Settings.cpp index 16afba7ad..df9646f4e 100644 --- a/Src/Lib/Settings.cpp +++ b/Src/Lib/Settings.cpp @@ -789,7 +789,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname ) } CComPtr next; child2->get_nextSibling(&next); - child2=next; + child2=std::move(next); } string.push_back(0); pSetting->value=CComVariant(&string[0]); @@ -839,7 +839,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname ) CComPtr next; if (child->get_nextSibling(&next)!=S_OK) break; - child=next; + child=std::move(next); } if (ver<0x03090000) UpgradeSettings(false); diff --git a/Src/Lib/SettingsUIHelper.cpp b/Src/Lib/SettingsUIHelper.cpp index 63a211bab..05e2c03ad 100644 --- a/Src/Lib/SettingsUIHelper.cpp +++ b/Src/Lib/SettingsUIHelper.cpp @@ -1156,7 +1156,7 @@ HRESULT STDMETHODCALLTYPE CBrowseLinkEvents::OnButtonClicked( IFileDialogCustomi { pfd->GetFolder(&pItem); } - m_pResult=pItem; + m_pResult=std::move(pItem); pfd->Close(S_FALSE); return S_OK; } diff --git a/Src/Setup/Utility/Utility.cpp b/Src/Setup/Utility/Utility.cpp index de9b7a6d4..003594935 100644 --- a/Src/Setup/Utility/Utility.cpp +++ b/Src/Setup/Utility/Utility.cpp @@ -943,7 +943,7 @@ static BOOL CALLBACK EnumResLangProc( HMODULE hModule, LPCTSTR lpszType, LPCTSTR if (IS_INTRESOURCE(lpszName)) { std::vector> &oldStrings=*(std::vector>*)lParam; - oldStrings.push_back(std::pair(PtrToInt(lpszName),wIDLanguage)); + oldStrings.emplace_back(PtrToInt(lpszName),wIDLanguage); } return TRUE; } diff --git a/Src/StartMenu/StartMenuDLL/ItemManager.cpp b/Src/StartMenu/StartMenuDLL/ItemManager.cpp index f21d969e3..3d756b57b 100644 --- a/Src/StartMenu/StartMenuDLL/ItemManager.cpp +++ b/Src/StartMenu/StartMenuDLL/ItemManager.cpp @@ -609,7 +609,7 @@ void CItemManager::Init( void ) { int width, height; pList->GetIconSize(&width,&height); - m_ListSizes.push_back(std::pair(width,i)); + m_ListSizes.emplace_back(width,i); } } std::sort(m_ListSizes.begin(),m_ListSizes.end()); @@ -617,7 +617,7 @@ void CItemManager::Init( void ) CreateDefaultIcons(); LoadCacheFile(); - ItemInfo &item=m_ItemInfos.insert(std::pair(0,ItemInfo()))->second; + ItemInfo &item=m_ItemInfos.emplace(0,ItemInfo())->second; item.bIconOnly=true; item.smallIcon=m_DefaultSmallIcon; item.largeIcon=m_DefaultLargeIcon; @@ -704,21 +704,21 @@ void CItemManager::CreateDefaultIcons( void ) icon.bitmap=BitmapFromIcon(LoadShellIcon(index,SMALL_ICON_SIZE),SMALL_ICON_SIZE); else icon.bitmap=NULL; - m_DefaultSmallIcon=&m_IconInfos.insert(std::pair(0,icon))->second; + m_DefaultSmallIcon=&m_IconInfos.emplace(0,icon)->second; icon.sizeType=ICON_SIZE_TYPE_LARGE; if (index>=0) icon.bitmap=BitmapFromIcon(LoadShellIcon(index,LARGE_ICON_SIZE),LARGE_ICON_SIZE); else icon.bitmap=NULL; - m_DefaultLargeIcon=&m_IconInfos.insert(std::pair(0,icon))->second; + m_DefaultLargeIcon=&m_IconInfos.emplace(0,icon)->second; icon.sizeType=ICON_SIZE_TYPE_EXTRA_LARGE; if (index>=0) icon.bitmap=BitmapFromIcon(LoadShellIcon(index,EXTRA_LARGE_ICON_SIZE),EXTRA_LARGE_ICON_SIZE); else icon.bitmap=NULL; - m_DefaultExtraLargeIcon=&m_IconInfos.insert(std::pair(0,icon))->second; + m_DefaultExtraLargeIcon=&m_IconInfos.emplace(0,icon)->second; } CItemManager::LoadIconData &CItemManager::GetLoadIconData( void ) @@ -896,7 +896,7 @@ const CItemManager::ItemInfo *CItemManager::GetItemInfo( IShellItem *pItem, PIDL } if (!pInfo) { - pInfo=&m_ItemInfos.insert(std::pair(hash,ItemInfo()))->second; + pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second; pInfo->pidl.Clone(pidl); pInfo->path=path; pInfo->PATH=PATH; @@ -978,7 +978,7 @@ const CItemManager::ItemInfo *CItemManager::GetItemInfo( CString path, int refre } if (!pInfo) { - pInfo=&m_ItemInfos.insert(std::pair(hash,ItemInfo()))->second; + pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second; if (!PATH.IsEmpty()) MenuParseDisplayName(path,&pInfo->pidl,NULL,NULL); if (pInfo->pidl) @@ -1076,7 +1076,7 @@ const CItemManager::ItemInfo *CItemManager::GetCustomIcon( const wchar_t *locati } if (!pInfo) { - pInfo=&m_ItemInfos.insert(std::pair(hash,ItemInfo()))->second; + pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second; pInfo->bIconOnly=true; pInfo->bTemp=bTemp; pInfo->iconPath=location; @@ -1907,7 +1907,7 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte if (SUCCEEDED(store->GetValue(PKEY_MetroAppLauncher, &val)) && (val.vt == VT_I4 || val.vt == VT_UI4) && val.intVal) { newInfo.bLink = false; - pItem = target; + pItem = std::move(target); pStore = store; } PropVariantClear(&val); @@ -2597,7 +2597,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP if ((refreshFlags&INFO_SMALL_ICON) && hSmallBitmap) { - IconInfo *pInfo=&m_IconInfos.insert(std::pair(hash,IconInfo()))->second; + IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second; pInfo->sizeType=ICON_SIZE_TYPE_SMALL; pInfo->bTemp=bTemp; pInfo->bMetro=bMetro; @@ -2607,7 +2607,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP } if ((refreshFlags&INFO_LARGE_ICON) && hLargeBitmap) { - IconInfo *pInfo=&m_IconInfos.insert(std::pair(hash,IconInfo()))->second; + IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second; pInfo->sizeType=ICON_SIZE_TYPE_LARGE; pInfo->bTemp=bTemp; pInfo->bMetro=bMetro; @@ -2617,7 +2617,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP } if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && hExtraLargeBitmap) { - IconInfo *pInfo=&m_IconInfos.insert(std::pair(hash,IconInfo()))->second; + IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second; pInfo->sizeType=ICON_SIZE_TYPE_EXTRA_LARGE; pInfo->bTemp=bTemp; pInfo->bMetro=bMetro; @@ -3273,7 +3273,7 @@ void CItemManager::LoadCacheFile( void ) bError=true; break; } - remapIcons.push_back(&m_IconInfos.insert(std::pair(data.key,info))->second); + remapIcons.push_back(&m_IconInfos.emplace(data.key,info)->second); } else { @@ -3304,7 +3304,7 @@ void CItemManager::LoadCacheFile( void ) bError=true; break; } - ItemInfo &info=m_ItemInfos.insert(std::pair(data.key,ItemInfo()))->second; + ItemInfo &info=m_ItemInfos.emplace(data.key,ItemInfo())->second; info.writestamp=data.writestamp; info.createstamp=data.createstamp; @@ -3568,7 +3568,7 @@ void CItemManager::ClearCache( void ) m_IconInfos.clear(); m_MetroItemInfos10.clear(); CreateDefaultIcons(); - ItemInfo &item=m_ItemInfos.insert(std::pair(0,ItemInfo()))->second; + ItemInfo &item=m_ItemInfos.emplace(0,ItemInfo())->second; item.bIconOnly=true; item.smallIcon=m_DefaultSmallIcon; item.largeIcon=m_DefaultLargeIcon; diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp index 8ad791b0e..efdeef848 100644 --- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp +++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp @@ -2237,7 +2237,7 @@ void CMenuContainer::AddJumpListItems( std::vector &items ) { ILFree(item.pItem1); item.pItem1=pidl2.Detach(); - pItem=pItem2; + pItem=std::move(pItem2); } } } diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.cpp b/Src/StartMenu/StartMenuDLL/SearchManager.cpp index 9e35c8a9a..50144d537 100644 --- a/Src/StartMenu/StartMenuDLL/SearchManager.cpp +++ b/Src/StartMenu/StartMenuDLL/SearchManager.cpp @@ -526,7 +526,7 @@ bool CSearchManager::SearchScope::ParseSearchConnector( const wchar_t *fname ) CComPtr pNext; if (pScopeItem->get_nextSibling(&pNext)!=S_OK) break; - pScopeItem=pNext; + pScopeItem=std::move(pNext); } return true; } diff --git a/Src/StartMenu/StartMenuDLL/SkinManager.cpp b/Src/StartMenu/StartMenuDLL/SkinManager.cpp index 71352a5f3..213a09d8e 100644 --- a/Src/StartMenu/StartMenuDLL/SkinManager.cpp +++ b/Src/StartMenu/StartMenuDLL/SkinManager.cpp @@ -1778,7 +1778,7 @@ bool MenuSkin::LoadSkin( HMODULE hMod, const wchar_t *variation, const wchar_t * var.label=token; if (var.labelEn.IsEmpty()) var.labelEn=var.label; - Variations.push_back(std::pair(res,var)); + Variations.emplace_back(res,var); LOG_MENU(LOG_OPEN,L"Variation found: name=%s, id=%d",token,res); } else diff --git a/Src/StartMenu/StartMenuHelper/ModernSettings.cpp b/Src/StartMenu/StartMenuHelper/ModernSettings.cpp index faa24b69b..ed0aa8d8b 100644 --- a/Src/StartMenu/StartMenuHelper/ModernSettings.cpp +++ b/Src/StartMenu/StartMenuHelper/ModernSettings.cpp @@ -280,7 +280,7 @@ static std::vector ParseModernSettings() CComPtr next; if (FAILED(node->get_nextSibling(&next))) break; - node = next; + node = std::move(next); } } } diff --git a/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp index 24d3088f1..0cce330aa 100644 --- a/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp +++ b/Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp @@ -224,7 +224,7 @@ namespace DesktopNotificationManagerCompat DesktopNotificationHistoryCompat::DesktopNotificationHistoryCompat(const wchar_t *aumid, ComPtr history) { m_aumid = std::wstring(aumid); - m_history = history; + m_history = std::move(history); } HRESULT DesktopNotificationHistoryCompat::Clear()