Import: Added import.h to import.cpp

[xestiaab/.git] / source / import / import.cpp

diff --git a/source/import/import.cpp b/source/import/import.cpp
index b85c4f6..efd701a 100644 (file)
--- a/source/import/import.cpp
+++ b/source/import/import.cpp
@@ -1,3 +1,21 @@
+// import.cpp - Import subroutines.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book 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, version 3 of the license.
+//
+// Xestia Address Book 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 Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include <wx/filedlg.h>
 #include <wx/filename.h>
 #include <wx/regex.h>
@@ -5,6 +23,7 @@
 #include <wx/ffile.h>
 #include <map>
 
+#include "import.h"
 #include "import-vcard3.h"
 #include "import-vcard4.h"
 #include "import-struct.h"
@@ -23,10 +42,7 @@ void ImportRun(frmMain *frmMainPtrInc){
 
        wxString FileTypes;
        
-       long ContactsExported = 0;
-       long ContactsCollected = 0;
-       int ExportType = 0;
-       int ExportCount = 0;
+       int ImportType = 0;
        wxString FinalFilename;
        wxArrayString SelectedFileList;
        wxString SelectedFileDirectory;
@@ -41,12 +57,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,29 +71,25 @@ 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);
-       
-               //ImportVCard4(DirMode, FinalFilename, FileListInc, &ExportCount);
-       
+
        }
        
-       // vCard 3.0 export
+       // vCard 3.0 import
        
-       if (ExportType == 1){
+       if (ImportType == 1){
        
                ContactData = ImportVCard3(&SelectedFileList);
-       
-               //ImportVCard3(DirMode, FinalFilename, FileListInc, &ExportCount);
 
        }
 
@@ -152,7 +164,7 @@ void ImportRun(frmMain *frmMainPtrInc){
        
                if (iter->second.ContactSelected == TRUE){
                
-                       // Workout the file name.               void CloseWindow( wxCommandEvent& event );
+                       // Workout the file name.
                        // Get the UID value and check if it is empty.
                        // If it isn't empty, check it can be used for a valid
                        // filename other wise generate a file name for the purposes
@@ -163,7 +175,7 @@ void ImportRun(frmMain *frmMainPtrInc){
                        
 #if defined(__HAIKU__)
     
-    //preffilename = wxT("noo");
+
 
 #elif defined(__WIN32__)
 
@@ -216,14 +228,6 @@ void ImportRun(frmMain *frmMainPtrInc){
                                UIDToken = iter->second.UIDValue;
                        
                        }
-                       
-                       //GenerateUUID();
-                       
-                       /*if (iter->second.ContactSelected.UIDValue.IsEmpty()){
-                       
-                       
-                       
-                       }*/
                
                        // Check if the file exists in the directory already.
                
@@ -314,8 +318,6 @@ void ImportRun(frmMain *frmMainPtrInc){
        
        }
        
-       //wxPostEvent
-       
        // Resume the timers.
        
        frmMainPtrInc->ResumeAllTimers();