From 65d6172fc6029dbdbbac939db28387fe7be079c7 Mon Sep 17 00:00:00 2001
From: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Date: Thu, 6 Jul 2017 03:03:38 +0800
Subject: [PATCH] Pass combobox as reference instead of pointer

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseProc/BranchCombox.h     | 6 +++---
 src/TortoiseProc/BrowseRefsDlg.cpp  | 6 +++---
 src/TortoiseProc/BrowseRefsDlg.h    | 2 +-
 src/TortoiseProc/FormatPatchDlg.cpp | 2 +-
 src/TortoiseProc/PushDlg.cpp        | 2 +-
 src/TortoiseProc/RebaseDlg.cpp      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/TortoiseProc/BranchCombox.h b/src/TortoiseProc/BranchCombox.h
index 95f1f0f03..7faf3df54 100644
--- a/src/TortoiseProc/BranchCombox.h
+++ b/src/TortoiseProc/BranchCombox.h
@@ -1,6 +1,6 @@
 // TortoiseGit - a Windows shell extension for easy version control
 
-// Copyright (C) 2009-2016 - TortoiseGit
+// Copyright (C) 2009-2017 - TortoiseGit
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -83,7 +83,7 @@ protected:
 	}
 	void  BnClickedButtonBrowseLocalBranch()
 	{
-		if(CBrowseRefsDlg::PickRefForCombo(&m_ctrlLocalBranch, m_LocalBranchFilter))
+		if (CBrowseRefsDlg::PickRefForCombo(m_ctrlLocalBranch, m_LocalBranchFilter))
 			CbnSelchangeLocalBranch();
 	}
 	void  BnClickedButtonBrowseRemoteBranch()
@@ -117,7 +117,7 @@ protected:
 		}
 		else
 		{
-			if(CBrowseRefsDlg::PickRefForCombo(&m_ctrlRemoteBranch, m_RemoteBranchFilter))
+			if (CBrowseRefsDlg::PickRefForCombo(m_ctrlRemoteBranch, m_RemoteBranchFilter))
 				CbnSelchangeRemoteBranch();
 		}
 	}
diff --git a/src/TortoiseProc/BrowseRefsDlg.cpp b/src/TortoiseProc/BrowseRefsDlg.cpp
index 7133d2fa6..b98a37e4a 100644
--- a/src/TortoiseProc/BrowseRefsDlg.cpp
+++ b/src/TortoiseProc/BrowseRefsDlg.cpp
@@ -1430,10 +1430,10 @@ CString CBrowseRefsDlg::PickRef(bool /*returnAsHash*/, CString initialRef, int p
 	return dlg.m_pickedRef;
 }
 
-bool CBrowseRefsDlg::PickRefForCombo(CHistoryCombo* pComboBox, int pickRef_Kind /* = gPickRef_All*/, int useShortName /* = gPickRef_Head*/)
+bool CBrowseRefsDlg::PickRefForCombo(CHistoryCombo& refComboBox, int pickRef_Kind /* = gPickRef_All*/, int useShortName /* = gPickRef_Head*/)
 {
 	CString origRef;
-	pComboBox->GetLBText(pComboBox->GetCurSel(), origRef);
+	refComboBox.GetLBText(refComboBox.GetCurSel(), origRef);
 	CString resultRef = PickRef(false,origRef,pickRef_Kind);
 	if(resultRef.IsEmpty())
 		return false;
@@ -1462,7 +1462,7 @@ bool CBrowseRefsDlg::PickRefForCombo(CHistoryCombo* pComboBox, int pickRef_Kind
 
 	CGit::StripRefName(resultRef);
 
-	pComboBox->AddString(resultRef);
+	refComboBox.AddString(resultRef);
 
 	return true;
 }
diff --git a/src/TortoiseProc/BrowseRefsDlg.h b/src/TortoiseProc/BrowseRefsDlg.h
index 63f7360ca..d5865e0b2 100644
--- a/src/TortoiseProc/BrowseRefsDlg.h
+++ b/src/TortoiseProc/BrowseRefsDlg.h
@@ -238,5 +238,5 @@ private:
 
 public:
 	static CString	PickRef(bool returnAsHash = false, CString initialRef = CString(), int pickRef_Kind = gPickRef_All, bool pickMultipleRefsOrRange = false);
-	static bool		PickRefForCombo(CHistoryCombo* pComboBox, int pickRef_Kind = gPickRef_All, int useShortName = gPickRef_Head);
+	static bool		PickRefForCombo(CHistoryCombo& refComboBox, int pickRef_Kind = gPickRef_All, int useShortName = gPickRef_Head);
 };
diff --git a/src/TortoiseProc/FormatPatchDlg.cpp b/src/TortoiseProc/FormatPatchDlg.cpp
index 1288ca9e0..cd4f61adf 100644
--- a/src/TortoiseProc/FormatPatchDlg.cpp
+++ b/src/TortoiseProc/FormatPatchDlg.cpp
@@ -259,7 +259,7 @@ void CFormatPatchDlg::OnBnClickedRadio()
 
 void CFormatPatchDlg::OnBnClickedButtonRef()
 {
-	if(CBrowseRefsDlg::PickRefForCombo(&m_cSince, gPickRef_NoTag))
+	if (CBrowseRefsDlg::PickRefForCombo(m_cSince, gPickRef_NoTag))
 	{
 		CheckRadioButton(IDC_RADIO_SINCE, IDC_RADIO_RANGE, IDC_RADIO_SINCE);
 		OnBnClickedRadio();
diff --git a/src/TortoiseProc/PushDlg.cpp b/src/TortoiseProc/PushDlg.cpp
index fe60503df..50fba4a8a 100644
--- a/src/TortoiseProc/PushDlg.cpp
+++ b/src/TortoiseProc/PushDlg.cpp
@@ -483,7 +483,7 @@ void CPushDlg::OnBnClickedButtonBrowseSourceBranch()
 	{
 	case 0: /* Browse Refence*/
 		{
-			if (CBrowseRefsDlg::PickRefForCombo(&m_BranchSource, gPickRef_Head | gPickRef_Tag))
+			if (CBrowseRefsDlg::PickRefForCombo(m_BranchSource, gPickRef_Head | gPickRef_Tag))
 				OnCbnSelchangeBranchSource();
 		}
 		break;
diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index 97225340e..2e1daa3d0 100644
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -2471,7 +2471,7 @@ void CRebaseDlg::OnBnClickedButtonReverse()
 
 void CRebaseDlg::OnBnClickedButtonBrowse()
 {
-	if(CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl))
+	if (CBrowseRefsDlg::PickRefForCombo(m_UpstreamCtrl))
 		OnCbnSelchangeUpstream();
 }
 
-- 
2.11.4.GIT