From 110bd6d46dfebc7167b24b2cdc61de19f4bbacf9 Mon Sep 17 00:00:00 2001
From: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Date: Thu, 4 Jun 2015 22:23:19 +0800
Subject: [PATCH] Refactored: Replace CGitLogListBase::m_From/m_To with the
 member variable of CFilterData

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
---
 src/TortoiseProc/GitLogListBase.cpp | 15 ++++-----------
 src/TortoiseProc/GitLogListBase.h   |  5 +----
 src/TortoiseProc/LogDlg.cpp         | 12 ++++++------
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index 3a1212c0a..ddffa39bc 100644
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -95,9 +95,6 @@ CGitLogListBase::CGitLogListBase():CHintListCtrl()
 	m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), FALSE);
 	m_bFilterCaseSensitively = !!CRegDWORD(_T("Software\\TortoiseGit\\FilterCaseSensitively"), FALSE);
 
-	m_From = -1;
-	m_To = -1;
-
 	m_ShowMask = 0;
 	m_LoadingThread = NULL;
 
@@ -2659,10 +2656,6 @@ int CGitLogListBase::BeginFetchLog()
 	if (m_sRange.IsEmpty())
 		m_sRange = _T("HEAD");
 
-	CFilterData data;
-	data.m_From = m_From;
-	data.m_To =m_To;
-
 #if 0 /* use tortoiegit filter */
 	if (this->m_nSelectedFilter == LOGFILTER_ALL || m_nSelectedFilter == LOGFILTER_AUTHORS)
 		data.m_Author = this->m_sFilterText;
@@ -2680,7 +2673,7 @@ int CGitLogListBase::BeginFetchLog()
 	if (mask & CGit::LOG_INFO_FOLLOW)
 		mask &= ~CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_LOCAL_BRANCHES;
 
-	CString cmd = g_Git.GetLogCmd(m_sRange, path, -1, mask, true, &data);
+	CString cmd = g_Git.GetLogCmd(m_sRange, path, -1, mask, true, &m_Filter);
 
 	//this->m_logEntries.ParserFromLog();
 	if(IsInWorkingThread())
@@ -2715,7 +2708,7 @@ int CGitLogListBase::BeginFetchLog()
 		if (list.size() == 0)
 			return 0;
 
-		cmd = g_Git.GetLogCmd(list[0], path, -1, mask, true, &data);
+		cmd = g_Git.GetLogCmd(list[0], path, -1, mask, true, &m_Filter);
 	}
 
 	g_Git.m_critGitDllSec.Lock();
@@ -3130,8 +3123,8 @@ void CGitLogListBase::Refresh(BOOL IsCleanFilter)
 		if(IsCleanFilter)
 		{
 			m_sFilterText.Empty();
-			m_From=-1;
-			m_To=-1;
+			m_Filter.m_From = -1;
+			m_Filter.m_To = -1;
 		}
 
 		InterlockedExchange(&m_bExitThread,FALSE);
diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h
index 71662678f..de2f17982 100644
--- a/src/TortoiseProc/GitLogListBase.h
+++ b/src/TortoiseProc/GitLogListBase.h
@@ -193,8 +193,6 @@ public:
 	virtual ~CGitLogListBase();
 	ProjectProperties	m_ProjectProperties;
 
-	CFilterData m_Filter;
-
 	void UpdateProjectProperties()
 	{
 		m_ProjectProperties.ReadProps();
@@ -402,8 +400,7 @@ public:
 	bool ValidateRegexp(LPCTSTR regexp_str, std::tr1::wregex& pat, bool bMatchCase = false );
 	CString				m_sFilterText;
 
-	__time64_t			m_From;
-	__time64_t			m_To;
+	CFilterData			m_Filter;
 
 	CTGitPath			m_Path;
 	int					m_ShowMask;
diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index 154ebcbd7..8181143d5 100644
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -492,10 +492,10 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)
 		CTime begin,end;
 		m_LogList.GetTimeRange(begin,end);
 
-		if(m_LogList.m_From == -1)
+		if(m_LogList.m_Filter.m_From == -1)
 			m_DateFrom.SetTime(&begin);
 
-		if(m_LogList.m_To == -1)
+		if(m_LogList.m_Filter.m_To == -1)
 			m_DateTo.SetTime(&end);
 
 
@@ -2303,9 +2303,9 @@ void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
 		m_DateTo.GetTime(_time);
 
 		CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
-		if (time.GetTime() != m_LogList.m_To)
+		if (time.GetTime() != m_LogList.m_Filter.m_To)
 		{
-			m_LogList.m_To = (DWORD)time.GetTime();
+			m_LogList.m_Filter.m_To = (DWORD)time.GetTime();
 			SetTimer(LOGFTIME_TIMER, 10, NULL);
 		}
 	}
@@ -2326,9 +2326,9 @@ void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
 		m_DateFrom.GetTime(_time);
 
 		CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
-		if (time.GetTime() != m_LogList.m_From)
+		if (time.GetTime() != m_LogList.m_Filter.m_From)
 		{
-			m_LogList.m_From = (DWORD)time.GetTime();
+			m_LogList.m_Filter.m_From = (DWORD)time.GetTime();
 			SetTimer(LOGFTIME_TIMER, 10, NULL);
 		}
 	}
-- 
2.11.4.GIT