From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Thu, 19 Nov 2015 21:09:56 +0000 (+0000)
Subject: Renamed variables starting with Export to Import in import/import.cpp
X-Git-Tag: release-0.05~6
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=45aff551ea38ed919be2cf5255a45d24291a906a

Renamed variables starting with Export to Import in import/import.cpp
---

diff --git a/source/import/import.cpp b/source/import/import.cpp
index 3c825d1..71decf0 100644
--- a/source/import/import.cpp
+++ b/source/import/import.cpp
@@ -23,10 +23,9 @@ void ImportRun(frmMain *frmMainPtrInc){
 
 	wxString FileTypes;
 	
-	long ContactsExported = 0;
+	long ContactsImported = 0;
 	long ContactsCollected = 0;
-	int ExportType = 0;
-	int ExportCount = 0;
+	int ImportType = 0;
 	wxString FinalFilename;
 	wxArrayString SelectedFileList;
 	wxString SelectedFileDirectory;
@@ -41,12 +40,12 @@ void ImportRun(frmMain *frmMainPtrInc){
 	FileTypes.Append(wxT("vCard 3.0 Contact(s) (*.vcf)"));
 	FileTypes.Append(wxT("|*.vcf"));
 
-	// Open up the dialog to export file data.
+	// Open up the dialog to import file data.
 	
-	wxFileDialog ExportDlg(frmMainPtrInc, wxT("Import Contacts"), wxT(""), wxT(""),
+	wxFileDialog ImportDlg(frmMainPtrInc, wxT("Import Contacts"), wxT(""), wxT(""),
 		FileTypes, wxFD_OPEN|wxFD_MULTIPLE);
 	
-	if (ExportDlg.ShowModal() == wxID_CANCEL){
+	if (ImportDlg.ShowModal() == wxID_CANCEL){
 	
 		frmMainPtrInc->ResumeAllTimers();
 		return;
@@ -55,23 +54,23 @@ void ImportRun(frmMain *frmMainPtrInc){
 
 	// Get the list of filenames.
 
-	ExportDlg.GetPaths(SelectedFileList);
+	ImportDlg.GetPaths(SelectedFileList);
 	
 	// Find which data type is being used.
 		
-	ExportType = ExportDlg.GetFilterIndex();
+	ImportType = ImportDlg.GetFilterIndex();
 
 	std::map<int, ImportDataContact> ContactData;
 
-	if (ExportType == 0){
+	if (ImportType == 0){
 	
 		ContactData = ImportVCard4(&SelectedFileList);
 
 	}
 	
-	// vCard 3.0 export
+	// vCard 3.0 import
 	
-	if (ExportType == 1){
+	if (ImportType == 1){
 	
 		ContactData = ImportVCard3(&SelectedFileList);
 
@@ -115,7 +114,7 @@ void ImportRun(frmMain *frmMainPtrInc){
 	delete frmIC;
 	frmIC = NULL;
 
-	// Import the contacts into the selected account.
+	// Import	the contacts into the selected account.
 
 	int ImportCount = 0;
 	int ImportSeek = 0;