From 693587c1a108e54702d9dd7699a732c469dc4452 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 9 Aug 2015 14:45:36 +0200 Subject: [PATCH] Drop unused code Signed-off-by: Sven Strickroth --- src/TortoiseGitBlame/TortoiseGitBlame.vcxproj | 1 - .../TortoiseGitBlame.vcxproj.filters | 3 - src/TortoiseProc/GitLogListBase.cpp | 7 --- src/TortoiseProc/GitLogListBase.h | 1 - src/TortoiseProc/LogDlg.cpp | 2 - src/TortoiseProc/LogDlgHelper.cpp | 71 ---------------------- src/TortoiseProc/LogDlgHelper.h | 11 ---- src/TortoiseProc/TortoiseProc.vcxproj | 1 - src/TortoiseProc/TortoiseProc.vcxproj.filters | 3 - 9 files changed, 100 deletions(-) delete mode 100644 src/TortoiseProc/LogDlgHelper.cpp diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj b/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj index 9bf3fdcf8..83cf7c76b 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj +++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj @@ -88,7 +88,6 @@ - diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj.filters b/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj.filters index ebf9e32a9..a74553951 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj.filters +++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj.filters @@ -150,9 +150,6 @@ TortoiseGitProc - - TortoiseGitProc - TortoiseGitProc diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index f9d558295..92c8809b9 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -49,7 +49,6 @@ CGitLogListBase::CGitLogListBase():CHintListCtrl() ,m_bNoDispUpdates(FALSE) , m_bThreadRunning(FALSE) , m_bStrictStopped(false) - , m_pStoreSelection(NULL) , m_SelectedFilters(LOGFILTER_ALL) , m_ShowFilter(FILTERSHOW_ALL) , m_bShowWC(false) @@ -288,12 +287,6 @@ CGitLogListBase::~CGitLogListBase() if (m_boldItalicsFont) DeleteObject(m_boldItalicsFont); - if ( m_pStoreSelection ) - { - delete m_pStoreSelection; - m_pStoreSelection = NULL; - } - SafeTerminateThread(); SafeTerminateAsyncDiffThread(); diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h index 0f403c360..81ebe5c86 100644 --- a/src/TortoiseProc/GitLogListBase.h +++ b/src/TortoiseProc/GitLogListBase.h @@ -605,7 +605,6 @@ protected: CRegDWORD m_regMaxBugIDColWidth; void *m_ProcData; - CStoreSelection* m_pStoreSelection; CColors m_Colors; diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index cd14ed52a..c967e8de7 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -2235,7 +2235,6 @@ LRESULT CLogDlg::OnClickedCancelFilter(WPARAM wParam, LPARAM /*lParam*/) m_LogList.m_sFilterText.Empty(); UpdateData(FALSE); theApp.DoWaitCursor(1); - CStoreSelection storeselection(this); FillLogMessageCtrl(false); m_LogList.RemoveFilter(); @@ -3012,7 +3011,6 @@ void CLogDlg::OnEnChangeSearchedit() UpdateData(); if (!m_LogList.HasFilterText()) { - CStoreSelection storeselection(this); // clear the filter, i.e. make all entries appear theApp.DoWaitCursor(1); KillTimer(LOGFILTER_TIMER); diff --git a/src/TortoiseProc/LogDlgHelper.cpp b/src/TortoiseProc/LogDlgHelper.cpp deleted file mode 100644 index db07acf2f..000000000 --- a/src/TortoiseProc/LogDlgHelper.cpp +++ /dev/null @@ -1,71 +0,0 @@ -// TortoiseGit - a Windows shell extension for easy version control - -// Copyright (C) 2003-2007 - TortoiseSVN -// Copyright (C) 2008-2013 - TortoiseGit - -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software Foundation, -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -#include "stdafx.h" -#include "LogDlgHelper.h" -#include "LogDlg.h" - -CStoreSelection::CStoreSelection(CLogDlg* /* dlg */) - : m_logdlg(NULL) -{ -#if 0 - m_logdlg = dlg; - - int selIndex = m_logdlg->m_LogList.GetSelectionMark(); - if ( selIndex>=0 ) - { - POSITION pos = m_logdlg->m_LogList.GetFirstSelectedItemPosition(); - int nIndex = m_logdlg->m_LogList.GetNextSelectedItem(pos); - if ( nIndex!=-1 && nIndex < m_logdlg->m_arShownList.GetSize() ) - { - PLOGENTRYDATA pLogEntry = reinterpret_cast(m_logdlg->m_arShownList.GetAt(nIndex)); - m_SetSelectedRevisions.insert(pLogEntry->Rev); - while (pos) - { - nIndex = m_logdlg->m_LogList.GetNextSelectedItem(pos); - if ( nIndex!=-1 && nIndex < m_logdlg->m_arShownList.GetSize() ) - { - pLogEntry = reinterpret_cast(m_logdlg->m_arShownList.GetAt(nIndex)); - m_SetSelectedRevisions.insert(pLogEntry->Rev); - } - } - } - } -#endif -} - -CStoreSelection::~CStoreSelection() -{ -#if 0 - if ( m_SetSelectedRevisions.size()>0 ) - { - for (int i=0; im_arShownList.GetCount(); ++i) - { - LONG nRevision = reinterpret_cast(m_logdlg->m_arShownList.GetAt(i))->Rev; - if ( m_SetSelectedRevisions.find(nRevision)!=m_SetSelectedRevisions.end() ) - { - m_logdlg->m_LogList.SetSelectionMark(i); - m_logdlg->m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED); - m_logdlg->m_LogList.EnsureVisible(i, FALSE); - } - } - } -#endif -} - diff --git a/src/TortoiseProc/LogDlgHelper.h b/src/TortoiseProc/LogDlgHelper.h index 624955ca1..5fa33ab69 100644 --- a/src/TortoiseProc/LogDlgHelper.h +++ b/src/TortoiseProc/LogDlgHelper.h @@ -35,17 +35,6 @@ class CLogDlg; */ typedef std::map MAP_HASH_REV; -class CStoreSelection -{ -public: - CStoreSelection(CLogDlg* dlg); - ~CStoreSelection(); -protected: - CLogDlg* m_logdlg; - std::set m_SetSelectedRevisions; -}; - - /** * \ingroup TortoiseProc * Helper class for the log dialog, handles all the log entries, including diff --git a/src/TortoiseProc/TortoiseProc.vcxproj b/src/TortoiseProc/TortoiseProc.vcxproj index 80f806691..9a01d4f3a 100644 --- a/src/TortoiseProc/TortoiseProc.vcxproj +++ b/src/TortoiseProc/TortoiseProc.vcxproj @@ -168,7 +168,6 @@ - diff --git a/src/TortoiseProc/TortoiseProc.vcxproj.filters b/src/TortoiseProc/TortoiseProc.vcxproj.filters index 7e8774a5c..e22bcb70d 100644 --- a/src/TortoiseProc/TortoiseProc.vcxproj.filters +++ b/src/TortoiseProc/TortoiseProc.vcxproj.filters @@ -245,9 +245,6 @@ Commands\Log - - Commands\Log - Commands\Log -- 2.11.4.GIT