From 52a7e1232a6f22276e4a1b4b3028a7902dc010fa Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 5 Jun 2016 01:14:56 +0100 Subject: [PATCH] Replaced mention of VCARD with VCALENDAR. Force of habit, used VCARD instead of VCALENDAR (worked on Xestia Address Book for far too long before first release). --- source/objects/calendarobject/CalendarObject-Save.cpp | 4 ++-- source/tests/xestiacalendar_icaleventsave.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/objects/calendarobject/CalendarObject-Save.cpp b/source/objects/calendarobject/CalendarObject-Save.cpp index ba19b6f..895cacb 100644 --- a/source/objects/calendarobject/CalendarObject-Save.cpp +++ b/source/objects/calendarobject/CalendarObject-Save.cpp @@ -35,7 +35,7 @@ CalendarObjectSaveResult CalendarObject::SaveFile(string SaveFilename){ CalendarObjectSaveResult CalendarObject::SaveString(string *SaveStringData){ - *SaveStringData += "BEGIN:VCARD\n"; + *SaveStringData += "BEGIN:VCALENDAR\n"; *SaveStringData += "VERSION:2.0\n"; // Check if METHOD has a value and print it if it does (and @@ -96,6 +96,6 @@ CalendarObjectSaveResult CalendarObject::SaveString(string *SaveStringData){ SaveObjectData(SaveStringData); - *SaveStringData += "END:VCARD"; + *SaveStringData += "END:VCALENDAR"; } \ No newline at end of file diff --git a/source/tests/xestiacalendar_icaleventsave.h b/source/tests/xestiacalendar_icaleventsave.h index 8f188ef..af9fb1d 100644 --- a/source/tests/xestiacalendar_icaleventsave.h +++ b/source/tests/xestiacalendar_icaleventsave.h @@ -38,7 +38,7 @@ TEST(iCalendarSaveEvent, SaveEventTests){ // First contact file. - std::string SaveDataComparison = "BEGIN:VCARD\n" + std::string SaveDataComparison = "BEGIN:VCALENDAR\n" "VERSION:2.0\n" "METHOD;EXAMPLE=DATA:REQUEST\n" "CALSCALE;MORE=YES:GREGORIAN\n" @@ -52,7 +52,7 @@ TEST(iCalendarSaveEvent, SaveEventTests){ " now if multiple line processing is going to work without it. I mean seriousl\n" " y, how annoying can this potentially be?\n" "END:VEVENT\n" - "END:VCARD"; + "END:VCALENDAR"; std::string SaveData; @@ -66,7 +66,7 @@ TEST(iCalendarSaveEvent, SaveEventTests){ ASSERT_EQ(CALENDAROBJECTVALID_OK, TestEvent2.ValidBaseObject()); SaveData.clear(); - SaveDataComparison = "BEGIN:VCARD\n" + SaveDataComparison = "BEGIN:VCALENDAR\n" "VERSION:2.0\n" "PRODID:-//Xestia//Calendar Unit Testing//KW\n" "BEGIN:VEVENT\n" @@ -182,7 +182,7 @@ TEST(iCalendarSaveEvent, SaveEventTests){ "X-EXAMPLE3;WORLD=NO:Example Data 3\n" "END:VALARM\n" "END:VEVENT\n" - "END:VCARD"; + "END:VCALENDAR"; TestEvent2.SaveString(&SaveData); -- 2.39.5