Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b25006a
)
Renamed variables starting with Export to Import in import/import.cpp
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Thu, 19 Nov 2015 21:09:56 +0000
(21:09 +0000)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Thu, 19 Nov 2015 21:09:56 +0000
(21:09 +0000)
source/import/import.cpp
patch
|
blob
|
history
diff --git
a/source/import/import.cpp
b/source/import/import.cpp
index
3c825d1
..
71decf0
100644
(file)
--- a/
source/import/import.cpp
+++ b/
source/import/import.cpp
@@
-23,10
+23,9
@@
void ImportRun(frmMain *frmMainPtrInc){
wxString FileTypes;
wxString FileTypes;
- long Contacts
Ex
ported = 0;
+ long Contacts
Im
ported = 0;
long ContactsCollected = 0;
long ContactsCollected = 0;
- int ExportType = 0;
- int ExportCount = 0;
+ int ImportType = 0;
wxString FinalFilename;
wxArrayString SelectedFileList;
wxString SelectedFileDirectory;
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"));
FileTypes.Append(wxT("vCard 3.0 Contact(s) (*.vcf)"));
FileTypes.Append(wxT("|*.vcf"));
- // Open up the dialog to
ex
port file data.
+ // Open up the dialog to
im
port file data.
- wxFileDialog
Ex
portDlg(frmMainPtrInc, wxT("Import Contacts"), wxT(""), wxT(""),
+ wxFileDialog
Im
portDlg(frmMainPtrInc, wxT("Import Contacts"), wxT(""), wxT(""),
FileTypes, wxFD_OPEN|wxFD_MULTIPLE);
FileTypes, wxFD_OPEN|wxFD_MULTIPLE);
- if (
Ex
portDlg.ShowModal() == wxID_CANCEL){
+ if (
Im
portDlg.ShowModal() == wxID_CANCEL){
frmMainPtrInc->ResumeAllTimers();
return;
frmMainPtrInc->ResumeAllTimers();
return;
@@
-55,23
+54,23
@@
void ImportRun(frmMain *frmMainPtrInc){
// Get the list of filenames.
// Get the list of filenames.
-
Ex
portDlg.GetPaths(SelectedFileList);
+
Im
portDlg.GetPaths(SelectedFileList);
// Find which data type is being used.
// Find which data type is being used.
-
ExportType = Ex
portDlg.GetFilterIndex();
+
ImportType = Im
portDlg.GetFilterIndex();
std::map<int, ImportDataContact> ContactData;
std::map<int, ImportDataContact> ContactData;
- if (
Ex
portType == 0){
+ if (
Im
portType == 0){
ContactData = ImportVCard4(&SelectedFileList);
}
ContactData = ImportVCard4(&SelectedFileList);
}
- // vCard 3.0
ex
port
+ // vCard 3.0
im
port
- if (
Ex
portType == 1){
+ if (
Im
portType == 1){
ContactData = ImportVCard3(&SelectedFileList);
ContactData = ImportVCard3(&SelectedFileList);
@@
-115,7
+114,7
@@
void ImportRun(frmMain *frmMainPtrInc){
delete frmIC;
frmIC = NULL;
delete frmIC;
frmIC = NULL;
- // Import the contacts into the selected account.
+ // Import
the contacts into the selected account.
int ImportCount = 0;
int ImportSeek = 0;
int ImportCount = 0;
int ImportSeek = 0;
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy