From 972917df930c51673674e76d531dcef83ad74c2c Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Sun, 14 Feb 2016 14:27:45 +0000 Subject: [PATCH] Removed the ProcessEvents subroutine from CalendarEventObject. --- .../objects/calendarevent/CalendarEvent.cpp | 65 +------------------ source/objects/calendarevent/CalendarEvent.h | 1 - 2 files changed, 1 insertion(+), 65 deletions(-) diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp index 7a23341..b3f658d 100644 --- a/source/objects/calendarevent/CalendarEvent.cpp +++ b/source/objects/calendarevent/CalendarEvent.cpp @@ -1454,9 +1454,7 @@ void CalendarEventObject::ProcessData(){ } - // Process Alarm section. - - //ProcessAlarms(); + // Process VALARM section. int SeekCount = 0; int AlarmObjectCount = 0; @@ -1957,65 +1955,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 diff --git a/source/objects/calendarevent/CalendarEvent.h b/source/objects/calendarevent/CalendarEvent.h index 99c708d..e2bdf0d 100644 --- a/source/objects/calendarevent/CalendarEvent.h +++ b/source/objects/calendarevent/CalendarEvent.h @@ -10,7 +10,6 @@ class CalendarEventObject: public CalendarObject{ private: void ProcessData(); - void ProcessAlarms(); }; -- 2.39.5