X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2Fcdo%2FContactDataObject.h;h=ebca7b605175414e902b1cd7254b1121bdd0cf0d;hb=60b068e2dfdf58c14d5669133db0e789304b2717;hp=6317312b16d576d9728704834f10210d1a664964;hpb=e84fab463acd898067e17d83b748dc365fd9a8d0;p=xestiaab%2F.git

diff --git a/source/contacteditor/cdo/ContactDataObject.h b/source/contacteditor/cdo/ContactDataObject.h
index 6317312..ebca7b6 100644
--- a/source/contacteditor/cdo/ContactDataObject.h
+++ b/source/contacteditor/cdo/ContactDataObject.h
@@ -1,6 +1,6 @@
 // ContactDataObject.h - Client Data Object header.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -24,8 +24,8 @@
 #include <map>
 #include <wx/tokenzr.h>
 
-#include "../vcard/vcard.h"
-#include "../common/textprocessing.h"
+#include "../../vcard/vcard.h"
+#include "../../common/textprocessing.h"
 
 enum ContactLoadStatus{
 	CONTACTLOAD_UNITTESTFAIL = -1,
@@ -110,10 +110,13 @@ class ContactDataObject{
 	wxString BirthdayAltID;
 	wxString BirthdayCalScale;
 	wxString BirthdayTokens;
+	bool BirthdayText = FALSE;
+	
 	wxString Anniversary;
 	wxString AnniversaryAltID;
 	wxString AnniversaryCalScale;
 	wxString AnniversaryTokens;
+	bool AnniversaryText = FALSE;
 	
 	wxString Gender;
 	wxString GenderDetails;
@@ -137,12 +140,6 @@ class ContactDataObject{
 	std::map<int, wxString> ClientPIDList;
 	std::map<int, wxString> ClientPIDListTokens;
 
-	/* We don't use these at the moment but we want to keep
-	  them for compatability reasons */
-
-	/*std::map<int, wxString> ExtraFullNames;*/
-	/*std::map<int, wxString> ExtraNicknames;*/
-
 	std::map<int, wxString> FullNamesList;	
 	std::map<int, wxString> FullNamesListType;
 	std::map<int, wxString> FullNamesListLanguage;
@@ -186,6 +183,7 @@ class ContactDataObject{
 	std::map<int, wxString> GeneralIMListAltID;
 	std::map<int, wxString> GeneralIMListPID;
 	std::map<int, wxString> GeneralIMListType;
+	std::map<int, wxString> GeneralIMListTypeInfo;
 	std::map<int, wxString> GeneralIMListTokens;
 	std::map<int, wxString> GeneralIMListMediatype;
 	std::map<int, int> GeneralIMListPref;
@@ -196,6 +194,7 @@ class ContactDataObject{
 	std::map<int, wxString> GeneralTelephoneListType;
 	std::map<int, wxString> GeneralTelephoneListTokens;
 	std::map<int, wxString> GeneralTelephoneListTypeInfo;
+	std::map<int, wxString> GeneralTelephoneListDataType;
 	std::map<int, int> GeneralTelephoneListPref;
 	
 	std::map<int, wxString> GeneralLanguageList;
@@ -219,6 +218,7 @@ class ContactDataObject{
 	std::map<int, wxString> GeneralGeographyListType;
 	std::map<int, wxString> GeneralGeographyListTokens;
 	std::map<int, wxString> GeneralGeographyListMediatype;
+	std::map<int, wxString> GeneralGeographyListDataType;
 	std::map<int, int> GeneralGeographyListPref;
 
 	std::map<int, wxString> GeneralRelatedList;
@@ -308,6 +308,7 @@ class ContactDataObject{
 	std::map<int, wxString> HomeIMListAltID;
 	std::map<int, wxString> HomeIMListPID;
 	std::map<int, wxString> HomeIMListType;
+	std::map<int, wxString> HomeIMListTypeInfo;
 	std::map<int, wxString> HomeIMListTokens;
 	std::map<int, wxString> HomeIMListMediatype;
 	std::map<int, int> HomeIMListPref;
@@ -318,6 +319,7 @@ class ContactDataObject{
 	std::map<int, wxString> HomeTelephoneListType;
 	std::map<int, wxString> HomeTelephoneListTokens;
 	std::map<int, wxString> HomeTelephoneListTypeInfo;
+	std::map<int, wxString> HomeTelephoneListDataType;
 	std::map<int, int> HomeTelephoneListPref;
 	
 	std::map<int, wxString> HomeLanguageList;
@@ -341,6 +343,7 @@ class ContactDataObject{
 	std::map<int, wxString> HomeGeographyListType;
 	std::map<int, wxString> HomeGeographyListTokens;
 	std::map<int, wxString> HomeGeographyListMediatype;
+	std::map<int, wxString> HomeGeographyListDataType;
 	std::map<int, int> HomeGeographyListPref;
 	
 	std::map<int, wxString> HomeWebsiteList;
@@ -421,6 +424,7 @@ class ContactDataObject{
 	std::map<int, wxString> BusinessIMListAltID;
 	std::map<int, wxString> BusinessIMListPID;
 	std::map<int, wxString> BusinessIMListType;
+	std::map<int, wxString> BusinessIMListTypeInfo;
 	std::map<int, wxString> BusinessIMListTokens;
 	std::map<int, wxString> BusinessIMListMediatype;
 	std::map<int, int> BusinessIMListPref;
@@ -431,6 +435,7 @@ class ContactDataObject{
 	std::map<int, wxString> BusinessTelephoneListType;
 	std::map<int, wxString> BusinessTelephoneListTypeInfo;
 	std::map<int, wxString> BusinessTelephoneListTokens;
+	std::map<int, wxString> BusinessTelephoneListDataType;
 	std::map<int, int> BusinessTelephoneListPref;
 	
 	std::map<int, wxString> BusinessLanguageList;
@@ -454,6 +459,7 @@ class ContactDataObject{
 	std::map<int, wxString> BusinessGeographyListType;
 	std::map<int, wxString> BusinessGeographyListTokens;
 	std::map<int, wxString> BusinessGeographyListMediatype;
+	std::map<int, wxString> BusinessGeographyListDataType;
 	std::map<int, int> BusinessGeographyListPref;			
 	
 	std::map<int, wxString> BusinessWebsiteList;
@@ -604,6 +610,7 @@ class ContactDataObject{
 	// Subroutines.
 	
 	ContactLoadStatus LoadFile(wxString Filename);
+	void ClearData();
 
 };