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:
a730199
)
Removed references to the boost library in frmSearch.
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Sat, 28 Nov 2015 09:36:05 +0000
(09:36 +0000)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Sat, 28 Nov 2015 09:36:05 +0000
(09:36 +0000)
source/frmSearch.cpp
patch
|
blob
|
history
diff --git
a/source/frmSearch.cpp
b/source/frmSearch.cpp
index
c6ba0d0
..
0a1e4ca
100644
(file)
--- a/
source/frmSearch.cpp
+++ b/
source/frmSearch.cpp
@@
-27,9
+27,6
@@
#include <thread>
#include <wx/fs_mem.h>
#include <thread>
#include <wx/fs_mem.h>
-/*#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
-#include <boost/filesystem/path.hpp>*/
#include <wx/tokenzr.h>
#include <wx/dir.h>
#include <wx/tokenzr.h>
#include <wx/dir.h>
@@
-59,8
+56,6
@@
BEGIN_EVENT_TABLE(frmSearch, wxFrame)
EVT_COMMAND(wxID_ANY, SE_REVEALCONTACT, frmSearch::RevealContact)
END_EVENT_TABLE()
EVT_COMMAND(wxID_ANY, SE_REVEALCONTACT, frmSearch::RevealContact)
END_EVENT_TABLE()
-//namespace boostfs = boost::filesystem;
-
frmSearch::frmSearch( wxWindow* parent )
:
frmSearchADT( parent )
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.
// 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;
wxString vcardfilenamewxs;
wxStringTokenizer vcardfileline;
//std::string l;
@@
-207,15
+198,12
@@
void frmSearch::SearchContactsThread(){
wxString vCardFilename;
wxString vCardFilenameFull;
wxString vCardFilename;
wxString vCardFilenameFull;
- //if (boostfs::exists(vcarddir)){
if (wxDirExists(AccountDir)){
wxDir vcardaccdir(AccountDir);
bool ProcFiles = vcardaccdir.GetFirst(&vCardFilename, wxEmptyString, wxDIR_FILES);
while(ProcFiles){
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){
if (StopMode == FALSE){
@@
-241,20
+229,8
@@
void frmSearch::SearchContactsThread(){
Person.LoadFile(vCardFilenameFull);
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;
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.
// Open the vCard file up and get the setting names and values from the
// file.
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy