Skip to content

Commit 4f36276

Browse files
GermanAizekge0rdi
authored andcommitted
Remove unused vars, usage '= default;' and fixed lower scope
1 parent 2e43d4c commit 4f36276

File tree

7 files changed

+6
-13
lines changed

7 files changed

+6
-13
lines changed

Src/Lib/DownloadHelper.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,10 @@ static TDownloadResult DownloadFile( const wchar_t *url, std::vector<char> &buf,
195195
{
196196
if (pProgress && pProgress->IsCanceled())
197197
res=DOWNLOAD_CANCEL;
198-
const wchar_t *accept[]={L"*/*",NULL};
198+
199199
if (res==DOWNLOAD_OK)
200200
{
201+
const wchar_t* accept[] = { L"*/*",NULL };
201202
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);
202203
if (hRequest)
203204
{

Src/Lib/LanguageSettingsHelper.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ VersionData CLanguageSettingsDlg::s_VersionData;
127127

128128
void CLanguageSettingsDlg::AddFlag( const wchar_t *langName, int langId, HBITMAP bmp )
129129
{
130-
std::vector<LangInfo>::iterator it=m_LanguageIDs.begin()+1;
131130
int idx=1;
132131
for (;idx<(int)m_LanguageIDs.size();idx++)
133132
{
@@ -205,8 +204,6 @@ void CLanguageSettingsDlg::UpdateFlags( void )
205204
DoEnvironmentSubst(path,_countof(path));
206205
}
207206

208-
CWindow list=GetDlgItem(IDC_LISTLANGUAGE);
209-
210207
wchar_t find[_MAX_PATH];
211208
Sprintf(find,_countof(find),L"%s\\*.dll",path);
212209
WIN32_FIND_DATA data;

Src/StartMenu/StartMenuDLL/Accessibility.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ CMenuAccessible::CMenuAccessible( CMenuContainer *pOwner )
1616
CreateStdAccessibleObject(pOwner->m_hWnd,OBJID_CLIENT,IID_IAccessible,(void**)&m_pStdAccessible);
1717
}
1818

19-
CMenuAccessible::~CMenuAccessible( void )
20-
{
21-
}
19+
CMenuAccessible::~CMenuAccessible( void ) = default;
2220

2321
void CMenuAccessible::Reset( void )
2422
{

Src/StartMenu/StartMenuDLL/DragDrop.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ class CDropTargetProxy: public IDropTarget
1515
m_RefCount=0;
1616
}
1717

18-
~CDropTargetProxy( void )
19-
{
20-
}
18+
~CDropTargetProxy( void ) = default;
2119

2220
void Reset( void )
2321
{

Src/StartMenu/StartMenuDLL/SearchManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class CSearchManager
3636

3737
struct SearchCategory
3838
{
39-
SearchCategory( void ) {}
39+
SearchCategory( void ) = default;
4040
SearchCategory( const SearchCategory &cat )
4141
{
4242
search.Clone(cat.search);

Src/StartMenu/StartMenuDLL/SettingsUI.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3155,7 +3155,6 @@ LRESULT CCustomMenuDlg7::CItemList::OnSelEndOk( WORD wNotifyCode, WORD wID, HWND
31553155
if (m_Column==2)
31563156
{
31573157
// state
3158-
CString str;
31593158
menuItem.settings&=~CEditMenuDlg7::SETTINGS_MASK;
31603159
if (sel==0)
31613160
menuItem.settings|=StdMenuItem::MENU_ITEM_DISABLED;

Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3760,7 +3760,6 @@ if (!g_bTrimHooks)
37603760
// context menu
37613761
if (msg->message==WM_NCRBUTTONUP || msg->message==WM_RBUTTONUP)
37623762
{
3763-
CPoint pt0(GetMessagePos());
37643763
TaskbarInfo *taskBar=FindTaskBarInfoButton(msg->hwnd);
37653764
DWORD winVer=GetWinVersion();
37663765
if (!taskBar && winVer>=WIN_VER_WIN8)
@@ -3771,6 +3770,7 @@ if (!g_bTrimHooks)
37713770
}
37723771
if (taskBar)
37733772
{
3773+
CPoint pt0(GetMessagePos());
37743774
if (msg->message==WM_RBUTTONUP && msg->hwnd==taskBar->startButton && msg->lParam==MAKELPARAM(-1,-1))
37753775
{
37763776
RECT rc;

0 commit comments

Comments
 (0)