From ed7214754101e0faa93fdcc473f3c5876acf7a8a Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 12 Dec 2016 17:15:57 +0100 Subject: [PATCH] Remove unused variables Based on TortoiseSVN rev. 27606. Signed-off-by: Sven Strickroth --- src/Git/GitStatusListCtrl.cpp | 1 - src/Git/GitStatusListCtrl.h | 1 - src/TortoiseMerge/MainFrm.cpp | 1 - src/TortoiseProc/ChangedDlg.cpp | 1 - src/TortoiseProc/FileDiffDlg.cpp | 2 +- src/TortoiseProc/GitProgressList.cpp | 1 - src/TortoiseProc/LogFile.cpp | 1 - src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp | 1 - src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp | 1 - src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp | 1 - 10 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp index 9125eeb51..c1b69f228 100644 --- a/src/Git/GitStatusListCtrl.cpp +++ b/src/Git/GitStatusListCtrl.cpp @@ -234,7 +234,6 @@ CGitStatusListCtrl::CGitStatusListCtrl() : CResizableColumnsListCtrl( , m_bAscending(false) , m_nSortedColumn(-1) , m_bHasExternalsFromDifferentRepos(false) - , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE)) , m_amend(false) , m_bDoNotAutoselectSubmodules(false) , m_bNoAutoselectMissing(false) diff --git a/src/Git/GitStatusListCtrl.h b/src/Git/GitStatusListCtrl.h index 16a24264a..bfdde8517 100644 --- a/src/Git/GitStatusListCtrl.h +++ b/src/Git/GitStatusListCtrl.h @@ -852,7 +852,6 @@ private: CString m_sEmpty; CString m_sBusy; - CString m_sNoPropValueText; bool m_bCheckChildrenWithParent; std::unique_ptr m_pDropTarget; diff --git a/src/TortoiseMerge/MainFrm.cpp b/src/TortoiseMerge/MainFrm.cpp index a9b6d913f..c34ca115a 100644 --- a/src/TortoiseMerge/MainFrm.cpp +++ b/src/TortoiseMerge/MainFrm.cpp @@ -585,7 +585,6 @@ BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT /*lpcs*/, CCreateContext* pContex // Callback function BOOL CMainFrame::PatchFile(CString sFilePath, bool /*bContentMods*/, bool bPropMods, CString sVersion, BOOL bAutoPatch) { - CString sDummy; //"dry run" was successful, so save the patched file somewhere... CString sTempFile = CTempFiles::Instance().GetTempFilePathString(); CString sRejectedFile, sBasePath; diff --git a/src/TortoiseProc/ChangedDlg.cpp b/src/TortoiseProc/ChangedDlg.cpp index 71afa435c..80dddfc0b 100644 --- a/src/TortoiseProc/ChangedDlg.cpp +++ b/src/TortoiseProc/ChangedDlg.cpp @@ -150,7 +150,6 @@ UINT CChangedDlg::ChangedStatusThread() DialogEnableWindow(IDC_SHOWUNMODIFIED, FALSE); DialogEnableWindow(IDC_SHOWIGNORED, FALSE); DialogEnableWindow(IDC_SHOWLOCALCHANGESIGNORED, FALSE); - CString temp; m_FileListCtrl.StoreScrollPos(); m_FileListCtrl.Clear(); if (!m_FileListCtrl.GetStatus(m_bWholeProject ? nullptr : &m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUnversioned != FALSE, m_bShowLocalChangesIgnored != FALSE)) diff --git a/src/TortoiseProc/FileDiffDlg.cpp b/src/TortoiseProc/FileDiffDlg.cpp index 933d6c81f..d9c3e85e8 100644 --- a/src/TortoiseProc/FileDiffDlg.cpp +++ b/src/TortoiseProc/FileDiffDlg.cpp @@ -671,7 +671,6 @@ void CFileDiffDlg::OnContextMenu(CWnd* pWnd, CPoint point) { if (m_cFileList.GetSelectedCount() > 0) { - CString temp; CTGitPath savePath; CString pathSave; if (!CAppUtils::FileOpenSave(pathSave, nullptr, IDS_FILEDIFF_POPSAVELIST, IDS_TEXTFILEFILTER, false, m_hWnd, L"txt")) @@ -682,6 +681,7 @@ void CFileDiffDlg::OnContextMenu(CWnd* pWnd, CPoint point) try { CStdioFile file(savePath.GetWinPathString(), CFile::typeBinary | CFile::modeReadWrite | CFile::modeCreate); + CString temp; if (m_path1.IsEmpty() && m_path2.IsEmpty()) temp.Format(IDS_FILEDIFF_CHANGEDLISTINTROROOT, (LPCTSTR)m_rev1.m_CommitHash.ToString(), (LPCTSTR)m_rev2.m_CommitHash.ToString()); else diff --git a/src/TortoiseProc/GitProgressList.cpp b/src/TortoiseProc/GitProgressList.cpp index 45d1bfba6..531c2875a 100644 --- a/src/TortoiseProc/GitProgressList.cpp +++ b/src/TortoiseProc/GitProgressList.cpp @@ -183,7 +183,6 @@ CString CGitProgressList::BuildInfoString() #if 0 - CString temp; int added = 0; int copied = 0; int deleted = 0; diff --git a/src/TortoiseProc/LogFile.cpp b/src/TortoiseProc/LogFile.cpp index 8cb6e7c45..5ff4c2b12 100644 --- a/src/TortoiseProc/LogFile.cpp +++ b/src/TortoiseProc/LogFile.cpp @@ -91,7 +91,6 @@ bool CLogFile::Close() AdjustSize(); try { - CString strLine; CStdioFile file; int retrycounter = 10; diff --git a/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp b/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp index d6cf612a6..d0e37dc1c 100644 --- a/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp +++ b/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp @@ -712,7 +712,6 @@ void CRevisionGraphDlg::OnChangeZoom() { if (!IsWindow(m_Graph.GetSafeHwnd())) return; - CString strText; CString strItem; CComboBoxEx* pCBox = (CComboBoxEx*)m_ToolBar.GetDlgItem(ID_REVGRAPH_ZOOMCOMBO); pCBox->GetWindowText(strItem); diff --git a/src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp b/src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp index 40a928d67..99f7e5374 100644 --- a/src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp +++ b/src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp @@ -1250,7 +1250,6 @@ void CRevisionGraphWnd::DrawGraph(GraphicsDevice& graphics, const CRect& rect, i graphics.pDC->DrawEdge(&m_OverviewRect, EDGE_BUMP, BF_RECT); // now draw a rectangle where the current view is located in the overview - CRect viewRect = GetViewRect(); LONG width = (long)(rect.Width() * m_previewZoom / m_fZoomFactor); LONG height = (long)(rect.Height() * m_previewZoom / m_fZoomFactor); LONG xpos = (long)(nHScrollPos * m_previewZoom / m_fZoomFactor); diff --git a/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp b/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp index 40a4bf23a..a8ebc7f10 100644 --- a/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp +++ b/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp @@ -1591,7 +1591,6 @@ void CRevisionGraphWnd::OnMouseMove(UINT nFlags, CPoint point) if (m_bShowOverview && (m_OverviewRect.PtInRect(point))&&(nFlags & MK_LBUTTON)) { // scrolling - CRect viewRect = GetViewRect(); int x = (int)((point.x-m_OverviewRect.left - (m_OverviewPosRect.Width()/2)) / m_previewZoom * m_fZoomFactor); int y = (int)((point.y - m_OverviewRect.top - (m_OverviewPosRect.Height()/2)) / m_previewZoom * m_fZoomFactor); x = max(0, x); -- 2.11.4.GIT