timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-20 02:34:41 +10:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'push*' -> 'emplace*' if possible and use std::move()

Browse Source
This commit is contained in:
germanaizek
2022-05-12 16:37:52 +03:00
committed by ge0rdi
parent 4f362760b6
commit a20215d9da
10 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Lib/LanguageSettingsHelper.cpp
View File

@@ -405,7 +405,7 @@ LRESULT CLanguageSettingsDlg::OnSelChange( int idCtrl, LPNMHDR pnmh, BOOL& bHand
CComVariant val(name); CComVariant val(name);
if (m_pSetting->value!=val) if (m_pSetting->value!=val)
SetSettingsDirty(); SetSettingsDirty();
m_pSetting->value=val; m_pSetting->value=std::move(val);
if (_wcsicmp(m_pSetting->value.bstrVal,m_pSetting->defValue.bstrVal)==0) if (_wcsicmp(m_pSetting->value.bstrVal,m_pSetting->defValue.bstrVal)==0)
m_pSetting->flags|=CSetting::FLAG_DEFAULT; m_pSetting->flags|=CSetting::FLAG_DEFAULT;

4
Src/Lib/Settings.cpp
View File

@@ -789,7 +789,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
} }
CComPtr<IXMLDOMNode> next; CComPtr<IXMLDOMNode> next;
child2->get_nextSibling(&next); child2->get_nextSibling(&next);
child2=next; child2=std::move(next);
} }
string.push_back(0); string.push_back(0);
pSetting->value=CComVariant(&string[0]); pSetting->value=CComVariant(&string[0]);
@@ -839,7 +839,7 @@ CString CSettingsManager::LoadSettingsXml( const wchar_t *fname )
CComPtr<IXMLDOMNode> next; CComPtr<IXMLDOMNode> next;
if (child->get_nextSibling(&next)!=S_OK) if (child->get_nextSibling(&next)!=S_OK)
break; break;
child=next; child=std::move(next);
} }
if (ver<0x03090000) if (ver<0x03090000)
UpgradeSettings(false); UpgradeSettings(false);

2
Src/Lib/SettingsUIHelper.cpp
View File

@@ -1156,7 +1156,7 @@ HRESULT STDMETHODCALLTYPE CBrowseLinkEvents::OnButtonClicked( IFileDialogCustomi
{ {
pfd->GetFolder(&pItem); pfd->GetFolder(&pItem);
} }
m_pResult=pItem; m_pResult=std::move(pItem);
pfd->Close(S_FALSE); pfd->Close(S_FALSE);
return S_OK; return S_OK;
} }

2
Src/Setup/Utility/Utility.cpp
View File

@@ -943,7 +943,7 @@ static BOOL CALLBACK EnumResLangProc( HMODULE hModule, LPCTSTR lpszType, LPCTSTR
if (IS_INTRESOURCE(lpszName)) if (IS_INTRESOURCE(lpszName))
{ {
std::vector<std::pair<int,WORD>> &oldStrings=*(std::vector<std::pair<int,WORD>>*)lParam; std::vector<std::pair<int,WORD>> &oldStrings=*(std::vector<std::pair<int,WORD>>*)lParam;
oldStrings.push_back(std::pair<int,WORD>(PtrToInt(lpszName),wIDLanguage)); oldStrings.emplace_back(PtrToInt(lpszName),wIDLanguage);
} }
return TRUE; return TRUE;
} }

30
Src/StartMenu/StartMenuDLL/ItemManager.cpp
View File

@@ -609,7 +609,7 @@ void CItemManager::Init( void )
{ {
int width, height; int width, height;
pList->GetIconSize(&width,&height); pList->GetIconSize(&width,&height);
m_ListSizes.push_back(std::pair<int,int>(width,i)); m_ListSizes.emplace_back(width,i);
} }
} }
std::sort(m_ListSizes.begin(),m_ListSizes.end()); std::sort(m_ListSizes.begin(),m_ListSizes.end());
@@ -617,7 +617,7 @@ void CItemManager::Init( void )
CreateDefaultIcons(); CreateDefaultIcons();
LoadCacheFile(); LoadCacheFile();
ItemInfo &item=m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(0,ItemInfo()))->second; ItemInfo &item=m_ItemInfos.emplace(0,ItemInfo())->second;
item.bIconOnly=true; item.bIconOnly=true;
item.smallIcon=m_DefaultSmallIcon; item.smallIcon=m_DefaultSmallIcon;
item.largeIcon=m_DefaultLargeIcon; item.largeIcon=m_DefaultLargeIcon;
@@ -704,21 +704,21 @@ void CItemManager::CreateDefaultIcons( void )
icon.bitmap=BitmapFromIcon(LoadShellIcon(index,SMALL_ICON_SIZE),SMALL_ICON_SIZE); icon.bitmap=BitmapFromIcon(LoadShellIcon(index,SMALL_ICON_SIZE),SMALL_ICON_SIZE);
else else
icon.bitmap=NULL; icon.bitmap=NULL;
m_DefaultSmallIcon=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(0,icon))->second; m_DefaultSmallIcon=&m_IconInfos.emplace(0,icon)->second;
icon.sizeType=ICON_SIZE_TYPE_LARGE; icon.sizeType=ICON_SIZE_TYPE_LARGE;
if (index>=0) if (index>=0)
icon.bitmap=BitmapFromIcon(LoadShellIcon(index,LARGE_ICON_SIZE),LARGE_ICON_SIZE); icon.bitmap=BitmapFromIcon(LoadShellIcon(index,LARGE_ICON_SIZE),LARGE_ICON_SIZE);
else else
icon.bitmap=NULL; icon.bitmap=NULL;
m_DefaultLargeIcon=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(0,icon))->second; m_DefaultLargeIcon=&m_IconInfos.emplace(0,icon)->second;
icon.sizeType=ICON_SIZE_TYPE_EXTRA_LARGE; icon.sizeType=ICON_SIZE_TYPE_EXTRA_LARGE;
if (index>=0) if (index>=0)
icon.bitmap=BitmapFromIcon(LoadShellIcon(index,EXTRA_LARGE_ICON_SIZE),EXTRA_LARGE_ICON_SIZE); icon.bitmap=BitmapFromIcon(LoadShellIcon(index,EXTRA_LARGE_ICON_SIZE),EXTRA_LARGE_ICON_SIZE);
else else
icon.bitmap=NULL; icon.bitmap=NULL;
m_DefaultExtraLargeIcon=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(0,icon))->second; m_DefaultExtraLargeIcon=&m_IconInfos.emplace(0,icon)->second;
} }
CItemManager::LoadIconData &CItemManager::GetLoadIconData( void ) CItemManager::LoadIconData &CItemManager::GetLoadIconData( void )
@@ -896,7 +896,7 @@ const CItemManager::ItemInfo *CItemManager::GetItemInfo( IShellItem *pItem, PIDL
} }
if (!pInfo) if (!pInfo)
{ {
pInfo=&m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(hash,ItemInfo()))->second; pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second;
pInfo->pidl.Clone(pidl); pInfo->pidl.Clone(pidl);
pInfo->path=path; pInfo->path=path;
pInfo->PATH=PATH; pInfo->PATH=PATH;
@@ -978,7 +978,7 @@ const CItemManager::ItemInfo *CItemManager::GetItemInfo( CString path, int refre
} }
if (!pInfo) if (!pInfo)
{ {
pInfo=&m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(hash,ItemInfo()))->second; pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second;
if (!PATH.IsEmpty()) if (!PATH.IsEmpty())
MenuParseDisplayName(path,&pInfo->pidl,NULL,NULL); MenuParseDisplayName(path,&pInfo->pidl,NULL,NULL);
if (pInfo->pidl) if (pInfo->pidl)
@@ -1076,7 +1076,7 @@ const CItemManager::ItemInfo *CItemManager::GetCustomIcon( const wchar_t *locati
} }
if (!pInfo) if (!pInfo)
{ {
pInfo=&m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(hash,ItemInfo()))->second; pInfo=&m_ItemInfos.emplace(hash,ItemInfo())->second;
pInfo->bIconOnly=true; pInfo->bIconOnly=true;
pInfo->bTemp=bTemp; pInfo->bTemp=bTemp;
pInfo->iconPath=location; 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) if (SUCCEEDED(store->GetValue(PKEY_MetroAppLauncher, &val)) && (val.vt == VT_I4 || val.vt == VT_UI4) && val.intVal)
{ {
newInfo.bLink = false; newInfo.bLink = false;
pItem = target; pItem = std::move(target);
pStore = store; pStore = store;
} }
PropVariantClear(&val); PropVariantClear(&val);
@@ -2597,7 +2597,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP
if ((refreshFlags&INFO_SMALL_ICON) && hSmallBitmap) if ((refreshFlags&INFO_SMALL_ICON) && hSmallBitmap)
{ {
IconInfo *pInfo=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(hash,IconInfo()))->second; IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second;
pInfo->sizeType=ICON_SIZE_TYPE_SMALL; pInfo->sizeType=ICON_SIZE_TYPE_SMALL;
pInfo->bTemp=bTemp; pInfo->bTemp=bTemp;
pInfo->bMetro=bMetro; pInfo->bMetro=bMetro;
@@ -2607,7 +2607,7 @@ void CItemManager::StoreInCache( unsigned int hash, const wchar_t *path, HBITMAP
} }
if ((refreshFlags&INFO_LARGE_ICON) && hLargeBitmap) if ((refreshFlags&INFO_LARGE_ICON) && hLargeBitmap)
{ {
IconInfo *pInfo=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(hash,IconInfo()))->second; IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second;
pInfo->sizeType=ICON_SIZE_TYPE_LARGE; pInfo->sizeType=ICON_SIZE_TYPE_LARGE;
pInfo->bTemp=bTemp; pInfo->bTemp=bTemp;
pInfo->bMetro=bMetro; 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) if ((refreshFlags&INFO_EXTRA_LARGE_ICON) && hExtraLargeBitmap)
{ {
IconInfo *pInfo=&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(hash,IconInfo()))->second; IconInfo *pInfo=&m_IconInfos.emplace(hash,IconInfo())->second;
pInfo->sizeType=ICON_SIZE_TYPE_EXTRA_LARGE; pInfo->sizeType=ICON_SIZE_TYPE_EXTRA_LARGE;
pInfo->bTemp=bTemp; pInfo->bTemp=bTemp;
pInfo->bMetro=bMetro; pInfo->bMetro=bMetro;
@@ -3273,7 +3273,7 @@ void CItemManager::LoadCacheFile( void )
bError=true; bError=true;
break; break;
} }
remapIcons.push_back(&m_IconInfos.insert(std::pair<unsigned int,IconInfo>(data.key,info))->second); remapIcons.push_back(&m_IconInfos.emplace(data.key,info)->second);
} }
else else
{ {
@@ -3304,7 +3304,7 @@ void CItemManager::LoadCacheFile( void )
bError=true; bError=true;
break; break;
} }
ItemInfo &info=m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(data.key,ItemInfo()))->second; ItemInfo &info=m_ItemInfos.emplace(data.key,ItemInfo())->second;
info.writestamp=data.writestamp; info.writestamp=data.writestamp;
info.createstamp=data.createstamp; info.createstamp=data.createstamp;
@@ -3568,7 +3568,7 @@ void CItemManager::ClearCache( void )
m_IconInfos.clear(); m_IconInfos.clear();
m_MetroItemInfos10.clear(); m_MetroItemInfos10.clear();
CreateDefaultIcons(); CreateDefaultIcons();
ItemInfo &item=m_ItemInfos.insert(std::pair<unsigned int,ItemInfo>(0,ItemInfo()))->second; ItemInfo &item=m_ItemInfos.emplace(0,ItemInfo())->second;
item.bIconOnly=true; item.bIconOnly=true;
item.smallIcon=m_DefaultSmallIcon; item.smallIcon=m_DefaultSmallIcon;
item.largeIcon=m_DefaultLargeIcon; item.largeIcon=m_DefaultLargeIcon;

2
Src/StartMenu/StartMenuDLL/MenuContainer.cpp
View File

@@ -2237,7 +2237,7 @@ void CMenuContainer::AddJumpListItems( std::vector<MenuItem> &items )
{ {
ILFree(item.pItem1); ILFree(item.pItem1);
item.pItem1=pidl2.Detach(); item.pItem1=pidl2.Detach();
pItem=pItem2; pItem=std::move(pItem2);
} }
} }
} }

2
Src/StartMenu/StartMenuDLL/SearchManager.cpp
View File

@@ -526,7 +526,7 @@ bool CSearchManager::SearchScope::ParseSearchConnector( const wchar_t *fname )
CComPtr<IXMLDOMNode> pNext; CComPtr<IXMLDOMNode> pNext;
if (pScopeItem->get_nextSibling(&pNext)!=S_OK) if (pScopeItem->get_nextSibling(&pNext)!=S_OK)
break; break;
pScopeItem=pNext; pScopeItem=std::move(pNext);
} }
return true; return true;
} }

2
Src/StartMenu/StartMenuDLL/SkinManager.cpp
View File

@@ -1778,7 +1778,7 @@ bool MenuSkin::LoadSkin( HMODULE hMod, const wchar_t *variation, const wchar_t *
var.label=token; var.label=token;
if (var.labelEn.IsEmpty()) if (var.labelEn.IsEmpty())
var.labelEn=var.label; var.labelEn=var.label;
Variations.push_back(std::pair<int,Variation>(res,var)); Variations.emplace_back(res,var);
LOG_MENU(LOG_OPEN,L"Variation found: name=%s, id=%d",token,res); LOG_MENU(LOG_OPEN,L"Variation found: name=%s, id=%d",token,res);
} }
else else

2
Src/StartMenu/StartMenuHelper/ModernSettings.cpp
View File

@@ -280,7 +280,7 @@ static std::vector<uint8_t> ParseModernSettings()
CComPtr<IXMLDOMNode> next; CComPtr<IXMLDOMNode> next;
if (FAILED(node->get_nextSibling(&next))) if (FAILED(node->get_nextSibling(&next)))
break; break;
node = next; node = std::move(next);
} }
} }
} }

2
Src/Update/DesktopToasts/DesktopNotificationManagerCompat.cpp
View File

@@ -224,7 +224,7 @@ namespace DesktopNotificationManagerCompat
DesktopNotificationHistoryCompat::DesktopNotificationHistoryCompat(const wchar_t *aumid, ComPtr<IToastNotificationHistory> history) DesktopNotificationHistoryCompat::DesktopNotificationHistoryCompat(const wchar_t *aumid, ComPtr<IToastNotificationHistory> history)
{ {
m_aumid = std::wstring(aumid); m_aumid = std::wstring(aumid);
m_history = history; m_history = std::move(history);
} }
HRESULT DesktopNotificationHistoryCompat::Clear() HRESULT DesktopNotificationHistoryCompat::Clear()