X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarevent%2FCalendarEvent.cpp;h=72e156c9b0adfc9edbae0ffc3a31a002b158b52b;hb=cba151c4b833a26c63984769f921bab5e755decd;hp=7a23341a4f28d8ec94c347d548fbb23cc7fc8f57;hpb=46e98c317cf8ecf30ef6e198b4b837b69d824c13;p=xestiacalendar%2F.git diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp index 7a23341..72e156c 100644 --- a/source/objects/calendarevent/CalendarEvent.cpp +++ b/source/objects/calendarevent/CalendarEvent.cpp @@ -1,3 +1,21 @@ +// CalendarEvent.cpp - CalendarEventObject class functions +// +// (c) 2016-2017 Xestia Software Development. +// +// This file is part of Xestia Calendar. +// +// Xestia Calendar is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by the +// Free Software Foundation, version 3 of the license. +// +// Xestia Calendar is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with Xestia Calendar. If not, see + #include "CalendarEvent.h" using namespace std; @@ -156,7 +174,7 @@ CalendarObjectValidResult CalendarEventObject::ValidObject(){ } // Check if the VEVENT is valid. - + if (ValidBegin == true && ValidEnd == true && ValidDateTimeStamp == true && @@ -816,14 +834,6 @@ void CalendarEventObject::ProcessData(){ DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "DURATION"); if (DataReceived.begin() != DataReceived.end()){ - - try { - DurationDataTokens = DataReceived.begin()->first.substr(9); - } - - catch(const out_of_range &oor){ - // Do nothing as there is no data. - } DurationData = DataReceived.begin()->second; @@ -1454,9 +1464,7 @@ void CalendarEventObject::ProcessData(){ } - // Process Alarm section. - - //ProcessAlarms(); + // Process VALARM section. int SeekCount = 0; int AlarmObjectCount = 0; @@ -1957,65 +1965,4 @@ void CalendarEventObject::ProcessData(){ } -} - -void CalendarEventObject::ProcessAlarms(){ - - int SeekCount = 0; - - bool TZMode = false; // False = STANDARD, True = DAYLIGHT. - bool ValidBegin = false; - vector EventObjectName; - vector EventObjectData; - - for (vector::iterator iter = ObjectName.begin(); - iter != ObjectName.end(); iter++){ - - // Check if the current name is BEGIN and - // data is either STANDARD or DAYLIGHT. - - if (ObjectName[SeekCount] == "BEGIN" && - ObjectData[SeekCount] == "VALARM"){ - - if (ValidBegin == false){ - ValidBegin = true; - EventObjectName.clear(); - EventObjectData.clear(); - } else { - - } - - SeekCount++; - continue; - - } - - // Check if current name is END and - // data is either STANDARD or DAYLIGHT. - - if (ObjectName[SeekCount] == "END" && - ObjectData[SeekCount] == "VALARM" && - ValidBegin == true){ - - EventAlarmName.push_back(EventObjectName); - EventAlarmData.push_back(EventObjectData); - - EventObjectName.clear(); - EventObjectData.clear(); - - ValidBegin = false; - - } - - if (ValidBegin == true){ - - EventObjectName.push_back(ObjectName[SeekCount]); - EventObjectData.push_back(ObjectData[SeekCount]); - - } - - SeekCount++; - - } - } \ No newline at end of file