X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmSearch.cpp;h=73ca64df9aecc1b524815027aa412b776a165682;hb=c31cb9c171e80cfb02d26b6753576c4066edab90;hp=c6ba0d0f499453dc53e2f2bc803ad057a1332eb8;hpb=a73019906500e3a0fc306a61e4b7975f79725866;p=xestiaab%2F.git diff --git a/source/frmSearch.cpp b/source/frmSearch.cpp index c6ba0d0..73ca64d 100644 --- a/source/frmSearch.cpp +++ b/source/frmSearch.cpp @@ -1,21 +1,3 @@ -// frmSearch.cpp - Search form. -// -// (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 - #include "frmSearch.h" #include "frmMain.h" #include "frmContact.h" @@ -239,43 +221,9 @@ void frmSearch::SearchContactsThread(){ vCardFilenameFull.Append(AccountDir); vCardFilenameFull.Append(vCardFilename); - 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. - - vcardfile.open(vcardfilenamewxs.mb_str(), std::ios::in); - - while(getline(vcardfile, l)){ - - lwxs.Clear(); - setname.Clear(); - setvalue.Clear(); - lwxs.Append(wxString::FromUTF8(l.c_str())); - vcardfileline.SetString(lwxs, wxT(":")); - setname = vcardfileline.GetNextToken(); - setvalue = vcardfileline.GetString(); - - Person.Add(setname, setvalue, TRUE); - - } - - vcardfile.close();*/ // Check if file has version 4.0, first name (FN) // begin and end vCard portions.