From 4f362760b6137417642a466ba352d24a2a2d47e6 Mon Sep 17 00:00:00 2001
From: germanaizek <GermanAizek@yandex.ru>
Date: Thu, 12 May 2022 16:36:15 +0300
Subject: [PATCH] Remove unused vars, usage '= default;' and fixed lower scope

---
 Src/Lib/DownloadHelper.cpp                   | 3 ++-
 Src/Lib/LanguageSettingsHelper.cpp           | 3 ---
 Src/StartMenu/StartMenuDLL/Accessibility.cpp | 4 +---
 Src/StartMenu/StartMenuDLL/DragDrop.h        | 4 +---
 Src/StartMenu/StartMenuDLL/SearchManager.h   | 2 +-
 Src/StartMenu/StartMenuDLL/SettingsUI.cpp    | 1 -
 Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp  | 2 +-
 7 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Src/Lib/DownloadHelper.cpp b/Src/Lib/DownloadHelper.cpp
index 19160d0..cecabda 100644
--- a/Src/Lib/DownloadHelper.cpp
+++ b/Src/Lib/DownloadHelper.cpp
@@ -195,9 +195,10 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
 	{
 		if (pProgress && pProgress->IsCanceled())
 			res=DOWNLOAD_CANCEL;
-		const wchar_t *accept[]={L"*/*",NULL};
+		
 		if (res==DOWNLOAD_OK)
 		{
+			const wchar_t* accept[] = { L"*/*",NULL };
 			HINTERNET hRequest=HttpOpenRequest(hConnect,L"GET",file,NULL,NULL,accept,((components.nScheme==INTERNET_SCHEME_HTTPS)?INTERNET_FLAG_SECURE:0)|(bAcceptCached?0:INTERNET_FLAG_RELOAD),0);
 			if (hRequest)
 			{
diff --git a/Src/Lib/LanguageSettingsHelper.cpp b/Src/Lib/LanguageSettingsHelper.cpp
index bb3d43c..0955539 100644
--- a/Src/Lib/LanguageSettingsHelper.cpp
+++ b/Src/Lib/LanguageSettingsHelper.cpp
@@ -127,7 +127,6 @@ VersionData CLanguageSettingsDlg::s_VersionData;
 
 void CLanguageSettingsDlg::AddFlag( const wchar_t *langName, int langId, HBITMAP bmp )
 {
-	std::vector<LangInfo>::iterator it=m_LanguageIDs.begin()+1;
 	int idx=1;
 	for (;idx<(int)m_LanguageIDs.size();idx++)
 	{
@@ -205,8 +204,6 @@ void CLanguageSettingsDlg::UpdateFlags( void )
 			DoEnvironmentSubst(path,_countof(path));
 		}
 
-		CWindow list=GetDlgItem(IDC_LISTLANGUAGE);
-
 		wchar_t find[_MAX_PATH];
 		Sprintf(find,_countof(find),L"%s\\*.dll",path);
 		WIN32_FIND_DATA data;
diff --git a/Src/StartMenu/StartMenuDLL/Accessibility.cpp b/Src/StartMenu/StartMenuDLL/Accessibility.cpp
index a7d57bf..aa85295 100644
--- a/Src/StartMenu/StartMenuDLL/Accessibility.cpp
+++ b/Src/StartMenu/StartMenuDLL/Accessibility.cpp
@@ -16,9 +16,7 @@ CMenuAccessible::CMenuAccessible( CMenuContainer *pOwner )
 	CreateStdAccessibleObject(pOwner->m_hWnd,OBJID_CLIENT,IID_IAccessible,(void**)&m_pStdAccessible);
 }
 
-CMenuAccessible::~CMenuAccessible( void )
-{
-}
+CMenuAccessible::~CMenuAccessible( void ) = default;
 
 void CMenuAccessible::Reset( void )
 {
diff --git a/Src/StartMenu/StartMenuDLL/DragDrop.h b/Src/StartMenu/StartMenuDLL/DragDrop.h
index 9b2e584..bd27dec 100644
--- a/Src/StartMenu/StartMenuDLL/DragDrop.h
+++ b/Src/StartMenu/StartMenuDLL/DragDrop.h
@@ -15,9 +15,7 @@ public:
 		m_RefCount=0;
 	}
 
-	~CDropTargetProxy( void )
-	{
-	}
+	~CDropTargetProxy( void ) = default;
 
 	void Reset( void )
 	{
diff --git a/Src/StartMenu/StartMenuDLL/SearchManager.h b/Src/StartMenu/StartMenuDLL/SearchManager.h
index c521eec..6328b43 100644
--- a/Src/StartMenu/StartMenuDLL/SearchManager.h
+++ b/Src/StartMenu/StartMenuDLL/SearchManager.h
@@ -36,7 +36,7 @@ public:
 
 	struct SearchCategory
 	{
-		SearchCategory( void ) {}
+		SearchCategory( void ) = default;
 		SearchCategory( const SearchCategory &cat )
 		{
 			search.Clone(cat.search);
diff --git a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp
index 687877d..54007e9 100644
--- a/Src/StartMenu/StartMenuDLL/SettingsUI.cpp
+++ b/Src/StartMenu/StartMenuDLL/SettingsUI.cpp
@@ -3155,7 +3155,6 @@ LRESULT CCustomMenuDlg7::CItemList::OnSelEndOk( WORD wNotifyCode, WORD wID, HWND
 	if (m_Column==2)
 	{
 		// state
-		CString str;
 		menuItem.settings&=~CEditMenuDlg7::SETTINGS_MASK;
 		if (sel==0)
 			menuItem.settings|=StdMenuItem::MENU_ITEM_DISABLED;
diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp
index 1ae435f..fa5bc3e 100644
--- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp
+++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp
@@ -3760,7 +3760,6 @@ if (!g_bTrimHooks)
 		// context menu
 		if (msg->message==WM_NCRBUTTONUP || msg->message==WM_RBUTTONUP)
 		{
-			CPoint pt0(GetMessagePos());
 			TaskbarInfo *taskBar=FindTaskBarInfoButton(msg->hwnd);
 			DWORD winVer=GetWinVersion();
 			if (!taskBar && winVer>=WIN_VER_WIN8)
@@ -3771,6 +3770,7 @@ if (!g_bTrimHooks)
 			}
 			if (taskBar)
 			{
+				CPoint pt0(GetMessagePos());
 				if (msg->message==WM_RBUTTONUP && msg->hwnd==taskBar->startButton && msg->lParam==MAKELPARAM(-1,-1))
 				{
 					RECT rc;