Skip to content

Commit a20215d

Browse files
GermanAizekge0rdi
GermanAizek
authored and
ge0rdi
committed
Replace 'push*' -> 'emplace*' if possible and use std::move()
1 parent 4f36276 commit a20215d

File tree

10 files changed

+25
-25
lines changed

10 files changed

+25
-25
lines changed

‎Src/Lib/LanguageSettingsHelper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ LRESULT CLanguageSettingsDlg::OnSelChange( int idCtrl, LPNMHDR pnmh, BOOL& bHand
405405
CComVariant val(name);
406406
if (m_pSetting->value!=val)
407407
SetSettingsDirty();
408-
m_pSetting->value=val;
408+
m_pSetting->value=std::move(val);
409409

410410
if (_wcsicmp(m_pSetting->value.bstrVal,m_pSetting->defValue.bstrVal)==0)
411411
m_pSetting->flags|=CSetting::FLAG_DEFAULT;

‎Src/Lib/Settings.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
789789
}
790790
CComPtr<IXMLDOMNode> next;
791791
child2->get_nextSibling(&next);
792-
child2=next;
792+
child2=std::move(next);
793793
}
794794
string.push_back(0);
795795
pSetting->value=CComVariant(&string[0]);
@@ -839,7 +839,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
839839
CComPtr<IXMLDOMNode> next;
840840
if (child->get_nextSibling(&next)!=S_OK)
841841
break;
842-
child=next;
842+
child=std::move(next);
843843
}
844844
if (ver<0x03090000)
845845
UpgradeSettings(false);

‎Src/Lib/SettingsUIHelper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ HRESULT STDMETHODCALLTYPE CBrowseLinkEvents::OnButtonClicked( IFileDialogCustomi
11561156
{
11571157
pfd->GetFolder(&pItem);
11581158
}
1159-
m_pResult=pItem;
1159+
m_pResult=std::move(pItem);
11601160
pfd->Close(S_FALSE);
11611161
return S_OK;
11621162
}

‎Src/Setup/Utility/Utility.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ static BOOL CALLBACK EnumResLangProc( HMODULE hModule, LPCTSTR lpszType, LPCTSTR
943943
if (IS_INTRESOURCE(lpszName))
944944
{
945945
std::vector<std::pair<int,WORD>> &oldStrings=*(std::vector<std::pair<int,WORD>>*)lParam;
946-
oldStrings.push_back(std::pair<int,WORD>(PtrToInt(lpszName),wIDLanguage));
946+
oldStrings.emplace_back(PtrToInt(lpszName),wIDLanguage);
947947
}
948948
return TRUE;
949949
}

‎Src/StartMenu/StartMenuDLL/ItemManager.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -609,15 +609,15 @@ void CItemManager::Init( void )
609609
{
610610
int width, height;
611611
pList->GetIconSize(&width,&height);
612-
m_ListSizes.push_back(std::pair<int,int>(width,i));
612+
m_ListSizes.emplace_back(width,i);
613613
}
614614
}
615615
std::sort(m_ListSizes.begin(),m_ListSizes.end());
616616

617617
CreateDefaultIcons();
618618
LoadCacheFile();
619619

620-
ItemInfo &item=m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(0,ItemInfo()))->second;
620+
ItemInfo &item=m_ItemInfos.emplace(0,ItemInfo())->second;
621621
item.bIconOnly=true;
622622
item.smallIcon=m_DefaultSmallIcon;
623623
item.largeIcon=m_DefaultLargeIcon;
@@ -704,21 +704,21 @@ void CItemManager::CreateDefaultIcons( void )
704704
icon.bitmap=BitmapFromIcon(LoadShellIcon(index,SMALL_ICON_SIZE),SMALL_ICON_SIZE);
705705
else
706706
icon.bitmap=NULL;
707-
m_DefaultSmallIcon=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(0,icon))->second;
707+
m_DefaultSmallIcon=&m_IconInfos.emplace(0,icon)->second;
708708

709709
icon.sizeType=ICON_SIZE_TYPE_LARGE;
710710
if (index>=0)
711711
icon.bitmap=BitmapFromIcon(LoadShellIcon(index,LARGE_ICON_SIZE),LARGE_ICON_SIZE);
712712
else
713713
icon.bitmap=NULL;
714-
m_DefaultLargeIcon=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(0,icon))->second;
714+
m_DefaultLargeIcon=&m_IconInfos.emplace(0,icon)->second;
715715

716716
icon.sizeType=ICON_SIZE_TYPE_EXTRA_LARGE;
717717
if (index>=0)
718718
icon.bitmap=BitmapFromIcon(LoadShellIcon(index,EXTRA_LARGE_ICON_SIZE),EXTRA_LARGE_ICON_SIZE);
719719
else
720720
icon.bitmap=NULL;
721-
m_DefaultExtraLargeIcon=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(0,icon))->second;
721+
m_DefaultExtraLargeIcon=&m_IconInfos.emplace(0,icon)->second;
722722
}
723723

724724
CItemManager::LoadIconData &CItemManager::GetLoadIconData( void )
@@ -896,7 +896,7 @@ const CItemManager::ItemInfo *CItemManager::GetItemInfo( IShellItem *pItem, PIDL
896896
}
897897
if (!pInfo)
898898
{
899-
pInfo=&m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(hash,ItemInfo()))->second;
899+
pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second;
900900
pInfo->pidl.Clone(pidl);
901901
pInfo->path=path;
902902
pInfo->PATH=PATH;
@@ -978,7 +978,7 @@ const CItemManager::ItemInfo *CItemManager::GetItemInfo( CString path, int refre
978978
}
979979
if (!pInfo)
980980
{
981-
pInfo=&m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(hash,ItemInfo()))->second;
981+
pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second;
982982
if (!PATH.IsEmpty())
983983
MenuParseDisplayName(path,&pInfo->pidl,NULL,NULL);
984984
if (pInfo->pidl)
@@ -1076,7 +1076,7 @@ const CItemManager::ItemInfo *CItemManager::GetCustomIcon( const wchar_t *locati
10761076
}
10771077
if (!pInfo)
10781078
{
1079-
pInfo=&m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(hash,ItemInfo()))->second;
1079+
pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second;
10801080
pInfo->bIconOnly=true;
10811081
pInfo->bTemp=bTemp;
10821082
pInfo->iconPath=location;
@@ -1907,7 +1907,7 @@ void CItemManager::RefreshItemInfo( ItemInfo *pInfo, int refreshFlags, IShellIte
19071907
if (SUCCEEDED(store->GetValue(PKEY_MetroAppLauncher, &val)) && (val.vt == VT_I4 || val.vt == VT_UI4) && val.intVal)
19081908
{
19091909
newInfo.bLink = false;
1910-
pItem = target;
1910+
pItem = std::move(target);
19111911
pStore = store;
19121912
}
19131913
PropVariantClear(&val);
@@ -2597,7 +2597,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP
25972597

25982598
if ((refreshFlags&INFO_SMALL_ICON) && hSmallBitmap)
25992599
{
2600-
IconInfo *pInfo=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(hash,IconInfo()))->second;
2600+
IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second;
26012601
pInfo->sizeType=ICON_SIZE_TYPE_SMALL;
26022602
pInfo->bTemp=bTemp;
26032603
pInfo->bMetro=bMetro;
@@ -2607,7 +2607,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP
26072607
}
26082608
if ((refreshFlags&INFO_LARGE_ICON) && hLargeBitmap)
26092609
{
2610-
IconInfo *pInfo=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(hash,IconInfo()))->second;
2610+
IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second;
26112611
pInfo->sizeType=ICON_SIZE_TYPE_LARGE;
26122612
pInfo->bTemp=bTemp;
26132613
pInfo->bMetro=bMetro;
@@ -2617,7 +2617,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP
26172617
}
26182618
if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && hExtraLargeBitmap)
26192619
{
2620-
IconInfo *pInfo=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(hash,IconInfo()))->second;
2620+
IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second;
26212621
pInfo->sizeType=ICON_SIZE_TYPE_EXTRA_LARGE;
26222622
pInfo->bTemp=bTemp;
26232623
pInfo->bMetro=bMetro;
@@ -3273,7 +3273,7 @@ void CItemManager::LoadCacheFile( void )
32733273
bError=true;
32743274
break;
32753275
}
3276-
remapIcons.push_back(&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(data.key,info))->second);
3276+
remapIcons.push_back(&m_IconInfos.emplace(data.key,info)->second);
32773277
}
32783278
else
32793279
{
@@ -3304,7 +3304,7 @@ void CItemManager::LoadCacheFile( void )
33043304
bError=true;
33053305
break;
33063306
}
3307-
ItemInfo &info=m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(data.key,ItemInfo()))->second;
3307+
ItemInfo &info=m_ItemInfos.emplace(data.key,ItemInfo())->second;
33083308

33093309
info.writestamp=data.writestamp;
33103310
info.createstamp=data.createstamp;
@@ -3568,7 +3568,7 @@ void CItemManager::ClearCache( void )
35683568
m_IconInfos.clear();
35693569
m_MetroItemInfos10.clear();
35703570
CreateDefaultIcons();
3571-
ItemInfo &item=m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(0,ItemInfo()))->second;
3571+
ItemInfo &item=m_ItemInfos.emplace(0,ItemInfo())->second;
35723572
item.bIconOnly=true;
35733573
item.smallIcon=m_DefaultSmallIcon;
35743574
item.largeIcon=m_DefaultLargeIcon;

‎Src/StartMenu/StartMenuDLL/MenuContainer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2237,7 +2237,7 @@ void CMenuContainer::AddJumpListItems( std::vector<MenuItem> &items )
22372237
{
22382238
ILFree(item.pItem1);
22392239
item.pItem1=pidl2.Detach();
2240-
pItem=pItem2;
2240+
pItem=std::move(pItem2);
22412241
}
22422242
}
22432243
}

‎Src/StartMenu/StartMenuDLL/SearchManager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ bool CSearchManager::SearchScope::ParseSearchConnector( const wchar_t *fname )
526526
CComPtr<IXMLDOMNode> pNext;
527527
if (pScopeItem->get_nextSibling(&pNext)!=S_OK)
528528
break;
529-
pScopeItem=pNext;
529+
pScopeItem=std::move(pNext);
530530
}
531531
return true;
532532
}

‎Src/StartMenu/StartMenuDLL/SkinManager.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@ bool MenuSkin::LoadSkin( HMODULE hMod, const wchar_t *variation, const wchar_t *
17781778
var.label=token;
17791779
if (var.labelEn.IsEmpty())
17801780
var.labelEn=var.label;
1781-
Variations.push_back(std::pair<int,Variation>(res,var));
1781+
Variations.emplace_back(res,var);
17821782
LOG_MENU(LOG_OPEN,L"Variation found: name=%s, id=%d",token,res);
17831783
}
17841784
else

‎Src/StartMenu/StartMenuHelper/ModernSettings.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static std::vector<uint8_t> ParseModernSettings()
280280
CComPtr<IXMLDOMNode> next;
281281
if (FAILED(node->get_nextSibling(&next)))
282282
break;
283-
node = next;
283+
node = std::move(next);
284284
}
285285
}
286286
}

‎Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ namespace DesktopNotificationManagerCompat
224224
DesktopNotificationHistoryCompat::DesktopNotificationHistoryCompat(const wchar_t *aumid, ComPtr<IToastNotificationHistory> history)
225225
{
226226
m_aumid = std::wstring(aumid);
227-
m_history = history;
227+
m_history = std::move(history);
228228
}
229229

230230
HRESULT DesktopNotificationHistoryCompat::Clear()

0 commit comments

Comments
 (0)