From e24e8f2dbe64911993afd7388380728b4f73229c Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2016 14:30:38 +0200 Subject: [PATCH] Reduce C style casts Signed-off-by: Sven Strickroth --- src/Git/GitIndex.cpp | 2 +- src/ResText/ResModule.cpp | 8 +++---- src/TGitCache/DirectoryWatcher.cpp | 2 +- src/TGitCache/FolderCrawler.cpp | 2 +- src/TGitCache/ShellUpdater.cpp | 2 +- src/TortoiseGitBlame/PropertiesWnd.cpp | 2 +- src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp | 6 +---- src/TortoiseGitBlame/TortoiseGitBlameDoc.h | 4 ++-- src/TortoiseGitBlame/TortoiseGitBlameView.cpp | 4 ++-- src/TortoiseIDiff/NiceTrackbar.cpp | 2 +- src/TortoiseMerge/MainFrm.cpp | 6 ++--- src/TortoiseMerge/MovedBlocks.cpp | 2 +- src/TortoisePlink/LoginDialog.cpp | 9 ++++---- src/TortoiseProc/AddDlg.cpp | 2 +- src/TortoiseProc/BrowseRefsDlg.cpp | 6 ++--- src/TortoiseProc/ChangedDlg.cpp | 2 +- src/TortoiseProc/CheckForUpdatesDlg.cpp | 4 ++-- src/TortoiseProc/ChooseVersion.h | 2 +- src/TortoiseProc/Commands/CleanupCommand.cpp | 2 +- src/TortoiseProc/CommitIsOnRefsDlg.cpp | 2 +- src/TortoiseProc/FileDiffDlg.cpp | 4 ++-- src/TortoiseProc/FileDiffDlg.h | 2 +- src/TortoiseProc/GitLogCache.cpp | 20 ++++++++-------- src/TortoiseProc/GitLogListBase.h | 27 +++++++++++----------- src/TortoiseProc/GitProgressList.cpp | 2 +- src/TortoiseProc/GravatarPictureBox.cpp | 2 +- src/TortoiseProc/ImportPatchDlg.h | 2 +- src/TortoiseProc/ProgressDlg.cpp | 2 +- src/TortoiseProc/RebaseDlg.h | 2 +- src/TortoiseProc/RepositoryBrowser.cpp | 6 ++--- src/TortoiseProc/ResolveDlg.cpp | 2 +- src/TortoiseProc/RevertDlg.cpp | 2 +- .../RevisionGraph/RevisionGraphWnd.cpp | 2 +- src/TortoiseProc/Settings/SetBugTraq.cpp | 4 ++-- src/TortoiseProc/Settings/SettingGitRemote.cpp | 2 +- src/TortoiseProc/StatGraphDlg.cpp | 2 +- src/TortoiseProc/SyncDlg.cpp | 2 +- src/TortoiseProc/SyncDlg.h | 2 +- src/TortoiseShell/GITPropertyPage.cpp | 11 ++++----- src/TortoiseShell/ShellExt.cpp | 2 +- src/Utils/MiscUI/BaseDialog.cpp | 3 ++- src/Utils/MiscUI/BaseDialog.h | 3 ++- src/Utils/MiscUI/BaseWindow.h | 3 ++- src/Utils/MiscUI/hyperlink_base.cpp | 5 ++-- src/Utils/PathWatcher.cpp | 2 +- src/Utils/UnicodeUtils.cpp | 4 ++-- 46 files changed, 94 insertions(+), 97 deletions(-) diff --git a/src/Git/GitIndex.cpp b/src/Git/GitIndex.cpp index e2fe20012..179e46998 100644 --- a/src/Git/GitIndex.cpp +++ b/src/Git/GitIndex.cpp @@ -656,7 +656,7 @@ int CGitHeadFileList::CallBack(const unsigned char *sha1, const char *base, int { #define S_IFGITLINK 0160000 - CGitHeadFileList *p = (CGitHeadFileList*)context; + CGitHeadFileList* p = reinterpret_cast(context); if ((mode & S_IFDIR) && (mode & S_IFMT) != S_IFGITLINK) return READ_TREE_RECURSIVE; diff --git a/src/ResText/ResModule.cpp b/src/ResText/ResModule.cpp index 917ce0dd3..149dc0640 100644 --- a/src/ResText/ResModule.cpp +++ b/src/ResText/ResModule.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2015 - TortoiseGit +// Copyright (C) 2015-2016 - TortoiseGit // Copyright (C) 2003-2008, 2010-2016 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -2045,7 +2045,7 @@ DONE_ERROR: BOOL CALLBACK CResModule::EnumResNameCallback(HMODULE /*hModule*/, LPCTSTR lpszType, LPTSTR lpszName, LONG_PTR lParam) { - CResModule* lpResModule = (CResModule*)lParam; + auto lpResModule = reinterpret_cast(lParam); if (lpszType == RT_STRING) { @@ -2095,7 +2095,7 @@ BOOL CALLBACK CResModule::EnumResNameCallback(HMODULE /*hModule*/, LPCTSTR lpszT #pragma warning(disable: 4189) BOOL CALLBACK CResModule::EnumResNameWriteCallback(HMODULE hModule, LPCTSTR lpszType, LPTSTR lpszName, LONG_PTR lParam) { - CResModule* lpResModule = (CResModule*)lParam; + auto lpResModule = reinterpret_cast(lParam); return EnumResourceLanguages(hModule, lpszType, lpszName, (ENUMRESLANGPROC)&lpResModule->EnumResWriteLangCallback, lParam); } #pragma warning(pop) @@ -2103,7 +2103,7 @@ BOOL CALLBACK CResModule::EnumResNameWriteCallback(HMODULE hModule, LPCTSTR lpsz BOOL CALLBACK CResModule::EnumResWriteLangCallback(HMODULE /*hModule*/, LPCTSTR lpszType, LPTSTR lpszName, WORD wLanguage, LONG_PTR lParam) { BOOL bRes = FALSE; - CResModule* lpResModule = (CResModule*)lParam; + auto lpResModule = reinterpret_cast(lParam); if (lpszType == RT_STRING) { diff --git a/src/TGitCache/DirectoryWatcher.cpp b/src/TGitCache/DirectoryWatcher.cpp index 25130b593..e3036a570 100644 --- a/src/TGitCache/DirectoryWatcher.cpp +++ b/src/TGitCache/DirectoryWatcher.cpp @@ -232,7 +232,7 @@ bool CDirectoryWatcher::IsPathWatched(const CTGitPath& path) unsigned int CDirectoryWatcher::ThreadEntry(void* pContext) { - ((CDirectoryWatcher*)pContext)->WorkerThread(); + reinterpret_cast(pContext)->WorkerThread(); return 0; } diff --git a/src/TGitCache/FolderCrawler.cpp b/src/TGitCache/FolderCrawler.cpp index 64bdc7eb6..ba6f8ec01 100644 --- a/src/TGitCache/FolderCrawler.cpp +++ b/src/TGitCache/FolderCrawler.cpp @@ -136,7 +136,7 @@ void CFolderCrawler::ReleasePathForUpdate(const CTGitPath& path) unsigned int CFolderCrawler::ThreadEntry(void* pContext) { - ((CFolderCrawler*)pContext)->WorkerThread(); + reinterpret_cast(pContext)->WorkerThread(); return 0; } diff --git a/src/TGitCache/ShellUpdater.cpp b/src/TGitCache/ShellUpdater.cpp index 45417bfae..7bb716189 100644 --- a/src/TGitCache/ShellUpdater.cpp +++ b/src/TGitCache/ShellUpdater.cpp @@ -83,7 +83,7 @@ void CShellUpdater::AddPathForUpdate(const CTGitPath& path) unsigned int CShellUpdater::ThreadEntry(void* pContext) { - ((CShellUpdater*)pContext)->WorkerThread(); + reinterpret_cast(pContext)->WorkerThread(); return 0; } diff --git a/src/TortoiseGitBlame/PropertiesWnd.cpp b/src/TortoiseGitBlame/PropertiesWnd.cpp index 36ead79bd..151a4fd14 100644 --- a/src/TortoiseGitBlame/PropertiesWnd.cpp +++ b/src/TortoiseGitBlame/PropertiesWnd.cpp @@ -261,7 +261,7 @@ void CPropertiesWnd::UpdateProperties(GitRevLoglist* pRev) RemoveParent(); - CLogDataVector *pLogEntry = &((CMainFrame*)AfxGetApp()->GetMainWnd())->m_wndOutput.m_LogList.m_logEntries; + CLogDataVector* pLogEntry = &static_cast(AfxGetApp()->GetMainWnd())->m_wndOutput.m_LogList.m_logEntries; CGitHashMap & hashMap = pLogEntry->m_pLogCache->m_HashMap; for (size_t i = 0; i < pRev->m_ParentHash.size(); ++i) diff --git a/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp b/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp index 4c534c668..3d8018b98 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp +++ b/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp @@ -215,13 +215,9 @@ BOOL CTortoiseGitBlameDoc::OnOpenDocument(LPCTSTR lpszPathName,CString Rev) { CWnd* pWnd = GetMainFrame()->GetDescendantWindow(AFX_IDW_PANE_FIRST, TRUE); if (pWnd && pWnd->IsKindOf(RUNTIME_CLASS(CTortoiseGitBlameView))) - { - pView = (CTortoiseGitBlameView*)pWnd; - } + pView = static_cast(pWnd); else - { return FALSE; - } } pView->ParseBlame(); diff --git a/src/TortoiseGitBlame/TortoiseGitBlameDoc.h b/src/TortoiseGitBlame/TortoiseGitBlameDoc.h index 1ef42da9b..a426a5def 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlameDoc.h +++ b/src/TortoiseGitBlame/TortoiseGitBlameDoc.h @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2011,2013 - TortoiseGit +// Copyright (C) 2008-2011, 2013, 2016 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -63,7 +63,7 @@ public: #endif CMainFrame *GetMainFrame() { - return (CMainFrame*)AfxGetApp()->GetMainWnd(); + return reinterpret_cast(AfxGetApp()->GetMainWnd()); } protected: diff --git a/src/TortoiseGitBlame/TortoiseGitBlameView.cpp b/src/TortoiseGitBlame/TortoiseGitBlameView.cpp index e836573b0..037c97f81 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlameView.cpp +++ b/src/TortoiseGitBlame/TortoiseGitBlameView.cpp @@ -1939,7 +1939,7 @@ void CTortoiseGitBlameView::OnViewDetectMovedOrCopiedLines(DWORD dwDetectMovedOr theApp.WriteInt(_T("DetectMovedOrCopiedLines"), m_dwDetectMovedOrCopiedLines); - CTortoiseGitBlameDoc *document = (CTortoiseGitBlameDoc *) m_pDocument; + auto document = static_cast(m_pDocument); if (!document->m_CurrentFileName.IsEmpty()) { document->m_lLine = (int)SendEditor(SCI_GETFIRSTVISIBLELINE) + 1; @@ -2002,7 +2002,7 @@ void CTortoiseGitBlameView::OnUpdateViewDetectMovedOrCopiedLinesToggleFromExisti void CTortoiseGitBlameView::ReloadDocument() { theApp.DoWaitCursor(1); - CTortoiseGitBlameDoc *document = (CTortoiseGitBlameDoc *) m_pDocument; + auto document = static_cast(m_pDocument); if (!document->m_CurrentFileName.IsEmpty()) { document->m_lLine = (int)SendEditor(SCI_GETFIRSTVISIBLELINE) + 1; diff --git a/src/TortoiseIDiff/NiceTrackbar.cpp b/src/TortoiseIDiff/NiceTrackbar.cpp index d7aad065f..b186c771b 100644 --- a/src/TortoiseIDiff/NiceTrackbar.cpp +++ b/src/TortoiseIDiff/NiceTrackbar.cpp @@ -25,7 +25,7 @@ LRESULT CALLBACK CNiceTrackbar::NiceTrackbarProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - CNiceTrackbar* self = (CNiceTrackbar*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + auto self = reinterpret_cast(GetWindowLongPtr(hwnd, GWLP_USERDATA)); switch (message) { case WM_LBUTTONDOWN: diff --git a/src/TortoiseMerge/MainFrm.cpp b/src/TortoiseMerge/MainFrm.cpp index e80898f3f..c33c7b49e 100644 --- a/src/TortoiseMerge/MainFrm.cpp +++ b/src/TortoiseMerge/MainFrm.cpp @@ -535,7 +535,7 @@ BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT /*lpcs*/, CCreateContext* pContex TRACE0("Failed to create first pane\n"); return FALSE; } - m_pwndBottomView = (CBottomView *)m_wndSplitter.GetPane(1,0); + m_pwndBottomView = static_cast(m_wndSplitter.GetPane(1, 0)); m_pwndBottomView->m_pwndLocator = &m_wndLocatorBar; m_pwndBottomView->m_pwndLineDiffBar = &m_wndLineDiffBar; if (m_bUseRibbons) @@ -552,7 +552,7 @@ BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT /*lpcs*/, CCreateContext* pContex TRACE0("Failed to create second pane\n"); return FALSE; } - m_pwndLeftView = (CLeftView *)m_wndSplitter2.GetPane(0,0); + m_pwndLeftView = static_cast(m_wndSplitter2.GetPane(0, 0)); m_pwndLeftView->m_pwndLocator = &m_wndLocatorBar; m_pwndLeftView->m_pwndLineDiffBar = &m_wndLineDiffBar; if (m_bUseRibbons) @@ -567,7 +567,7 @@ BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT /*lpcs*/, CCreateContext* pContex TRACE0("Failed to create third pane\n"); return FALSE; } - m_pwndRightView = (CRightView *)m_wndSplitter2.GetPane(0,1); + m_pwndRightView = static_cast(m_wndSplitter2.GetPane(0, 1)); m_pwndRightView->m_pwndLocator = &m_wndLocatorBar; m_pwndRightView->m_pwndLineDiffBar = &m_wndLineDiffBar; if (m_bUseRibbons) diff --git a/src/TortoiseMerge/MovedBlocks.cpp b/src/TortoiseMerge/MovedBlocks.cpp index 7c6fbfa38..8f5d8b71a 100644 --- a/src/TortoiseMerge/MovedBlocks.cpp +++ b/src/TortoiseMerge/MovedBlocks.cpp @@ -128,7 +128,7 @@ LineToGroupMap::~LineToGroupMap() tsvn_svn_diff_t_extension * CreateDiffExtension(svn_diff_t * base, apr_pool_t * pool) { - tsvn_svn_diff_t_extension * ext = (tsvn_svn_diff_t_extension *)apr_palloc(pool, sizeof(tsvn_svn_diff_t_extension)); + auto ext = static_cast(apr_palloc(pool, sizeof(tsvn_svn_diff_t_extension))); ext->next = NULL; ext->moved_to = -1; ext->moved_from = -1; diff --git a/src/TortoisePlink/LoginDialog.cpp b/src/TortoisePlink/LoginDialog.cpp index 7076f2f70..3d1072fc8 100644 --- a/src/TortoisePlink/LoginDialog.cpp +++ b/src/TortoisePlink/LoginDialog.cpp @@ -1,5 +1,6 @@ -// TortoiseSVN - a Windows shell extension for easy version control +// TortoiseGit - a Windows shell extension for easy version control +// Copyright (C) 2013, 2016 - TortoiseGit // Copyright (C) 2003, 2013 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -62,7 +63,7 @@ BOOL CALLBACK LoginDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa { if (uMsg == WM_INITDIALOG) { - LoginDialog* pDlg = (LoginDialog*) lParam; + auto pDlg = reinterpret_cast(lParam); pDlg->_hdlg = hwndDlg; SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); // Set prompt text @@ -79,14 +80,14 @@ BOOL CALLBACK LoginDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa } else if (uMsg == WM_COMMAND && LOWORD(wParam) == IDCANCEL && HIWORD(wParam) == BN_CLICKED) { - LoginDialog* pDlg = (LoginDialog*) GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + auto pDlg = reinterpret_cast(GetWindowLongPtr(hwndDlg, GWLP_USERDATA)); pDlg->myOK = false; EndDialog(hwndDlg, IDCANCEL); return 1; } else if (uMsg == WM_COMMAND && LOWORD(wParam) == IDOK && HIWORD(wParam) == BN_CLICKED) { - LoginDialog* pDlg = (LoginDialog*) GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + auto pDlg = reinterpret_cast(GetWindowLongPtr(hwndDlg, GWLP_USERDATA)); pDlg->myOK = true; pDlg->RetrieveValues(); EndDialog(hwndDlg, IDOK); diff --git a/src/TortoiseProc/AddDlg.cpp b/src/TortoiseProc/AddDlg.cpp index 983f7efb8..f9c931d6b 100644 --- a/src/TortoiseProc/AddDlg.cpp +++ b/src/TortoiseProc/AddDlg.cpp @@ -135,7 +135,7 @@ void CAddDlg::OnBnClickedSelectall() UINT CAddDlg::AddThreadEntry(LPVOID pVoid) { - return ((CAddDlg*)pVoid)->AddThread(); + return reinterpret_cast(pVoid)->AddThread(); } UINT CAddDlg::AddThread() diff --git a/src/TortoiseProc/BrowseRefsDlg.cpp b/src/TortoiseProc/BrowseRefsDlg.cpp index 1dac52498..13edadb36 100644 --- a/src/TortoiseProc/BrowseRefsDlg.cpp +++ b/src/TortoiseProc/BrowseRefsDlg.cpp @@ -103,14 +103,14 @@ public: static int CALLBACK StaticCompare(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { - return ((CRefLeafListCompareFunc*)lParamSort)->Compare(lParam1,lParam2); + return reinterpret_cast(lParamSort)->Compare(lParam1, lParam2); } int Compare(LPARAM lParam1, LPARAM lParam2) { return Compare( - (CShadowTree*)m_pList->GetItemData((int)lParam1), - (CShadowTree*)m_pList->GetItemData((int)lParam2)); + reinterpret_cast(m_pList->GetItemData((int)lParam1)), + reinterpret_cast(m_pList->GetItemData((int)lParam2))); } int Compare(const CShadowTree* pLeft, const CShadowTree* pRight) diff --git a/src/TortoiseProc/ChangedDlg.cpp b/src/TortoiseProc/ChangedDlg.cpp index 445b1fe46..5c134d67d 100644 --- a/src/TortoiseProc/ChangedDlg.cpp +++ b/src/TortoiseProc/ChangedDlg.cpp @@ -132,7 +132,7 @@ BOOL CChangedDlg::OnInitDialog() UINT CChangedDlg::ChangedStatusThreadEntry(LPVOID pVoid) { - return ((CChangedDlg*)pVoid)->ChangedStatusThread(); + return reinterpret_cast(pVoid)->ChangedStatusThread(); } UINT CChangedDlg::ChangedStatusThread() diff --git a/src/TortoiseProc/CheckForUpdatesDlg.cpp b/src/TortoiseProc/CheckForUpdatesDlg.cpp index 0bed450e6..c21db8984 100644 --- a/src/TortoiseProc/CheckForUpdatesDlg.cpp +++ b/src/TortoiseProc/CheckForUpdatesDlg.cpp @@ -175,7 +175,7 @@ void CCheckForUpdatesDlg::OnCancel() UINT CCheckForUpdatesDlg::CheckThreadEntry(LPVOID pVoid) { - return ((CCheckForUpdatesDlg*)pVoid)->CheckThread(); + return reinterpret_cast(pVoid)->CheckThread(); } UINT CCheckForUpdatesDlg::CheckThread() @@ -669,7 +669,7 @@ void CCheckForUpdatesDlg::OnBnClickedButtonUpdate() UINT CCheckForUpdatesDlg::DownloadThreadEntry(LPVOID pVoid) { - return ((CCheckForUpdatesDlg*)pVoid)->DownloadThread(); + return reinterpret_cast(pVoid)->DownloadThread(); } bool CCheckForUpdatesDlg::VerifyUpdateFile(const CString& filename, const CString& filenameSignature, const CString& reportingFilename) diff --git a/src/TortoiseProc/ChooseVersion.h b/src/TortoiseProc/ChooseVersion.h index ecf6cdc30..647498ffa 100644 --- a/src/TortoiseProc/ChooseVersion.h +++ b/src/TortoiseProc/ChooseVersion.h @@ -36,7 +36,7 @@ private: CWinThread* m_pLoadingThread; static UINT LoadingThreadEntry(LPVOID pVoid) { - return ((CChooseVersion*)pVoid)->LoadingThread(); + return reinterpret_cast(pVoid)->LoadingThread(); }; volatile LONG m_bLoadingThreadRunning; diff --git a/src/TortoiseProc/Commands/CleanupCommand.cpp b/src/TortoiseProc/Commands/CleanupCommand.cpp index 8fc1593d4..583854014 100644 --- a/src/TortoiseProc/Commands/CleanupCommand.cpp +++ b/src/TortoiseProc/Commands/CleanupCommand.cpp @@ -62,7 +62,7 @@ static bool GetSubmodulePathList(SubmodulePayload &payload); static int SubmoduleCallback(git_submodule *sm, const char * /*name*/, void *payload) { - auto spayload = (SubmodulePayload *)payload; + auto spayload = reinterpret_cast(payload); CString path = CUnicodeUtils::GetUnicode(git_submodule_path(sm)); CString fullPath(spayload->basePath); fullPath += _T("\\"); diff --git a/src/TortoiseProc/CommitIsOnRefsDlg.cpp b/src/TortoiseProc/CommitIsOnRefsDlg.cpp index ff96306b3..3d2d6c87c 100644 --- a/src/TortoiseProc/CommitIsOnRefsDlg.cpp +++ b/src/TortoiseProc/CommitIsOnRefsDlg.cpp @@ -432,7 +432,7 @@ void CCommitIsOnRefsDlg::StartGetRefsThread() UINT CCommitIsOnRefsDlg::GetRefsThreadEntry(LPVOID pVoid) { - return ((CCommitIsOnRefsDlg*)pVoid)->GetRefsThread(); + return reinterpret_cast(pVoid)->GetRefsThread(); } UINT CCommitIsOnRefsDlg::GetRefsThread() diff --git a/src/TortoiseProc/FileDiffDlg.cpp b/src/TortoiseProc/FileDiffDlg.cpp index aad509307..8c64e80fe 100644 --- a/src/TortoiseProc/FileDiffDlg.cpp +++ b/src/TortoiseProc/FileDiffDlg.cpp @@ -321,7 +321,7 @@ BOOL CFileDiffDlg::OnInitDialog() UINT CFileDiffDlg::DiffThreadEntry(LPVOID pVoid) { - return ((CFileDiffDlg*)pVoid)->DiffThread(); + return reinterpret_cast(pVoid)->DiffThread(); } UINT CFileDiffDlg::DiffThread() @@ -1290,7 +1290,7 @@ int CFileDiffDlg::RevertSelectedItemToVersion(CString rev) while ((index = m_cFileList.GetNextSelectedItem(pos)) >= 0) { CString cmd, out; - CTGitPath *fentry = (CTGitPath *)m_arFilteredList[index]; + CTGitPath* fentry = m_arFilteredList[index]; cmd.Format(_T("git.exe checkout %s -- \"%s\""), (LPCTSTR)rev, (LPCTSTR)fentry->GetGitPathString()); if (g_Git.Run(cmd, &out, CP_UTF8)) { diff --git a/src/TortoiseProc/FileDiffDlg.h b/src/TortoiseProc/FileDiffDlg.h index cc0a0007f..b7b78171c 100644 --- a/src/TortoiseProc/FileDiffDlg.h +++ b/src/TortoiseProc/FileDiffDlg.h @@ -120,7 +120,7 @@ private: static UINT LoadRefThreadEntry(LPVOID pVoid) { - return ((CFileDiffDlg *)pVoid)->LoadRefThread(); + return reinterpret_cast(pVoid)->LoadRefThread(); }; UINT LoadRefThread(); diff --git a/src/TortoiseProc/GitLogCache.cpp b/src/TortoiseProc/GitLogCache.cpp index 7a70af73f..8b8887df9 100644 --- a/src/TortoiseProc/GitLogCache.cpp +++ b/src/TortoiseProc/GitLogCache.cpp @@ -99,10 +99,10 @@ ULONGLONG CLogCache::GetOffset(const CGitHash& hash, SLogCacheIndexFile* pData) if (!pData) return 0; - SLogCacheIndexItem *p=(SLogCacheIndexItem *)bsearch(hash.m_hash,pData->m_Item, + SLogCacheIndexItem* p=reinterpret_cast(bsearch(hash.m_hash, pData->m_Item, pData->m_Header.m_ItemCount, sizeof(SLogCacheIndexItem), - Compare); + Compare)); if(p) return p->m_Offset; @@ -145,7 +145,7 @@ int CLogCache::FetchCacheIndex(CString GitDir) if (!m_pCacheIndex) { - m_pCacheIndex = (SLogCacheIndexFile*)MapViewOfFile(m_IndexFileMap,FILE_MAP_READ,0,0,0); + m_pCacheIndex = reinterpret_cast(MapViewOfFile(m_IndexFileMap, FILE_MAP_READ, 0, 0, 0)); if (!m_pCacheIndex) break; } @@ -192,7 +192,7 @@ int CLogCache::FetchCacheIndex(CString GitDir) break; } - if(!CheckHeader( (SLogCacheDataFileHeader*)m_pCacheData)) + if (!CheckHeader(reinterpret_cast(m_pCacheData))) break; if (m_DataFileLength < sizeof(SLogCacheDataFileHeader) + m_pCacheIndex->m_Header.m_ItemCount * sizeof(SLogCacheDataFileHeader)) @@ -275,8 +275,7 @@ int CLogCache::LoadOneItem(GitRevLoglist& Rev,ULONGLONG offset) if (offset + sizeof(SLogCacheRevItemHeader) > m_DataFileLength) return -2; - SLogCacheRevItemHeader *header; - header = (SLogCacheRevItemHeader *)(this->m_pCacheData + offset); + SLogCacheRevItemHeader* header = reinterpret_cast(m_pCacheData + offset); if( !CheckHeader(header)) return -2; @@ -285,7 +284,7 @@ int CLogCache::LoadOneItem(GitRevLoglist& Rev,ULONGLONG offset) SLogCacheRevFileHeader *fileheader; offset += sizeof(SLogCacheRevItemHeader); - fileheader =(SLogCacheRevFileHeader *)(this->m_pCacheData + offset); + fileheader = reinterpret_cast(m_pCacheData + offset); for (DWORD i = 0; i < header->m_FileCount; ++i) { @@ -329,7 +328,7 @@ int CLogCache::LoadOneItem(GitRevLoglist& Rev,ULONGLONG offset) Rev.m_Files.AddPath(path); offset += sizeof(*fileheader) + fileheader->m_OldFileNameSize*sizeof(TCHAR) + fileheader->m_FileNameSize*sizeof(TCHAR) - sizeof(TCHAR); - fileheader = (SLogCacheRevFileHeader *) (this->m_pCacheData + offset); + fileheader = reinterpret_cast(m_pCacheData + offset); } return 0; } @@ -377,8 +376,7 @@ int CLogCache::SaveCache() SLogCacheIndexFile* pIndex = nullptr; if(this->m_pCacheIndex) { - pIndex = (SLogCacheIndexFile *)malloc(sizeof(SLogCacheIndexFile) - +sizeof(SLogCacheIndexItem) * (m_pCacheIndex->m_Header.m_ItemCount) ); + pIndex = reinterpret_cast(malloc(sizeof(SLogCacheIndexFile) + sizeof(SLogCacheIndexItem) * (m_pCacheIndex->m_Header.m_ItemCount))); if (!pIndex) return -1; @@ -483,7 +481,7 @@ int CLogCache::SaveCache() if(m_IndexFileMap == INVALID_HANDLE_VALUE) break; - m_pCacheIndex = (SLogCacheIndexFile*)MapViewOfFile(m_IndexFileMap,FILE_MAP_WRITE,0,0,0); + m_pCacheIndex = reinterpret_cast(MapViewOfFile(m_IndexFileMap, FILE_MAP_WRITE, 0, 0, 0)); if (!m_pCacheIndex) break; diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h index 58faa82e5..2a6028c33 100644 --- a/src/TortoiseProc/GitLogListBase.h +++ b/src/TortoiseProc/GitLogListBase.h @@ -568,15 +568,16 @@ protected: CWinThread* m_DiffingThread; volatile LONG m_AsyncThreadRunning; - static int DiffAsync(GitRevLoglist* rev, void* data) + static int DiffAsync(GitRevLoglist* rev, void* pdata) { - ULONGLONG offset=((CGitLogListBase*)data)->m_LogCache.GetOffset(rev->m_CommitHash); - if (!offset || ((CGitLogListBase*)data)->m_LogCache.LoadOneItem(*rev, offset)) + auto data = reinterpret_cast(pdata); + ULONGLONG offset = data->m_LogCache.GetOffset(rev->m_CommitHash); + if (!offset || data->m_LogCache.LoadOneItem(*rev, offset)) { - ((CGitLogListBase*)data)->m_AsynDiffListLock.Lock(); - ((CGitLogListBase*)data)->m_AsynDiffList.push_back(rev); - ((CGitLogListBase*)data)->m_AsynDiffListLock.Unlock(); - ::SetEvent(((CGitLogListBase*)data)->m_AsyncDiffEvent); + data->m_AsynDiffListLock.Lock(); + data->m_AsynDiffList.push_back(rev); + data->m_AsynDiffListLock.Unlock(); + ::SetEvent(data->m_AsyncDiffEvent); return 0; } @@ -585,15 +586,15 @@ protected: return 0; InterlockedExchange(&rev->m_IsFull, TRUE); // we might need to signal that the changed files are now available - if (((CGitLogListBase*)data)->GetSelectedCount() == 1) + if (data->GetSelectedCount() == 1) { - POSITION pos = ((CGitLogListBase*)data)->GetFirstSelectedItemPosition(); - int nItem = ((CGitLogListBase*)data)->GetNextSelectedItem(pos); + POSITION pos = data->GetFirstSelectedItemPosition(); + int nItem = data->GetNextSelectedItem(pos); if (nItem >= 0) { - GitRevLoglist* data2 = (GitRevLoglist*)((CGitLogListBase*)data)->m_arShownList.SafeGetAt(nItem); + GitRevLoglist* data2 = data->m_arShownList.SafeGetAt(nItem); if (data2 && data2->m_CommitHash == rev->m_CommitHash) - ((CGitLogListBase*)data)->GetParent()->PostMessage(WM_COMMAND, MSG_FETCHED_DIFF, 0); + data->GetParent()->PostMessage(WM_COMMAND, MSG_FETCHED_DIFF, 0); } } return 0; @@ -601,7 +602,7 @@ protected: static UINT AsyncThread(LPVOID data) { - return ((CGitLogListBase*)data)->AsyncDiffThread(); + return reinterpret_cast(data)->AsyncDiffThread(); } int AsyncDiffThread(); diff --git a/src/TortoiseProc/GitProgressList.cpp b/src/TortoiseProc/GitProgressList.cpp index 6351d9434..d1e2d350b 100644 --- a/src/TortoiseProc/GitProgressList.cpp +++ b/src/TortoiseProc/GitProgressList.cpp @@ -440,7 +440,7 @@ void CGitProgressList::ReportString(CString sMessage, const CString& sMsgKind, C UINT CGitProgressList::ProgressThreadEntry(LPVOID pVoid) { - return ((CGitProgressList*)pVoid)->ProgressThread(); + return reinterpret_cast(pVoid)->ProgressThread(); } UINT CGitProgressList::ProgressThread() diff --git a/src/TortoiseProc/GravatarPictureBox.cpp b/src/TortoiseProc/GravatarPictureBox.cpp index 9b2651a10..bd1c24cdf 100644 --- a/src/TortoiseProc/GravatarPictureBox.cpp +++ b/src/TortoiseProc/GravatarPictureBox.cpp @@ -93,7 +93,7 @@ void CGravatar::Init() if (m_gravatarThread == nullptr) { m_gravatarExit = new bool(false); - m_gravatarThread = AfxBeginThread([] (LPVOID lpVoid) -> UINT { ((CGravatar *)lpVoid)->GravatarThread(); return 0; }, this, THREAD_PRIORITY_BELOW_NORMAL); + m_gravatarThread = AfxBeginThread([](LPVOID lpVoid) -> UINT { reinterpret_cast(lpVoid)->GravatarThread(); return 0; }, this, THREAD_PRIORITY_BELOW_NORMAL); if (m_gravatarThread == nullptr) { CMessageBox::Show(GetSafeHwnd(), IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR); diff --git a/src/TortoiseProc/ImportPatchDlg.h b/src/TortoiseProc/ImportPatchDlg.h index 07e0bae58..1dfa1399f 100644 --- a/src/TortoiseProc/ImportPatchDlg.h +++ b/src/TortoiseProc/ImportPatchDlg.h @@ -54,7 +54,7 @@ protected: static UINT ThreadEntry(LPVOID pVoid) { - return ((CImportPatchDlg*)pVoid)->PatchThread(); + return reinterpret_cast(pVoid)->PatchThread(); } UINT PatchThread(); diff --git a/src/TortoiseProc/ProgressDlg.cpp b/src/TortoiseProc/ProgressDlg.cpp index d509ba138..16410b562 100644 --- a/src/TortoiseProc/ProgressDlg.cpp +++ b/src/TortoiseProc/ProgressDlg.cpp @@ -187,7 +187,7 @@ redo: UINT CProgressDlg::ProgressThreadEntry(LPVOID pVoid) { - return ((CProgressDlg*)pVoid)->ProgressThread(); + return reinterpret_cast(pVoid)->ProgressThread(); } //static function, Share with SyncDialog diff --git a/src/TortoiseProc/RebaseDlg.h b/src/TortoiseProc/RebaseDlg.h index e1970b1fd..3fac02123 100644 --- a/src/TortoiseProc/RebaseDlg.h +++ b/src/TortoiseProc/RebaseDlg.h @@ -102,7 +102,7 @@ protected: void Refresh(); volatile LONG m_bThreadRunning; int RebaseThread(); - static UINT RebaseThreadEntry(LPVOID pVoid){return ((CRebaseDlg *)pVoid)->RebaseThread();}; + static UINT RebaseThreadEntry(LPVOID pVoid) { return reinterpret_cast(pVoid)->RebaseThread(); }; BOOL IsEnd(); int IsCommitEmpty(const CGitHash& hash); diff --git a/src/TortoiseProc/RepositoryBrowser.cpp b/src/TortoiseProc/RepositoryBrowser.cpp index 3a3d47e56..4c65e6633 100644 --- a/src/TortoiseProc/RepositoryBrowser.cpp +++ b/src/TortoiseProc/RepositoryBrowser.cpp @@ -74,13 +74,13 @@ public: static int CALLBACK StaticCompare(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { - return ((CRepoListCompareFunc *) lParamSort)->Compare(lParam1, lParam2); + return reinterpret_cast(lParamSort)->Compare(lParam1, lParam2); } int Compare(LPARAM lParam1, LPARAM lParam2) { - CShadowFilesTree * pLeft = (CShadowFilesTree *)m_pList->GetItemData((int)lParam1); - CShadowFilesTree * pRight = (CShadowFilesTree *)m_pList->GetItemData((int)lParam2); + auto pLeft = reinterpret_cast(m_pList->GetItemData((int)lParam1)); + auto pRight = reinterpret_cast(m_pList->GetItemData((int)lParam2)); int result = 0; switch(m_col) diff --git a/src/TortoiseProc/ResolveDlg.cpp b/src/TortoiseProc/ResolveDlg.cpp index 1538eb510..9e6f597b4 100644 --- a/src/TortoiseProc/ResolveDlg.cpp +++ b/src/TortoiseProc/ResolveDlg.cpp @@ -129,7 +129,7 @@ void CResolveDlg::OnBnClickedSelectall() UINT CResolveDlg::ResolveThreadEntry(LPVOID pVoid) { - return ((CResolveDlg*)pVoid)->ResolveThread(); + return reinterpret_cast(pVoid)->ResolveThread(); } UINT CResolveDlg::ResolveThread() { diff --git a/src/TortoiseProc/RevertDlg.cpp b/src/TortoiseProc/RevertDlg.cpp index 117562672..890cc0985 100644 --- a/src/TortoiseProc/RevertDlg.cpp +++ b/src/TortoiseProc/RevertDlg.cpp @@ -101,7 +101,7 @@ BOOL CRevertDlg::OnInitDialog() UINT CRevertDlg::RevertThreadEntry(LPVOID pVoid) { - return ((CRevertDlg*)pVoid)->RevertThread(); + return reinterpret_cast(pVoid)->RevertThread(); } UINT CRevertDlg::RevertThread() diff --git a/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp b/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp index 5550607bb..36e6b0002 100644 --- a/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp +++ b/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp @@ -704,7 +704,7 @@ void CRevisionGraphWnd::OnLButtonUp(UINT nFlags, CPoint point) fact = fZoomfactor/m_fZoomFactor; } - CRevisionGraphDlg * pDlg = (CRevisionGraphDlg*)GetParent(); + auto pDlg = static_cast(GetParent()); if (pDlg) { m_fZoomFactor = fZoomfactor; diff --git a/src/TortoiseProc/Settings/SetBugTraq.cpp b/src/TortoiseProc/Settings/SetBugTraq.cpp index 4f8951ab4..7659b02ac 100644 --- a/src/TortoiseProc/Settings/SetBugTraq.cpp +++ b/src/TortoiseProc/Settings/SetBugTraq.cpp @@ -125,7 +125,7 @@ void CSetBugTraq::OnBnClickedEditbutton() if (index == -1) return; - CBugTraqAssociation *assoc = (CBugTraqAssociation *)m_cBugTraqList.GetItemData(index); + auto assoc = reinterpret_cast(m_cBugTraqList.GetItemData(index)); if (!assoc) return; @@ -182,7 +182,7 @@ void CSetBugTraq::OnBnClickedBugTraqcopybutton() if (index == -1) return; - CBugTraqAssociation *assoc = (CBugTraqAssociation *)m_cBugTraqList.GetItemData(index); + auto assoc = reinterpret_cast(m_cBugTraqList.GetItemData(index)); if (!assoc) return; diff --git a/src/TortoiseProc/Settings/SettingGitRemote.cpp b/src/TortoiseProc/Settings/SettingGitRemote.cpp index 18695f96a..8a3108489 100644 --- a/src/TortoiseProc/Settings/SettingGitRemote.cpp +++ b/src/TortoiseProc/Settings/SettingGitRemote.cpp @@ -197,7 +197,7 @@ struct CheckRefspecStruct static int CheckRemoteCollideWithRefspec(const git_config_entry *entry, void * payload) { - auto crs = (CheckRefspecStruct *)payload; + auto crs = reinterpret_cast(payload); crs->result = false; if (entry->name == "remote." + crs->remote + ".fetch") return 0; diff --git a/src/TortoiseProc/StatGraphDlg.cpp b/src/TortoiseProc/StatGraphDlg.cpp index b4ff21bfd..d6533f700 100644 --- a/src/TortoiseProc/StatGraphDlg.cpp +++ b/src/TortoiseProc/StatGraphDlg.cpp @@ -761,7 +761,7 @@ int CStatGraphDlg::GatherData(BOOL fetchdiff, BOOL keepFetchedData) struct payload_struct { GitRev* rev; const char *authorName; }; payload_struct payload = { pLogEntry, nullptr }; const char *author1 = git_get_mailmap_author(mailmap, email2A, &payload, - [] (void *payload) -> const char * { return ((payload_struct *)payload)->authorName = _strdup(CUnicodeUtils::GetUTF8(((payload_struct *)payload)->rev->GetAuthorName())); }); + [](void* payload) -> const char* { return reinterpret_cast(payload)->authorName = _strdup(CUnicodeUtils::GetUTF8(reinterpret_cast(payload)->rev->GetAuthorName())); }); free((void *)payload.authorName); if (author1) strAuthor = CUnicodeUtils::GetUnicode(author1); diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp index 8b7fb0624..400d6ec6b 100644 --- a/src/TortoiseProc/SyncDlg.cpp +++ b/src/TortoiseProc/SyncDlg.cpp @@ -343,7 +343,7 @@ void CSyncDlg::OnBnClickedButtonPull() refspec.Format(_T("refs/heads/%s:refs/remotes/%s/%s"), (LPCTSTR)m_strRemoteBranch, (LPCTSTR)m_strURL, (LPCTSTR)m_strRemoteBranch); progressCommand = std::make_unique(); - FetchProgressCommand* fetchProgressCommand = reinterpret_cast(progressCommand.get()); + FetchProgressCommand* fetchProgressCommand = static_cast(progressCommand.get()); fetchProgressCommand->SetUrl(m_strURL); fetchProgressCommand->SetRefSpec(refspec); m_GitProgressList.SetCommand(progressCommand.get()); diff --git a/src/TortoiseProc/SyncDlg.h b/src/TortoiseProc/SyncDlg.h index e17248b1b..bb8b1a595 100644 --- a/src/TortoiseProc/SyncDlg.h +++ b/src/TortoiseProc/SyncDlg.h @@ -201,7 +201,7 @@ public: int m_seq; protected: - static UINT ProgressThreadEntry(LPVOID pVoid){ return ((CSyncDlg*)pVoid) ->ProgressThread(); }; + static UINT ProgressThreadEntry(LPVOID pVoid) { return reinterpret_cast(pVoid)->ProgressThread(); }; UINT ProgressThread(); CHistoryCombo m_ctrlURL; diff --git a/src/TortoiseShell/GITPropertyPage.cpp b/src/TortoiseShell/GITPropertyPage.cpp index a633f6b7a..60da84613 100644 --- a/src/TortoiseShell/GITPropertyPage.cpp +++ b/src/TortoiseShell/GITPropertyPage.cpp @@ -48,7 +48,7 @@ BOOL CALLBACK PageProc (HWND hwnd, UINT uMessage, WPARAM wParam, LPARAM lParam) sheetpage->SetHwnd(hwnd); } else - sheetpage = (CGitPropertyPage*) GetWindowLongPtr (hwnd, GWLP_USERDATA); + sheetpage = reinterpret_cast(GetWindowLongPtr(hwnd, GWLP_USERDATA)); if (sheetpage) return sheetpage->PageProc(hwnd, uMessage, wParam, lParam); @@ -61,8 +61,7 @@ UINT CALLBACK PropPageCallbackProc ( HWND /*hwnd*/, UINT uMsg, LPPROPSHEETPAGE p // Delete the page before closing. if (PSPCB_RELEASE == uMsg) { - CGitPropertyPage* sheetpage = (CGitPropertyPage*) ppsp->lParam; - delete sheetpage; + delete reinterpret_cast(ppsp->lParam); } return 1; } @@ -348,7 +347,7 @@ struct TreewalkStruct static int TreewalkCB_FindFileRecentCommit(const char *root, const git_tree_entry *entry, void *payload) { - TreewalkStruct *treewalkstruct = (TreewalkStruct *)payload; + auto treewalkstruct = reinterpret_cast(payload); char folder[MAX_PATH] = {0}; strcpy_s(folder, root); strcat_s(folder, git_tree_entry_name(entry)); @@ -508,7 +507,7 @@ int CGitPropertyPage::LogThread() CAutoCommit commit(FindFileRecentCommit(repository, relatepath.GetGitPathString())); if (commit) { - SendMessage(m_hwnd, m_UpdateLastCommit, NULL, (LPARAM)(git_commit*)commit); + SendMessage(m_hwnd, m_UpdateLastCommit, NULL, reinterpret_cast(static_cast(commit))); } else { @@ -520,7 +519,7 @@ int CGitPropertyPage::LogThread() void CGitPropertyPage::LogThreadEntry(void *param) { - ((CGitPropertyPage*)param)->LogThread(); + reinterpret_cast(param)->LogThread(); } void CGitPropertyPage::InitWorkfileView() diff --git a/src/TortoiseShell/ShellExt.cpp b/src/TortoiseShell/ShellExt.cpp index 1e6898235..7d6f88497 100644 --- a/src/TortoiseShell/ShellExt.cpp +++ b/src/TortoiseShell/ShellExt.cpp @@ -134,7 +134,7 @@ void LoadLangDll() &lpFixedPointer, &nFixedLength)) { - TRANSARRAY* lpTransArray = (TRANSARRAY*)lpFixedPointer; + auto lpTransArray = reinterpret_cast(lpFixedPointer); TCHAR strLangProductVersion[MAX_PATH] = { 0 }; _stprintf_s(strLangProductVersion, _T("\\StringFileInfo\\%04x%04x\\ProductVersion"), diff --git a/src/Utils/MiscUI/BaseDialog.cpp b/src/Utils/MiscUI/BaseDialog.cpp index 95ddfa2af..38e1a9b7d 100644 --- a/src/Utils/MiscUI/BaseDialog.cpp +++ b/src/Utils/MiscUI/BaseDialog.cpp @@ -1,5 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control +// Copyright (C) 2016 - TortoiseGit // Copyright (C) 2003-2007 - Stefan Kueng // This program is free software; you can redistribute it and/or @@ -63,7 +64,7 @@ INT_PTR CALLBACK CDialog::stDlgFunc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR { // get the pointer to the window from lpCreateParams SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); - pWnd = (CDialog*)lParam; + pWnd = reinterpret_cast(lParam); pWnd->m_hwnd = hwndDlg; } // get the pointer to the window diff --git a/src/Utils/MiscUI/BaseDialog.h b/src/Utils/MiscUI/BaseDialog.h index febbd7a70..7d5a3fabb 100644 --- a/src/Utils/MiscUI/BaseDialog.h +++ b/src/Utils/MiscUI/BaseDialog.h @@ -1,5 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control +// Copyright (C) 2016 - TortoiseGit // Copyright (C) 2003-2007, 2010, 2012-2014 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -47,7 +48,7 @@ protected: // returns a pointer the dialog (stored as the WindowLong) inline static CDialog * GetObjectFromWindow(HWND hWnd) { - return (CDialog *)GetWindowLongPtr(hWnd, GWLP_USERDATA); + return reinterpret_cast(GetWindowLongPtr(hWnd, GWLP_USERDATA)); } }; diff --git a/src/Utils/MiscUI/BaseWindow.h b/src/Utils/MiscUI/BaseWindow.h index 529a9cabd..98ce91b7a 100644 --- a/src/Utils/MiscUI/BaseWindow.h +++ b/src/Utils/MiscUI/BaseWindow.h @@ -1,5 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control +// Copyright (C) 2016 - TortoiseGit // Copyright (C) 2003-2007, 2010, 2013-2015 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -99,6 +100,6 @@ protected: // returns a pointer the window (stored as the WindowLong) inline static CWindow * GetObjectFromWindow(HWND hWnd) { - return (CWindow *)GetWindowLongPtr(hWnd, GWLP_USERDATA); + return reinterpret_cast(GetWindowLongPtr(hWnd, GWLP_USERDATA)); } }; diff --git a/src/Utils/MiscUI/hyperlink_base.cpp b/src/Utils/MiscUI/hyperlink_base.cpp index a1a9df9e6..e67c41113 100644 --- a/src/Utils/MiscUI/hyperlink_base.cpp +++ b/src/Utils/MiscUI/hyperlink_base.cpp @@ -183,8 +183,7 @@ LRESULT CALLBACK CHyperLink::_HyperlinkParentProc(HWND hwnd, UINT message, { HDC hdc = (HDC) wParam; HWND hwndCtl = (HWND) lParam; - CHyperLink *pHyperLink = (CHyperLink *)GetProp(hwndCtl, - PROP_OBJECT_PTR); + auto pHyperLink = reinterpret_cast(GetProp(hwndCtl, PROP_OBJECT_PTR)); if(pHyperLink) { @@ -266,7 +265,7 @@ inline void CHyperLink::DrawFocusRect(HWND hwnd) LRESULT CALLBACK CHyperLink::_HyperlinkProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - CHyperLink *pHyperLink = (CHyperLink *)GetProp(hwnd, PROP_OBJECT_PTR); + auto pHyperLink = reinterpret_cast(GetProp(hwnd, PROP_OBJECT_PTR)); switch (message) { diff --git a/src/Utils/PathWatcher.cpp b/src/Utils/PathWatcher.cpp index fc55fbf14..e9aec6307 100644 --- a/src/Utils/PathWatcher.cpp +++ b/src/Utils/PathWatcher.cpp @@ -179,7 +179,7 @@ bool CPathWatcher::AddPath(const CTGitPath& path) unsigned int CPathWatcher::ThreadEntry(void* pContext) { - ((CPathWatcher*)pContext)->WorkerThread(); + reinterpret_cast(pContext)->WorkerThread(); return 0; } diff --git a/src/Utils/UnicodeUtils.cpp b/src/Utils/UnicodeUtils.cpp index 5cf51c9bd..13541875e 100644 --- a/src/Utils/UnicodeUtils.cpp +++ b/src/Utils/UnicodeUtils.cpp @@ -413,12 +413,12 @@ int LoadStringEx(HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax, return 0; nResourceSize = ::SizeofResource(hInstance, hResource); - pImageEnd = (const STRINGRESOURCEIMAGE*)(LPBYTE(pImage)+nResourceSize); + pImageEnd = reinterpret_cast(LPBYTE(pImage) + nResourceSize); iIndex = uID&0x000f; while ((iIndex > 0) && (pImage < pImageEnd)) { - pImage = (const STRINGRESOURCEIMAGE*)(LPBYTE(pImage)+(sizeof(STRINGRESOURCEIMAGE)+(pImage->nLength*sizeof(WCHAR)))); + pImage = reinterpret_cast(LPBYTE(pImage) + (sizeof(STRINGRESOURCEIMAGE) + (pImage->nLength * sizeof(WCHAR)))); iIndex--; } if (pImage >= pImageEnd) -- 2.11.4.GIT