From d0ef0040a74967db59d242ffe93303a1027ba906 Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 3 Jul 2016 22:31:51 +0100 Subject: [PATCH] Added ANNIVERSARY to the SaveString function of ContactDataObject --- .../cdo/ContactDataObject-Save.cpp | 44 +++++++++++++++++++ source/tests/xestiaab_contactsave.h | 1 + 2 files changed, 45 insertions(+) diff --git a/source/contacteditor/cdo/ContactDataObject-Save.cpp b/source/contacteditor/cdo/ContactDataObject-Save.cpp index 72dad84..9e3db13 100644 --- a/source/contacteditor/cdo/ContactDataObject-Save.cpp +++ b/source/contacteditor/cdo/ContactDataObject-Save.cpp @@ -452,6 +452,50 @@ ContactSaveStatus ContactDataObject::SaveString(wxString *SaveData){ } + // Process ANNIVERSARY. + + if (Anniversary.size() > 0){ + + ProcessData.Append("ANNIVERSARY"); + + // Check if there is a value for ALTID. + + if (AnniversaryAltID.size() > 0){ + + ProcessData.Append(";ALTID="); + ProcessData.Append(AnniversaryAltID); + + } + + // Check if there is a value for CALSCALE. + + if (AnniversaryAltID.size() > 0){ + + ProcessData.Append(";CALSCALE="); + ProcessData.Append(AnniversaryCalScale); + + } + + // Check if there is a value for tokens. + + if (AnniversaryTokens.size() > 0){ + + ProcessData.Append(";"); + ProcessData.Append(AnniversaryTokens); + + } + + ProcessData.Append(":"); + ProcessData.Append(Anniversary); + ProcessData.Append("\n"); + + ProcessData = OutputText(&ProcessData); + + SaveData->Append(ProcessData); + ProcessData.clear(); + + } + // Process TITLE. SaveTitle(&GeneralTitleList, &GeneralTitleListLanguage, diff --git a/source/tests/xestiaab_contactsave.h b/source/tests/xestiaab_contactsave.h index 810322c..b3dde42 100644 --- a/source/tests/xestiaab_contactsave.h +++ b/source/tests/xestiaab_contactsave.h @@ -91,6 +91,7 @@ TEST(ContactSave, ContactSaveTests){ " :The Testing One\n" "GENDER;BEEP=Boop:F;Example Text\n" "BDAY;ALTID=35;CALSCALE=georgian;HAPPY=Days:20040101\n" + "ANNIVERSARY;ALTID=70;CALSCALE=georgian;WONDERFUL=Day:20200516\n" "TITLE;ALTID=20;LANGUAGE=text/plain;PID=21;PREF=22;EEP=LIGHT:Lord of Light\n" "TITLE;TYPE=home;ALTID=30;LANGUAGE=grass/dry;PID=31;PREF=32;EEP=DARK:Lord of D\n" " arkness\n" -- 2.39.5