From: Steve Brokenshire Date: Sat, 28 Nov 2015 09:36:05 +0000 (+0000) Subject: Removed references to the boost library in frmSearch. X-Git-Tag: release-0.06~38 X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=b9b4cd1431a1cbda02f5199a5956bf14e776fd9d Removed references to the boost library in frmSearch. --- diff --git a/source/frmSearch.cpp b/source/frmSearch.cpp index c6ba0d0..0a1e4ca 100644 --- a/source/frmSearch.cpp +++ b/source/frmSearch.cpp @@ -27,9 +27,6 @@ #include #include -/*#include -#include -#include */ #include #include @@ -59,8 +56,6 @@ BEGIN_EVENT_TABLE(frmSearch, wxFrame) EVT_COMMAND(wxID_ANY, SE_REVEALCONTACT, frmSearch::RevealContact) END_EVENT_TABLE() -//namespace boostfs = boost::filesystem; - frmSearch::frmSearch( wxWindow* parent ) : frmSearchADT( parent ) @@ -191,12 +186,8 @@ void frmSearch::SearchContactsThread(){ // Get the list of contact files and process each // one of them. - wxString AccountDir = GetAccountDir(SAPiter->second, FALSE); - - //boostfs::path vcarddir(AccountDir.c_str()); - //boostfs::directory_iterator dir_end; + wxString AccountDir = GetAccountDir(SAPiter->second, FALSE); - //boostfs::path vcardfilename; wxString vcardfilenamewxs; wxStringTokenizer vcardfileline; //std::string l; @@ -207,15 +198,12 @@ void frmSearch::SearchContactsThread(){ wxString vCardFilename; wxString vCardFilenameFull; - //if (boostfs::exists(vcarddir)){ if (wxDirExists(AccountDir)){ wxDir vcardaccdir(AccountDir); bool ProcFiles = vcardaccdir.GetFirst(&vCardFilename, wxEmptyString, wxDIR_FILES); while(ProcFiles){ - //for (boostfs::directory_iterator vcarddir_iter(vcarddir); - // vcarddir_iter != dir_end ; ++vcarddir_iter){ if (StopMode == FALSE){ @@ -241,20 +229,8 @@ void frmSearch::SearchContactsThread(){ Person.LoadFile(vCardFilenameFull); - - /*if (boostfs::path(vcarddir_iter->path()).extension() == ".vcf" || - boostfs::path(vcarddir_iter->path()).extension() == ".VCF" || - boostfs::path(vcarddir_iter->path()).extension() == ".vcard" || - boostfs::path(vcarddir_iter->path()).extension() == ".VCARD"){*/ vcardfilenamewxs = vCardFilenameFull; - - /*vCard Person; - std::fstream vcardfile; - - vcardfilename = boostfs::path(vcarddir_iter->path()).filename(); - vcardfilenamewxs.Append(AccountDir); - vcardfilenamewxs.Append(wxString::FromUTF8(vcardfilename.c_str())); // Open the vCard file up and get the setting names and values from the // file.