1 #include "frmConflictResolution.h"
2 #include "common/getcontactinfo.h"
4 frmConflictResolution::frmConflictResolution( wxWindow* parent )
6 frmConflictResolutionADT( parent )
11 void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
18 void frmConflictResolution::KeepServerData( wxCommandEvent& event )
25 void frmConflictResolution::DecideLater( wxCommandEvent& event )
33 int frmConflictResolution::GetResult(){
35 return ConflictResult;
39 void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::map<wxString, wxString> *MemoryFSList){
41 // Load the local data.
43 wxString ClientSID = wxString::Format(wxT("%i"), rand() % 32768);
44 wxString ServerSID = wxString::Format(wxT("%i"), rand() % 32768);
46 LoadContactData(LocalData, htmClient, ClientSID,
47 wxT(""), MemoryFSList);
49 // Load the server data.
51 LoadContactData(ServerData, htmServer, ServerSID,
52 wxT(""), MemoryFSList);