Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
camelCase: Converted code in calendarjournal directory
authorSteve Brokenshire <sbrokenshire@xestia.co.uk>
Sat, 28 Jan 2017 19:30:30 +0000 (19:30 +0000)
committerSteve Brokenshire <sbrokenshire@xestia.co.uk>
Sat, 28 Jan 2017 19:30:30 +0000 (19:30 +0000)
source/objects/calendarfreebusy/CalendarFreeBusy-Save.cpp
source/objects/calendarjournal/CalendarJournal-Save.cpp
source/objects/calendarjournal/CalendarJournal.cpp
source/objects/calendarjournal/CalendarJournal.h

index 69f4741..4d0fa73 100644 (file)
@@ -20,7 +20,7 @@
 
 using namespace std;
 
-void CalendarFreeBusyObject::SaveObjectData(string *SaveData){
+void CalendarFreeBusyObject::SaveObjectData(string *saveData){
 
        string dataLine = "";
        string dataLineProcessed = "";
index d88224c..edcdd47 100644 (file)
 
 using namespace std;
 
-void CalendarJournalObject::SaveObjectData(string *SaveData){
+void CalendarJournalObject::SaveObjectData(string *saveData){
 
-       string DataLine = "";
-       string DataLineProcessed = "";
+       string dataLine = "";
+       string dataLineProcessed = "";
        
-       *SaveData += "BEGIN:VJOURNAL\n";
+       *saveData += "BEGIN:VJOURNAL\n";
        
        // Process the UID.
        
-       if (UniqueID.size() > 0){
+       if (uniqueID.size() > 0){
                
-               if (UniqueIDTokens.size() > 0){
+               if (uniqueIDTokens.size() > 0){
                
-                       DataLine += "UID;";
-                       DataLine += UniqueIDTokens;
+                       dataLine += "UID;";
+                       dataLine += uniqueIDTokens;
                        
                } else {
 
-                       DataLine += "UID";
+                       dataLine += "UID";
                        
                }
 
-               DataLine += ":";
-               DataLine += UniqueID;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += UniqueID;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
                
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the DTSTAMP.
        
-       if (DateTimeStampData.size() > 0){
+       if (dateTimeStampData.size() > 0){
                
-               if (DateTimeStampTokens.size() > 0){
+               if (dateTimeStampTokens.size() > 0){
                
-                       DataLine += "DTSTAMP;";
-                       DataLine += DateTimeStampTokens;
+                       dataLine += "DTSTAMP;";
+                       dataLine += dateTimeStampTokens;
                        
                } else {
 
-                       DataLine += "DTSTAMP";
+                       dataLine += "DTSTAMP";
                        
                }
 
-               DataLine += ":";
-               DataLine += DateTimeStampData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += dateTimeStampData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
                
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the SUMMARY.
        
-       if (SummaryData.size() > 0){
+       if (summaryData.size() > 0){
                
-               DataLine += "SUMMARY";
+               dataLine += "SUMMARY";
                
-               if (SummaryDataAltRep.size() > 0){
+               if (summaryDataAltRep.size() > 0){
                
-                       DataLine += ";ALTREP=\"";
-                       DataLine += SummaryDataAltRep;
-                       DataLine += "\"";
+                       dataLine += ";ALTREP=\"";
+                       dataLine += summaryDataAltRep;
+                       dataLine += "\"";
                        
                }
                
-               if (SummaryDataLanguage.size() > 0){
+               if (summaryDataLanguage.size() > 0){
                
-                       DataLine += ";LANGUAGE=";
-                       DataLine += SummaryDataLanguage;                        
+                       dataLine += ";LANGUAGE=";
+                       dataLine += summaryDataLanguage;                        
                        
                }
                
-               if (SummaryDataTokens.size() > 0){
+               if (summaryDataTokens.size() > 0){
                
-                       DataLine += ";";
-                       DataLine += SummaryDataTokens;
+                       dataLine += ";";
+                       dataLine += summaryDataTokens;
                        
                }
                
-               DataLine += ":";
-               DataLine += SummaryData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += summaryData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
 
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the CLASS.
        
-       if (ClassData.size() > 0){
+       if (classData.size() > 0){
                
-               DataLine += "CLASS";
+               dataLine += "CLASS";
                
-               if (ClassDataTokens.size() > 0){
+               if (classDataTokens.size() > 0){
                
-                       DataLine += ";";
-                       DataLine += ClassDataTokens;
+                       dataLine += ";";
+                       dataLine += classDataTokens;
                        
                }
                
-               DataLine += ":";
-               DataLine += ClassData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += classData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
 
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the DTSTART.
        
-       if (DateTimeStartData.size() > 0){
+       if (dateTimeStartData.size() > 0){
                
-               DataLine += "DTSTART";
+               dataLine += "DTSTART";
                
-               if (DateTimeStartDataValue.size() > 0){
+               if (dateTimeStartDataValue.size() > 0){
                
-                       DataLine += ";VALUE=";
-                       DataLine += DateTimeStartDataValue;                     
+                       dataLine += ";VALUE=";
+                       dataLine += dateTimeStartDataValue;                     
                        
                }
                
-               if (DateTimeStartDataTimeZoneID.size() > 0){
+               if (dateTimeStartDataTimeZoneID.size() > 0){
                
-                       DataLine += ";TZID=";
-                       DataLine += DateTimeStartDataTimeZoneID;                        
+                       dataLine += ";TZID=";
+                       dataLine += dateTimeStartDataTimeZoneID;                        
                        
                }
                
-               if (DateTimeStartDataTokens.size() > 0){
+               if (dateTimeStartDataTokens.size() > 0){
                
-                       DataLine += ";";
-                       DataLine += DateTimeStartDataTokens;
+                       dataLine += ";";
+                       dataLine += dateTimeStartDataTokens;
                        
                }
 
-               DataLine += ":";
-               DataLine += DateTimeStartData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += dateTimeStartData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
                
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the LAST-MODIFIED value.
        
-       if (LastModifiedData.size() > 0){
+       if (lastModifiedData.size() > 0){
                
-               if (LastModifiedTokens.size() > 0){
+               if (lastModifiedTokens.size() > 0){
                
-                       DataLine += "LAST-MODIFIED;";
-                       DataLine += LastModifiedTokens;
+                       dataLine += "LAST-MODIFIED;";
+                       dataLine += lastModifiedTokens;
                        
                } else {
 
-                       DataLine += "LAST-MODIFIED";
+                       dataLine += "LAST-MODIFIED";
                        
                }
 
-               DataLine += ":";
-               DataLine += LastModifiedData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += lastModifiedData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
                
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the ORGANIZER value.
        
-       if (OrganiserData.size() > 0){
+       if (organiserData.size() > 0){
                
-               DataLine += "ORGANIZER";
+               dataLine += "ORGANIZER";
                
-               if (OrganiserDataCommonName.size() > 0){
+               if (organiserDataCommonName.size() > 0){
                
-                       DataLine += ";CN=";
-                       DataLine += OrganiserDataCommonName;
+                       dataLine += ";CN=";
+                       dataLine += organiserDataCommonName;
                        
                }
 
-               if (OrganiserDataDirectoryEntry.size() > 0){
+               if (organiserDataDirectoryEntry.size() > 0){
                
-                       DataLine += ";DIR=\"";
-                       DataLine += OrganiserDataDirectoryEntry;
-                       DataLine += "\"";
+                       dataLine += ";DIR=\"";
+                       dataLine += organiserDataDirectoryEntry;
+                       dataLine += "\"";
                        
                }
                
-               if (OrganiserDataSentByParam.size() > 0){
+               if (organiserDataSentByParam.size() > 0){
                
-                       DataLine += ";SENT-BY=\"";
-                       DataLine += OrganiserDataSentByParam;                   
-                       DataLine += "\"";
+                       dataLine += ";SENT-BY=\"";
+                       dataLine += organiserDataSentByParam;                   
+                       dataLine += "\"";
                        
                }
                
-               if (OrganiserDataLanguage.size() > 0){
+               if (organiserDataLanguage.size() > 0){
                
-                       DataLine += ";LANGUAGE=";
-                       DataLine += OrganiserDataLanguage;                      
+                       dataLine += ";LANGUAGE=";
+                       dataLine += organiserDataLanguage;                      
                        
                }
                
                if (OrganiserDataTokens.size() > 0){
                
-                       DataLine += ";";
-                       DataLine += OrganiserDataTokens;
+                       dataLine += ";";
+                       dataLine += organiserDataTokens;
                        
                }
                
-               DataLine += ":";
-               DataLine += OrganiserData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += organiserData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
 
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the RECURRENCE-ID value.
        
-       if (RecurranceIDData.size() > 0){
+       if (recurranceIDData.size() > 0){
                
-               DataLine += "RECURRENCE-ID";
+               dataLine += "RECURRENCE-ID";
 
-               if (RecurranceIDDataTimeZoneParam.size() > 0){
+               if (recurranceIDDataTimeZoneParam.size() > 0){
                
-                       DataLine += ";TZID=";
-                       DataLine += RecurranceIDDataTimeZoneParam;                      
+                       dataLine += ";TZID=";
+                       dataLine += recurranceIDDataTimeZoneParam;                      
                        
                }
                
-               if (RecurranceIDDataRangeParam.size() > 0){
+               if (recurranceIDDataRangeParam.size() > 0){
                
-                       DataLine += ";RANGE=";
-                       DataLine += RecurranceIDDataRangeParam;                 
+                       dataLine += ";RANGE=";
+                       dataLine += recurranceIDDataRangeParam;                 
                        
                }
                
-               if (RecurranceIDDataValue.size() > 0){
+               if (recurranceIDDataValue.size() > 0){
                
-                       DataLine += ";VALUE=";
-                       DataLine += RecurranceIDDataValue;                      
+                       dataLine += ";VALUE=";
+                       dataLine += recurranceIDDataValue;
                        
                }
                
-               if (RecurranceIDDataTokens.size() > 0){
+               if (recurranceIDDataTokens.size() > 0){
                
-                       DataLine += ";";
-                       DataLine += RecurranceIDDataTokens;
+                       dataLine += ";";
+                       dataLine += recurranceIDDataTokens;
                        
                }
                
-               DataLine += ":";
-               DataLine += RecurranceIDData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += recurranceIDData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
 
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the SEQUENCE value.
        
-       if (SequenceData > -1 && SequenceData < 10){
+       if (sequenceData > -1 && sequenceData < 10){
                
-               DataLine += "SEQUENCE";
+               dataLine += "SEQUENCE";
                
-               if (SequenceTokens.size() > 0){
+               if (sequenceTokens.size() > 0){
                
-                       DataLine += ";";
-                       DataLine += SequenceTokens;
+                       dataLine += ";";
+                       dataLine += sequenceTokens;
                        
                }
                
-               DataLine += ":";
-               DataLine += to_string(SequenceData);
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += to_string(sequenceData);
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
 
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the STATUS value.
        
-       if (StatusData.size() > 0){
+       if (statusData.size() > 0){
                
-               DataLine += "STATUS";
+               dataLine += "STATUS";
                
-               if (StatusLanguage.size() > 0){
+               if (statusLanguage.size() > 0){
                
-                       DataLine += ";LANGUAGE=";
-                       DataLine += StatusLanguage;                     
+                       dataLine += ";LANGUAGE=";
+                       dataLine += statusLanguage;                     
                        
                }
                
-               if (StatusTokens.size() > 0){
+               if (statusTokens.size() > 0){
                
-                       DataLine += ";";
-                       DataLine += StatusTokens;
+                       dataLine += ";";
+                       dataLine += statusTokens;
                        
                }
                
-               DataLine += ":";
-               DataLine += StatusData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += statusData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
 
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the URL value.
        
-       if (URLData.size() > 0){
+       if (urlData.size() > 0){
                
-               DataLine += "URL";
+               dataLine += "URL";
 
-               if (URLDataTokens.size() > 0){
+               if (urlDataTokens.size() > 0){
                
-                       DataLine += ";";
-                       DataLine += URLDataTokens;
+                       dataLine += ";";
+                       dataLine += urlDataTokens;
                        
                }
                
-               DataLine += ":";
-               DataLine += URLData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += urlData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
 
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the RRULE value.
        
-       if (RecurranceRuleData.size() > 0){
+       if (recurranceRuleData.size() > 0){
                
-               DataLine += "RRULE";
+               dataLine += "RRULE";
 
-               if (RecurranceRuleDataTokens.size() > 0){
+               if (recurranceRuleDataTokens.size() > 0){
                
-                       DataLine += ";";
-                       DataLine += RecurranceRuleDataTokens;
+                       dataLine += ";";
+                       dataLine += recurranceRuleDataTokens;
                        
                }
                
-               DataLine += ":";
-               DataLine += RecurranceRuleData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += recurranceRuleData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *SaveData += dataLineProcessed;
 
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
        
        // Process the ATTACH values.
        
-       if (AttachList.size() > 0){
+       if (attachList.size() > 0){
                
-               for (int AttachListSeek = 0; AttachListSeek < AttachList.size();
-                       AttachListSeek++){
+               for (int attachListSeek = 0; attachListSeek < attachList.size();
+                       attachListSeek++){
                        
-                       DataLine += "ATTACH";
+                       dataLine += "ATTACH";
 
-                       if (AttachListFormatType[AttachListSeek].size() > 0){
+                       if (attachListFormatType[attachListSeek].size() > 0){
                
-                               DataLine += ";FMTTYPE=";
-                               DataLine += AttachListFormatType[AttachListSeek];
+                               dataLine += ";FMTTYPE=";
+                               dataLine += attachListFormatType[attachListSeek];
                        
                        }
                                
-                       if (AttachListValue[AttachListSeek].size() > 0){
+                       if (attachListValue[attachListSeek].size() > 0){
                
-                               DataLine += ";VALUE=";
-                               DataLine += AttachListValue[AttachListSeek];
+                               dataLine += ";VALUE=";
+                               dataLine += attachListValue[attachListSeek];
                        
                        }
                                
-                       if (AttachListEncoding[AttachListSeek].size() > 0){
+                       if (attachListEncoding[attachListSeek].size() > 0){
                
-                               DataLine += ";ENCODING=";
-                               DataLine += AttachListEncoding[AttachListSeek];
+                               dataLine += ";ENCODING=";
+                               dataLine += attachListEncoding[attachListSeek];
                        
                        }
                                
-                       if (AttachListTokens[AttachListSeek].size() > 0){
+                       if (attachListTokens[attachListSeek].size() > 0){
                
-                               DataLine += ";";
-                               DataLine += AttachListTokens[AttachListSeek];
+                               dataLine += ";";
+                               dataLine += attachListTokens[attachListSeek];
                        
                        }
                
-                       DataLine += ":";
-                       DataLine += AttachList[AttachListSeek];
-                       DataLine += "\n";
+                       dataLine += ":";
+                       dataLine += attachList[attachListSeek];
+                       dataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
                
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
 
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                                
                }
                
@@ -486,113 +486,113 @@ void CalendarJournalObject::SaveObjectData(string *SaveData){
        
        // Process the ATTENDEE value.
        
-       if (AttendeeList.size() > 0){
+       if (attendeeList.size() > 0){
                
-               for (int AttendeeListSeek = 0; AttendeeListSeek < AttendeeList.size();
-                       AttendeeListSeek++){
+               for (int attendeeListSeek = 0; attendeeListSeek < attendeeList.size();
+                       attendeeListSeek++){
        
-                       DataLine += "ATTENDEE";
+                       dataLine += "ATTENDEE";
 
-                       if (AttendeeListMember[AttendeeListSeek].size() > 0){
+                       if (attendeeListMember[attendeeListSeek].size() > 0){
                
-                               DataLine += ";MEMBER=\"";
-                               DataLine += AttendeeListMember[AttendeeListSeek];
-                               DataLine += "\"";
+                               dataLine += ";MEMBER=\"";
+                               dataLine += attendeeListMember[attendeeListSeek];
+                               dataLine += "\"";
                        
                        }
                                
-                       if (AttendeeListDelegatedFrom[AttendeeListSeek].size() > 0){
+                       if (attendeeListDelegatedFrom[attendeeListSeek].size() > 0){
                
-                               DataLine += ";DELEGATED-FROM=\"";
-                               DataLine += AttendeeListDelegatedFrom[AttendeeListSeek];
-                               DataLine += "\"";
+                               dataLine += ";DELEGATED-FROM=\"";
+                               dataLine += attendeeListDelegatedFrom[attendeeListSeek];
+                               dataLine += "\"";
                        
                        }
 
-                       if (AttendeeListDelegatedTo[AttendeeListSeek].size() > 0){
+                       if (attendeeListDelegatedTo[attendeeListSeek].size() > 0){
                
-                               DataLine += ";DELEGATED-TO=\"";
-                               DataLine += AttendeeListDelegatedTo[AttendeeListSeek];
-                               DataLine += "\"";
+                               dataLine += ";DELEGATED-TO=\"";
+                               dataLine += attendeeListDelegatedTo[attendeeListSeek];
+                               dataLine += "\"";
                        
                        }
 
-                       if (AttendeeListRole[AttendeeListSeek].size() > 0){
+                       if (attendeeListRole[attendeeListSeek].size() > 0){
                
-                               DataLine += ";ROLE=";
-                               DataLine += AttendeeListRole[AttendeeListSeek];
+                               dataLine += ";ROLE=";
+                               dataLine += attendeeListRole[attendeeListSeek];
                        
                        }
                        
-                       if (AttendeeListRSVP[AttendeeListSeek].size() > 0){
+                       if (attendeeListRSVP[attendeeListSeek].size() > 0){
                
-                               DataLine += ";RSVP=";
-                               DataLine += AttendeeListRSVP[AttendeeListSeek];
+                               dataLine += ";RSVP=";
+                               dataLine += attendeeListRSVP[attendeeListSeek];
                        
                        }
                        
-                       if (AttendeeListDirectoryEntry[AttendeeListSeek].size() > 0){
+                       if (attendeeListDirectoryEntry[attendeeListSeek].size() > 0){
                
-                               DataLine += ";DIR=\"";
-                               DataLine += AttendeeListDirectoryEntry[AttendeeListSeek];
-                               DataLine += "\"";
+                               dataLine += ";DIR=\"";
+                               dataLine += attendeeListDirectoryEntry[attendeeListSeek];
+                               dataLine += "\"";
                        
                        }
                        
-                       if (AttendeeListSentBy[AttendeeListSeek].size() > 0){
+                       if (attendeeListSentBy[attendeeListSeek].size() > 0){
                                
-                               DataLine += ";SENT-BY=\"";
-                               DataLine += AttendeeListSentBy[AttendeeListSeek];
-                               DataLine += "\"";
+                               dataLine += ";SENT-BY=\"";
+                               dataLine += attendeeListSentBy[attendeeListSeek];
+                               dataLine += "\"";
                                
                        }
 
-                       if (AttendeeListCommonName[AttendeeListSeek].size() > 0){
+                       if (attendeeListCommonName[attendeeListSeek].size() > 0){
                                
-                               DataLine += ";CN=\"";
-                               DataLine += AttendeeListCommonName[AttendeeListSeek];
-                               DataLine += "\"";
+                               dataLine += ";CN=\"";
+                               dataLine += attendeeListCommonName[attendeeListSeek];
+                               dataLine += "\"";
                                
                        }
 
-                       if (AttendeeListCalendarUserType[AttendeeListSeek].size() > 0){
+                       if (attendeeListCalendarUserType[attendeeListSeek].size() > 0){
                                
-                               DataLine += ";CUTYPE=";
-                               DataLine += AttendeeListCalendarUserType[AttendeeListSeek];
+                               dataLine += ";CUTYPE=";
+                               dataLine += attendeeListCalendarUserType[attendeeListSeek];
                                
                        }
                        
-                       if (AttendeeListParticipationStatus[AttendeeListSeek].size() > 0){
+                       if (attendeeListParticipationStatus[attendeeListSeek].size() > 0){
                                
-                               DataLine += ";PARTSTAT=";
-                               DataLine += AttendeeListParticipationStatus[AttendeeListSeek];
+                               dataLine += ";PARTSTAT=";
+                               dataLine += attendeeListParticipationStatus[attendeeListSeek];
                                
                        }
                        
-                       if (AttendeeListLanguage[AttendeeListSeek].size() > 0){
+                       if (attendeeListLanguage[attendeeListSeek].size() > 0){
                                
-                               DataLine += ";LANGUAGE=";
-                               DataLine += AttendeeListLanguage[AttendeeListSeek];
+                               dataLine += ";LANGUAGE=";
+                               dataLine += attendeeListLanguage[attendeeListSeek];
                                
                        }
                        
-                       if (AttendeeListTokens[AttendeeListSeek].size() > 0){
+                       if (attendeeListTokens[attendeeListSeek].size() > 0){
                
-                               DataLine += ";";
-                               DataLine += AttendeeListTokens[AttendeeListSeek];
+                               dataLine += ";";
+                               dataLine += attendeeListTokens[attendeeListSeek];
                        
                        }
                                
-                       DataLine += ":";
-                       DataLine += AttendeeList[AttendeeListSeek];
-                       DataLine += "\n";
+                       dataLine += ":";
+                       dataLine += attendeeList[attendeeListSeek];
+                       dataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
                
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
 
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                                
                }
                        
@@ -600,37 +600,37 @@ void CalendarJournalObject::SaveObjectData(string *SaveData){
        
        // Process the CATEGORIES value.
        
-       if (CategoriesList.size() > 0){
+       if (categoriesList.size() > 0){
                
-               for (int CategoriesListSeek = 0; CategoriesListSeek < CategoriesList.size();
-                       CategoriesListSeek++){
+               for (int categoriesListSeek = 0; categoriesListSeek < categoriesList.size();
+                       categoriesListSeek++){
        
-                       DataLine += "CATEGORIES";
+                       dataLine += "CATEGORIES";
                                
-                       if (CategoriesListLanguage[CategoriesListSeek].size() > 0){
+                       if (categoriesListLanguage[categoriesListSeek].size() > 0){
                
-                               DataLine += ";LANGUAGE=";
-                               DataLine += CategoriesListLanguage[CategoriesListSeek];
+                               dataLine += ";LANGUAGE=";
+                               dataLine += categoriesListLanguage[categoriesListSeek];
                        
                        }                       
                        
-                       if (CategoriesListTokens[CategoriesListSeek].size() > 0){
+                       if (categoriesListTokens[categoriesListSeek].size() > 0){
                
-                               DataLine += ";";
-                               DataLine += CategoriesListTokens[CategoriesListSeek];
+                               dataLine += ";";
+                               dataLine += categoriesListTokens[categoriesListSeek];
                        
                        }
                                
-                       DataLine += ":";
-                       DataLine += CategoriesList[CategoriesListSeek];
-                       DataLine += "\n";
+                       dataLine += ":";
+                       dataLine += categoriesList[categoriesListSeek];
+                       dataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
                
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
 
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                                
                }
                
@@ -638,45 +638,45 @@ void CalendarJournalObject::SaveObjectData(string *SaveData){
        
        // Process the COMMENT value.
        
-       if (CommentList.size() > 0){
+       if (commentList.size() > 0){
                
-               for (int CommentListSeek = 0; CommentListSeek < CommentList.size();
-                       CommentListSeek++){
+               for (int commentListSeek = 0; commentListSeek < commentList.size();
+                       commentListSeek++){
        
-                       DataLine += "COMMENT";
+                       dataLine += "COMMENT";
                        
-                       if (CommentListAltRep[CommentListSeek].size() > 0){
+                       if (commentListAltRep[commentListSeek].size() > 0){
                
-                               DataLine += ";ALTREP=\"";
-                               DataLine += CommentListAltRep[CommentListSeek];
-                               DataLine += "\"";
+                               dataLine += ";ALTREP=\"";
+                               dataLine += commentListAltRep[commentListSeek];
+                               dataLine += "\"";
                        
                        }
                                
-                       if (CommentListLanguage[CommentListSeek].size() > 0){
+                       if (commentListLanguage[commentListSeek].size() > 0){
                
-                               DataLine += ";LANGUAGE=";
-                               DataLine += CommentListLanguage[CommentListSeek];
+                               dataLine += ";LANGUAGE=";
+                               dataLine += commentListLanguage[commentListSeek];
                        
                        }
                        
-                       if (CommentListTokens[CommentListSeek].size() > 0){
+                       if (commentListTokens[commentListSeek].size() > 0){
                
-                               DataLine += ";";
-                               DataLine += CommentListTokens[CommentListSeek];
+                               dataLine += ";";
+                               dataLine += commentListTokens[commentListSeek];
                        
                        }
                                
-                       DataLine += ":";
-                       DataLine += CommentList[CommentListSeek];
-                       DataLine += "\n";
+                       dataLine += ":";
+                       dataLine += commentList[commentListSeek];
+                       dataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
                
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
 
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                                
                }
                
@@ -684,45 +684,45 @@ void CalendarJournalObject::SaveObjectData(string *SaveData){
        
        // Process the CONTACT value.
        
-       if (ContactList.size() > 0){
+       if (contactList.size() > 0){
                
-               for (int ContactListSeek = 0; ContactListSeek < ContactList.size();
-                       ContactListSeek++){
+               for (int contactListSeek = 0; contactListSeek < contactList.size();
+                       contactListSeek++){
        
-                       DataLine += "CONTACT";
+                       dataLine += "CONTACT";
                        
-                       if (ContactListAltRep[ContactListSeek].size() > 0){
+                       if (contactListAltRep[contactListSeek].size() > 0){
                
-                               DataLine += ";ALTREP=\"";
-                               DataLine += ContactListAltRep[ContactListSeek];
-                               DataLine += "\"";
+                               dataLine += ";ALTREP=\"";
+                               dataLine += contactListAltRep[contactListSeek];
+                               dataLine += "\"";
                        
                        }
                                
-                       if (ContactListLanguage[ContactListSeek].size() > 0){
+                       if (contactListLanguage[contactListSeek].size() > 0){
                
-                               DataLine += ";LANGUAGE=";
-                               DataLine += ContactListLanguage[ContactListSeek];
+                               dataLine += ";LANGUAGE=";
+                               dataLine += contactListLanguage[contactListSeek];
                        
                        }
                        
-                       if (ContactListTokens[ContactListSeek].size() > 0){
+                       if (contactListTokens[contactListSeek].size() > 0){
                
-                               DataLine += ";";
-                               DataLine += ContactListTokens[ContactListSeek];
+                               dataLine += ";";
+                               dataLine += contactListTokens[contactListSeek];
                        
                        }
                                
-                       DataLine += ":";
-                       DataLine += ContactList[ContactListSeek];
-                       DataLine += "\n";
+                       dataLine += ":";
+                       dataLine += contactList[contactListSeek];
+                       dataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
                
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
 
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                                
                }
                
@@ -730,45 +730,45 @@ void CalendarJournalObject::SaveObjectData(string *SaveData){
        
        // Process the DESCRIPTION values.
        
-       if (DescriptionList.size() > 0){
+       if (descriptionList.size() > 0){
        
-               for (int DescriptionListSeek = 0; DescriptionListSeek < DescriptionList.size() > 0;
-                       DescriptionListSeek++){
+               for (int descriptionListSeek = 0; descriptionListSeek < descriptionList.size() > 0;
+                       descriptionListSeek++){
                
-                       DataLine += "DESCRIPTION";
+                       dataLine += "DESCRIPTION";
                
-                       if (DescriptionListAltRep[DescriptionListSeek].size() > 0){
+                       if (descriptionListAltRep[descriptionListSeek].size() > 0){
                
-                               DataLine += ";ALTREP=\"";
-                               DataLine += DescriptionListAltRep[DescriptionListSeek];
-                               DataLine += "\"";
+                               dataLine += ";ALTREP=\"";
+                               dataLine += descriptionListAltRep[descriptionListSeek];
+                               dataLine += "\"";
                        
                        }
                
-                       if (DescriptionListLanguage[DescriptionListSeek].size() > 0){
+                       if dDescriptionListLanguage[descriptionListSeek].size() > 0){
                
-                               DataLine += ";LANGUAGE=";
-                               DataLine += DescriptionListLanguage[DescriptionListSeek];
+                               dataLine += ";LANGUAGE=";
+                               dataLine += descriptionListLanguage[descriptionListSeek];
                        
                        }
                
-                       if (DescriptionListTokens[DescriptionListSeek].size() > 0){
+                       if (descriptionListTokens[descriptionListSeek].size() > 0){
                
-                               DataLine += ";";
-                               DataLine += DescriptionListTokens[DescriptionListSeek];
+                               dataLine += ";";
+                               dataLine += descriptionListTokens[descriptionListSeek];
                        
                        }
 
-                       DataLine += ":";
-                       DataLine += DescriptionList[DescriptionListSeek];
-                       DataLine += "\n";
+                       dataLine += ":";
+                       dataLine += descriptionList[descriptionListSeek];
+                       dataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
                
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
                
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                
                }
        
@@ -776,44 +776,44 @@ void CalendarJournalObject::SaveObjectData(string *SaveData){
        
        // Process the EXDATE value.
        
-       if (ExcludeDateData.size() > 0){
+       if (excludeDateData.size() > 0){
                
-               for (int ExcludeDateDataSeek = 0; ExcludeDateDataSeek < ExcludeDateData.size();
-                       ExcludeDateDataSeek++){
+               for (int excludeDateDataSeek = 0; excludeDateDataSeek < excludeDateData.size();
+                       excludeDateDataSeek++){
        
-                       DataLine += "EXDATE";
+                       dataLine += "EXDATE";
                                
-                       if (ExcludeDateDataTimeZoneParam[ExcludeDateDataSeek].size() > 0){
+                       if (excludeDateDataTimeZoneParam[excludeDateDataSeek].size() > 0){
                
-                               DataLine += ";TZID=";
-                               DataLine += ExcludeDateDataTimeZoneParam[ExcludeDateDataSeek];
+                               dataLine += ";TZID=";
+                               dataLine += excludeDateDataTimeZoneParam[excludeDateDataSeek];
                        
                        }
                        
-                       if (ExcludeDateDataValue[ExcludeDateDataSeek].size() > 0){
+                       if (excludeDateDataValue[excludeDateDataSeek].size() > 0){
                
-                               DataLine += ";VALUE=";
-                               DataLine += ExcludeDateDataValue[ExcludeDateDataSeek];
+                               dataLine += ";VALUE=";
+                               dataLine += excludeDateDataValue[excludeDateDataSeek];
                        
                        }
                        
-                       if (ExcludeDateDataTokens[ExcludeDateDataSeek].size() > 0){
+                       if (excludeDateDataTokens[excludeDateDataSeek].size() > 0){
                
-                               DataLine += ";";
-                               DataLine += ExcludeDateDataTokens[ExcludeDateDataSeek];
+                               dataLine += ";";
+                               dataLine += excludeDateDataTokens[excludeDateDataSeek];
                        
                        }
                                
-                       DataLine += ":";
-                       DataLine += ExcludeDateData[ExcludeDateDataSeek];
-                       DataLine += "\n";
+                       dataLine += ":";
+                       dataLine += excludeDateData[excludeDateDataSeek];
+                       dataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
                
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
 
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                                
                }
                
@@ -821,37 +821,37 @@ void CalendarJournalObject::SaveObjectData(string *SaveData){
        
        // Process the RELATED-TO value.
        
-       if (RelatedToData.size() > 0){
+       if (relatedToData.size() > 0){
                
-               for (int RequestToDataSeek = 0; RequestToDataSeek < RelatedToData.size();
-                       RequestToDataSeek++){
+               for (int requestToDataSeek = 0; requestToDataSeek < relatedToData.size();
+                       requestToDataSeek++){
        
-                       DataLine += "RELATED-TO";
+                       dataLine += "RELATED-TO";
                        
-                       if (RelatedToDataRelationType[RequestToDataSeek].size() > 0){
+                       if (relatedToDataRelationType[requestToDataSeek].size() > 0){
                
-                               DataLine += ";RELTYPE=";
-                               DataLine += RelatedToDataRelationType[RequestToDataSeek];
+                               dataLine += ";RELTYPE=";
+                               dataLine += relatedToDataRelationType[requestToDataSeek];
                        
                        }
                        
-                       if (RelatedToDataTokens[RequestToDataSeek].size() > 0){
+                       if (relatedToDataTokens[requestToDataSeek].size() > 0){
                
-                               DataLine += ";";
-                               DataLine += RelatedToDataTokens[RequestToDataSeek];
+                               dataLine += ";";
+                               dataLine += RelatedToDataTokens[requestToDataSeek];
                        
                        }
                                
-                       DataLine += ":";
-                       DataLine += RelatedToData[RequestToDataSeek];
-                       DataLine += "\n";
+                       dataLine += ":";
+                       dataLine += relatedToData[requestToDataSeek];
+                       dataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
                
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
 
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                                
                }
                
@@ -859,44 +859,44 @@ void CalendarJournalObject::SaveObjectData(string *SaveData){
        
        // Process the RDATE value.
        
-       if (RecurranceDateData.size() > 0){
+       if (recurranceDateData.size() > 0){
                
-               for (int RecurranceDateDataSeek = 0; RecurranceDateDataSeek < RecurranceDateData.size();
-                       RecurranceDateDataSeek++){
+               for (int recurranceDateDataSeek = 0; recurranceDateDataSeek < recurranceDateData.size();
+                       recurranceDateDataSeek++){
        
-                       DataLine += "RDATE";
+                       dataLine += "RDATE";
                        
-                       if (RecurranceDateDataValue[RecurranceDateDataSeek].size() > 0){
+                       if (recurranceDateDataValue[recurranceDateDataSeek].size() > 0){
                
-                               DataLine += ";VALUE=";
-                               DataLine += RecurranceDateDataValue[RecurranceDateDataSeek];
+                               dataLine += ";VALUE=";
+                               dataLine += recurranceDateDataValue[recurranceDateDataSeek];
                        
                        }
                                
-                       if (RecurranceDateDataTimeZoneParam[RecurranceDateDataSeek].size() > 0){
-               
-                               DataLine += ";TZID=";
-                               DataLine += RecurranceDateDataTimeZoneParam[RecurranceDateDataSeek];
+                       if (recurranceDateDataTimeZoneParam[recurranceDateDataSeek].size() > 0){
+       
+                               dataLine += ";TZID=";
+                               dataLine += recurranceDateDataTimeZoneParam[recurranceDateDataSeek];
                        
                        }
                        
-                       if (RecurranceDateDataTokens[RecurranceDateDataSeek].size() > 0){
+                       if (recurranceDateDataTokens[recurranceDateDataSeek].size() > 0){
                
-                               DataLine += ";";
-                               DataLine += RecurranceDateDataTokens[RecurranceDateDataSeek];
+                               dataLine += ";";
+                               dataLine += recurranceDateDataTokens[recurranceDateDataSeek];
                        
                        }
                                
-                       DataLine += ":";
-                       DataLine += RecurranceDateData[RecurranceDateDataSeek];
-                       DataLine += "\n";
+                       dataLine += ":";
+                       dataLine += recurranceDateData[recurranceDateDataSeek];
+                       dataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
                
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
 
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                                
                }
                
@@ -904,37 +904,37 @@ void CalendarJournalObject::SaveObjectData(string *SaveData){
        
        // Process the REQUEST-STATUS value.
        
-       if (RequestStatusData.size() > 0){
+       if (requestStatusData.size() > 0){
                
-               for (int RequestStatusDataSeek = 0; RequestStatusDataSeek < RequestStatusData.size();
-                       RequestStatusDataSeek++){
+               for (int requestStatusDataSeek = 0; requestStatusDataSeek < requestStatusData.size();
+                       requestStatusDataSeek++){
        
-                       DataLine += "REQUEST-STATUS";
+                       dataLine += "REQUEST-STATUS";
                        
-                       if (RequestStatusLanguage[RequestStatusDataSeek].size() > 0){
+                       if (requestStatusLanguage[requestStatusDataSeek].size() > 0){
                
-                               DataLine += ";LANGUAGE=";
-                               DataLine += RequestStatusLanguage[RequestStatusDataSeek];
+                               dataLine += ";LANGUAGE=";
+                               dataLine += requestStatusLanguage[requestStatusDataSeek];
                        
                        }
                        
-                       if (RequestStatusTokens[RequestStatusDataSeek].size() > 0){
+                       if (requestStatusTokens[requestStatusDataSeek].size() > 0){
                
-                               DataLine += ";";
-                               DataLine += RequestStatusTokens[RequestStatusDataSeek];
+                               dataLine += ";";
+                               dataLine += requestStatusTokens[requestStatusDataSeek];
                        
                        }
                                
-                       DataLine += ":";
-                       DataLine += RequestStatusData[RequestStatusDataSeek];
-                       DataLine += "\n";
+                       dataLine += ":";
+                       dataLine += requestStatusData[requestStatusDataSeek];
+                       dataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
                
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
 
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                                
                }
                
@@ -942,27 +942,27 @@ void CalendarJournalObject::SaveObjectData(string *SaveData){
        
        // Process the X-Token values.
        
-       if (XTokensData.size() > 0){
+       if (xTokensData.size() > 0){
                                
-               for (int XTokenSeek = 0; XTokenSeek < XTokensData.size();
-                       XTokenSeek++){
+               for (int xTokenSeek = 0; xTokenSeek < xTokensData.size();
+                       xTokenSeek++){
        
-                       DataLine += XTokensDataTokens[XTokenSeek];              
-                       DataLine += ":";
-                       DataLine += XTokensData[XTokenSeek];
-                       DataLine += "\n";
+                       dataLine += xTokensDataTokens[xTokenSeek];
+                       dataLine += ":";
+                       dataLine += xTokensData[xTokenSeek];
+                       dDataLine += "\n";
                
-                       DataLineProcessed = OutputText(&DataLine);
+                       dataLineProcessed = OutputText(&dataLine);
        
-                       *SaveData += DataLineProcessed;
+                       *saveData += dataLineProcessed;
 
-                       DataLine.clear();
-                       DataLineProcessed.clear();
+                       dataLine.clear();
+                       dataLineProcessed.clear();
                                        
                }
                                
        }
        
-       *SaveData += "END:VJOURNAL\n";
+       *saveData += "END:VJOURNAL\n";
        
 }
\ No newline at end of file
index beb9755..616b5a5 100644 (file)
@@ -22,127 +22,127 @@ using namespace std;
 
 CalendarObjectValidResult CalendarJournalObject::ValidObject(){
 
-       bool ValidBegin = false;
-       bool ValidEnd = false;
-       bool ValidDateTimeStamp = false;
-       bool ValidUniqueID = false;
-       int SeekCount = 0;
-       string PropertyName;
+       bool validBegin = false;
+       bool validEnd = false;
+       bool validDateTimeStamp = false;
+       bool validUniqueID = false;
+       int seekCount = 0;
+       string propertyName;
        
        // Look for BEGIN:VJOURNAL.
        
-       for (vector<string>::iterator iter = ObjectName.begin();
-               iter != ObjectName.end(); iter++){
+       for (vector<string>::iterator iter = objectName.begin();
+               iter != objectName.end(); iter++){
        
-               if (ObjectName[SeekCount] == "BEGIN" &&
-                       ObjectData[SeekCount] == "VJOURNAL"){
+               if (objectName[seekCount] == "BEGIN" &&
+                       objectData[seekCount] == "VJOURNAL"){
                        
-                       if (ValidBegin == false){
-                               ValidBegin = true;
+                       if (validBegin == false){
+                               validBegin = true;
                        } else {
                                return CALENDAROBJECTVALID_INVALIDFORMAT;
                        }
                                
                }
                
-               if (ObjectName[SeekCount] == "END" &&
-                       ObjectData[SeekCount] == "VJOURNAL" &&
-                       ValidBegin == false){
+               if (objectName[seekCount] == "END" &&
+                       objectData[seekCount] == "VJOURNAL" &&
+                       validBegin == false){
                
                        return CALENDAROBJECTVALID_INVALIDFORMAT;
                                
                }
                
-               SeekCount++;
+               seekCount++;
                        
        }
        
-       SeekCount = 0;
+       seekCount = 0;
        
        // Look for DTSTAMP.
        
-       for (vector<string>::iterator iter = ObjectName.begin();
-               iter != ObjectName.end(); iter++){
+       for (vector<string>::iterator iter = objectName.begin();
+               iter != objectName.end(); iter++){
                        
                try{
-                       PropertyName = ObjectName[SeekCount].substr(0,7);
+                       propertyName = objectName[seekCount].substr(0,7);
                }
                        
                catch(const out_of_range& oor){
                        continue;
                }
                
-               if (PropertyName == "DTSTAMP"){
+               if (propertyName == "DTSTAMP"){
                        
-                       if (ValidDateTimeStamp == false){
-                               ValidDateTimeStamp = true;
+                       if (validDateTimeStamp == false){
+                               validDateTimeStamp = true;
                        } else {
                                return CALENDAROBJECTVALID_INVALIDFORMAT;
                        }
                                
                }
                        
-               SeekCount++;
+               seekCount++;
 
        }
        
-       SeekCount = 0;
+       seekCount = 0;
        
        // Look for UID.
        
-       for (vector<string>::iterator iter = ObjectName.begin();
-               iter != ObjectName.end(); iter++){
+       for (vector<string>::iterator iter = objectName.begin();
+               iter != objectName.end(); iter++){
        
                try{
-                       PropertyName = ObjectName[SeekCount].substr(0,3);
+                       propertyName = objectName[seekCount].substr(0,3);
                }
                
                catch(const out_of_range& oor){
                        continue;
                }
                        
-               if (PropertyName == "UID"){
+               if (propertyName == "UID"){
                        
-                       if (ValidUniqueID == false){
-                               ValidUniqueID = true;
+                       if (validUniqueID == false){
+                               validUniqueID = true;
                        } else {
                                return CALENDAROBJECTVALID_INVALIDFORMAT;
                        }
                                
                }
                        
-               SeekCount++;
+               seekCount++;
                        
        }
        
-       SeekCount = 0;
+       seekCount = 0;
                
        // Look for END:VJOURNAL.
        
-       for (vector<string>::iterator iter = ObjectName.begin();
-               iter != ObjectName.end(); iter++){
+       for (vector<string>::iterator iter = objectName.begin();
+               iter != objectName.end(); iter++){
        
-               if (ObjectName[SeekCount] == "END" &&
-                       ObjectData[SeekCount] == "VJOURNAL"){
+               if (objectName[SeekCount] == "END" &&
+                       objectData[SeekCount] == "VJOURNAL"){
                        
-                       if (ValidEnd == false){
-                               ValidEnd = true;
+                       if (validEnd == false){
+                               validEnd = true;
                        } else {
                                return CALENDAROBJECTVALID_INVALIDFORMAT;
                        }
                                
                }
                        
-               SeekCount++;
+               seekCount++;
                        
        }
        
        // Check if the VJOURNAL is valid.
        
-       if (ValidBegin == true && 
-               ValidEnd == true && 
-               ValidDateTimeStamp == true &&
-               ValidUniqueID == true){
+       if (validBegin == true && 
+               validEnd == true && 
+               validDateTimeStamp == true &&
+               validUniqueID == true){
                        
                return CALENDAROBJECTVALID_OK;
                        
@@ -158,257 +158,257 @@ void CalendarJournalObject::ProcessData(){
 
        // Process the data.
        
-       multimap<string,string> DataReceived;
-       map<string,string> PropertyData;
+       multimap<string,string> dataReceived;
+       map<string,string> propertyData;
        string *PropertyNameData = nullptr;
-       int ObjectSeekCount = 0;
+       int objectSeekCount = 0;
 
        // Get the Date Time Stamp (DTSTAMP).
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "DTSTAMP");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "DTSTAMP");
        
        // Process the data from DTSTAMP.
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
                try {
-                       DateTimeStampTokens = DataReceived.begin()->first.substr(8);
+                       dateTimeStampTokens = dataReceived.begin()->first.substr(8);
                }
                
                catch(const out_of_range &oor){
                        // Do nothing as there is no data.
                }               
                
-               DateTimeStampData = DataReceived.begin()->second;
+               dateTimeStampData = dataReceived.begin()->second;
                
        }
        
        // Get the Unique ID (UID).
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "UID");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "UID");
        
        // Process the data from UID.
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
                try {
-                       UniqueIDTokens = DataReceived.begin()->first.substr(4);
+                       uniqueIDTokens = dataReceived.begin()->first.substr(4);
                }
                
                catch(const out_of_range &oor){
                        // Do nothing as there is no data.
                }               
                
-               UniqueID = DataReceived.begin()->second;
+               uniqueID = dataReceived.begin()->second;
                
        }
        
        // Process the data from CLASS.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "CLASS");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "CLASS");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
                try {
-                       ClassDataTokens = DataReceived.begin()->first.substr(6);
+                       classDataTokens = dataReceived.begin()->first.substr(6);
                }
                
                catch(const out_of_range &oor){
                        // Do nothing as there is no data.
                }               
                
-               ClassData = DataReceived.begin()->second;
+               classData = dataReceived.begin()->second;
                
        }
        
        // Get the Date Time Start value.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "DTSTART");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "DTSTART");
        
        // Process the data from DTSTART.
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&DataReceived.begin()->first;
+               propertyNameData = (string*)&dataReceived.begin()->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                
-               for(map<string,string>::iterator iter = PropertyData.begin();
-                       iter != PropertyData.end(); iter++){
+               for(map<string,string>::iterator iter = propertyData.begin();
+                       iter != propertyData.end(); iter++){
                        
                        if (iter->first == "VALUE"){
                                
-                               DateTimeStartDataValue = iter->second;
+                               dateTimeStartDataValue = iter->second;
                                
                        } else if (iter->first == "TZID"){
                                
-                               DateTimeStartDataTimeZoneID = iter->second;
+                               dateTimeStartDataTimeZoneID = iter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += iter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += iter->second;
+                               propertyTokens += iter->first;
+                               propertyTokens += "=";
+                               propertyTokens += iter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       DateTimeStartDataTokens = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       dateTimeStartDataTokens = propertyTokens;
                }
                
-               DateTimeStartData = DataReceived.begin()->second;
+               dateTimeStartData = dataReceived.begin()->second;
                
        }
        
        // Process the data from LAST-MODIFIED.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "LAST-MODIFIED");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "LAST-MODIFIED");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
                try {
-                       LastModifiedTokens = DataReceived.begin()->first.substr(14);
+                       lastModifiedTokens = dataReceived.begin()->first.substr(14);
                }
                
                catch(const out_of_range &oor){
                        // Do nothing as there is no data.
                }               
                
-               LastModifiedData = DataReceived.begin()->second;
+               lastModifiedData = dataReceived.begin()->second;
                
        }
        
        // Process the data from ORGANIZER.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "ORGANIZER");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "ORGANIZER");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&DataReceived.begin()->first;
+               propertyNameData = (string*)&dataReceived.begin()->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                
-               for(map<string,string>::iterator iter = PropertyData.begin();
-                       iter != PropertyData.end(); iter++){
+               for(map<string,string>::iterator iter = propertyData.begin();
+                       iter != propertyData.end(); iter++){
                        
                        if (iter->first == "CN"){
                                
-                               OrganiserDataCommonName = iter->second;
+                               organiserDataCommonName = iter->second;
                                
                        } else if (iter->first == "DIR"){
                                
-                               OrganiserDataDirectoryEntry = iter->second;
+                               organiserDataDirectoryEntry = iter->second;
                                
                        } else if (iter->first == "SENT-BY"){
                                
-                               OrganiserDataSentByParam = iter->second;
+                               organiserDataSentByParam = iter->second;
                                
                        } else if (iter->first == "LANGUAGE"){
                                
-                               OrganiserDataLanguage = iter->second;
+                               organiserDataLanguage = iter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += iter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += iter->second;
+                               propertyTokens += iter->first;
+                               propertyTokens += "=";
+                               propertyTokens += iter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
+               if (propertyTokens.size() > 0){
                        
-                       OrganiserDataTokens = PropertyTokens;
+                       organiserDataTokens = propertyTokens;
                        
                }
                
-               OrganiserData = DataReceived.begin()->second;
+               organiserData = dataReceived.begin()->second;
                
        }
        
        // Process the data from RECURRENCE-ID.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "RECURRENCE-ID");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "RECURRENCE-ID");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&DataReceived.begin()->first;
+               propertyNameData = (string*)&dataReceived.begin()->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                
-               for(map<string,string>::iterator iter = PropertyData.begin();
-                       iter != PropertyData.end(); iter++){
+               for(map<string,string>::iterator iter = propertyData.begin();
+                       iter != propertyData.end(); iter++){
                        
                        if (iter->first == "TZID"){
                                
-                               RecurranceIDDataTimeZoneParam = iter->second;
+                               recurranceIDDataTimeZoneParam = iter->second;
                                
                        } else if (iter->first == "VALUE"){
                                
-                               RecurranceIDDataValue = iter->second;
+                               recurranceIDDataValue = iter->second;
                                
                        } else if (iter->first == "RANGE"){
                                
-                               RecurranceIDDataRangeParam = iter->second;
+                               recurranceIDDataRangeParam = iter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += iter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += iter->second;
+                               propertyTokens += iter->first;
+                               propertyTokens += "=";
+                               propertyTokens += iter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
+               if (propertyTokens.size() > 0){
                        
-                       RecurranceIDDataTokens = PropertyTokens;
+                       recurranceIDDataTokens = propertyTokens;
                        
                }
                
-               RecurranceIDData = DataReceived.begin()->second;
+               recurranceIDData = dataReceived.begin()->second;
                
        }
 
        // Process the data from SEQUENCE.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "SEQUENCE");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "SEQUENCE");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
                try {
-                       SequenceTokens = DataReceived.begin()->first.substr(9);
+                       sequenceTokens = dataReceived.begin()->first.substr(9);
                }
                
                catch(const out_of_range &oor){
@@ -416,789 +416,789 @@ void CalendarJournalObject::ProcessData(){
                }               
                
                try {
-                       SequenceData = stoi(DataReceived.begin()->second);
+                       sequenceData = stoi(dataReceived.begin()->second);
                }
                
                catch(const invalid_argument &oor){
-                       SequenceTokens.clear();
+                       sequenceTokens.clear();
                }
                
        }
        
        // Process the data from STATUS.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "STATUS");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "STATUS");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&DataReceived.begin()->first;
+               propertyNameData = (string*)&dataReceived.begin()->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                
-               for(map<string,string>::iterator iter = PropertyData.begin();
-                       iter != PropertyData.end(); iter++){
+               for(map<string,string>::iterator iter = propertyData.begin();
+                       iter != propertyData.end(); iter++){
                        
                        if (iter->first == "LANGUAGE"){
                                
-                               StatusLanguage = iter->second;
+                               statusLanguage = iter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += iter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += iter->second;
+                               propertyTokens += iter->first;
+                               propertyTokens += "=";
+                               propertyTokens += iter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
+               if (propertyTokens.size() > 0){
                        
-                       StatusTokens = PropertyTokens;
+                       statusTokens = propertyTokens;
                        
                }
                
-               StatusData = DataReceived.begin()->second;
+               statusData = DataReceived.begin()->second;
                
        }
        
        // Process the data from SUMMARY.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "SUMMARY");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "SUMMARY");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&DataReceived.begin()->first;
+               propertyNameData = (string*)&dataReceived.begin()->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                
-               for(map<string,string>::iterator iter = PropertyData.begin();
-                       iter != PropertyData.end(); iter++){
+               for(map<string,string>::iterator iter = propertyData.begin();
+                       iter != propertyData.end(); iter++){
                        
                        if (iter->first == "ALTREP"){
                                
-                               SummaryDataAltRep = iter->second;
+                               summaryDataAltRep = iter->second;
                                
                        } else if (iter->first == "LANGUAGE"){
                                
-                               SummaryDataLanguage = iter->second;
+                               summaryDataLanguage = iter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += iter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += iter->second;
+                               propertyTokens += iter->first;
+                               propertyTokens += "=";
+                               propertyTokens += iter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
+               if (propertyTokens.size() > 0){
                        
-                       SummaryDataTokens = PropertyTokens;
+                       summaryDataTokens = propertyTokens;
                        
                }
                
-               SummaryData = DataReceived.begin()->second;
+               summaryData = dataReceived.begin()->second;
                
        }
        
        // Process the data from URL.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "URL");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "URL");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
                try {
-                       URLDataTokens = DataReceived.begin()->first.substr(4);
+                       urlDataTokens = dataReceived.begin()->first.substr(4);
                }
                
                catch(const out_of_range &oor){
                        // Do nothing as there is no data.
                }               
                
-               URLData = DataReceived.begin()->second;
+               urlData = dataReceived.begin()->second;
                
        }
        
        // Process the data from RRULE.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "RRULE");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "RRULE");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
                try {
-                       RecurranceRuleDataTokens = DataReceived.begin()->first.substr(6);
+                       recurranceRuleDataTokens = dataReceived.begin()->first.substr(6);
                }
                
                catch(const out_of_range &oor){
                        // Do nothing as there is no data.
                }               
                
-               RecurranceRuleData = DataReceived.begin()->second;
+               recurranceRuleData = dataReceived.begin()->second;
                
        }
        
        // Process the data from ATTACH.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "ATTACH");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, true, "ATTACH");
        
-       for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-               iter != DataReceived.end(); 
+       for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+               iter != dataReceived.end(); 
                ++iter){
                
-               AttachListEncoding.push_back("");
-               AttachListValue.push_back("");
-               AttachListFormatType.push_back("");
-               AttachListTokens.push_back("");
-               AttachList.push_back("");
+               attachListEncoding.push_back("");
+               attachListValue.push_back("");
+               attachListFormatType.push_back("");
+               attachListTokens.push_back("");
+               attachList.push_back("");
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "ENCODING"){
                                
-                               AttachListEncoding[ObjectSeekCount] = dataiter->second;
+                               attachListEncoding[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "VALUE"){
                                
-                               AttachListValue[ObjectSeekCount] = dataiter->second;
+                               attachListValue[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "FMTTYPE"){
                                
-                               AttachListFormatType[ObjectSeekCount] = dataiter->second;
+                               attachListFormatType[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       AttachListTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       attachListTokens[objectSeekCount] = PropertyTokens;
                }
                        
-               AttachList[ObjectSeekCount] = iter->second;
+               attachList[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
        // Process the data from ATTENDEE.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "ATTENDEE");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, true, "ATTENDEE");
        
-       ObjectSeekCount = 0;
+       objectSeekCount = 0;
        
-       for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-               iter != DataReceived.end(); 
+       for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+               iter != dataReceived.end(); 
                ++iter){
                        
-               AttendeeListMember.push_back("");
-               AttendeeListDelegatedFrom.push_back("");
-               AttendeeListDelegatedTo.push_back("");
-               AttendeeListRole.push_back("");
-               AttendeeListRSVP.push_back("");
-               AttendeeListDirectoryEntry.push_back("");
-               AttendeeListSentBy.push_back("");
-               AttendeeListCommonName.push_back("");
-               AttendeeListCalendarUserType.push_back("");
-               AttendeeListParticipationStatus.push_back("");
-               AttendeeListLanguage.push_back("");
-               AttendeeListTokens.push_back("");
-               AttendeeList.push_back("");
+               attendeeListMember.push_back("");
+               attendeeListDelegatedFrom.push_back("");
+               attendeeListDelegatedTo.push_back("");
+               attendeeListRole.push_back("");
+               attendeeListRSVP.push_back("");
+               attendeeListDirectoryEntry.push_back("");
+               attendeeListSentBy.push_back("");
+               attendeeListCommonName.push_back("");
+               attendeeListCalendarUserType.push_back("");
+               attendeeListParticipationStatus.push_back("");
+               attendeeListLanguage.push_back("");
+               attendeeListTokens.push_back("");
+               attendeeList.push_back("");
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "CUTYPE"){
                                
-                               AttendeeListCalendarUserType[ObjectSeekCount] = dataiter->second;
+                               attendeeListCalendarUserType[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "MEMBER"){
                                
-                               AttendeeListMember[ObjectSeekCount] = dataiter->second;
+                               attendeeListMember[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "ROLE"){
                                
-                               AttendeeListRole[ObjectSeekCount] = dataiter->second;
+                               attendeeListRole[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "PARTSTAT"){
                                
-                               AttendeeListParticipationStatus[ObjectSeekCount] = dataiter->second;
+                               attendeeListParticipationStatus[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "RSVP"){
                                
-                               AttendeeListRSVP[ObjectSeekCount] = dataiter->second;
+                               attendeeListRSVP[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "DELEGATED-TO"){
                                
-                               AttendeeListDelegatedTo[ObjectSeekCount] = dataiter->second;
+                               attendeeListDelegatedTo[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "DELEGATED-FROM"){
                                
-                               AttendeeListDelegatedFrom[ObjectSeekCount] = dataiter->second;
+                               attendeeListDelegatedFrom[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "SENT-BY"){
                                
-                               AttendeeListSentBy[ObjectSeekCount] = dataiter->second;
+                               attendeeListSentBy[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "CN"){
                                
-                               AttendeeListCommonName[ObjectSeekCount] = dataiter->second;
+                               attendeeListCommonName[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "DIR"){
                                
-                               AttendeeListDirectoryEntry[ObjectSeekCount] = dataiter->second;
+                               attendeeListDirectoryEntry[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "LANGUAGE"){
                                
-                               AttendeeListLanguage[ObjectSeekCount] = dataiter->second;
+                               attendeeListLanguage[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       AttendeeListTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       attendeeListTokens[objectSeekCount] = propertyTokens;
                }
                        
-               AttendeeList[ObjectSeekCount] = iter->second;
+               attendeeList[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
        // Process the data from CATEGORIES.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "CATEGORIES");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, true, "CATEGORIES");
        
-       ObjectSeekCount = 0;
+       objectSeekCount = 0;
        
-       for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-               iter != DataReceived.end(); 
+       for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+               iter != dataReceived.end(); 
                ++iter){
                
-               CategoriesListTokens.push_back("");
-               CategoriesListLanguage.push_back("");
-               CategoriesList.push_back("");
+               categoriesListTokens.push_back("");
+               categoriesListLanguage.push_back("");
+               categoriesList.push_back("");
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*PropertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "LANGUAGE"){
                                
-                               CategoriesListLanguage[ObjectSeekCount] = dataiter->second;
+                               categoriesListLanguage[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       CategoriesListTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       categoriesListTokens[objectSeekCount] = propertyTokens;
                }
                        
-               CategoriesList[ObjectSeekCount] = iter->second;
+               categoriesList[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
        // Process the data from COMMENT.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "COMMENT");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, true, "COMMENT");
 
-       ObjectSeekCount = 0;
+       objectSeekCount = 0;
        
-       for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-               iter != DataReceived.end(); 
+       for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+               iter != dataReceived.end(); 
                ++iter){
                
-               CommentListTokens.push_back("");
-               CommentListAltRep.push_back("");
-               CommentListLanguage.push_back("");
-               CommentList.push_back("");
+               commentListTokens.push_back("");
+               commentListAltRep.push_back("");
+               commentListLanguage.push_back("");
+               commentList.push_back("");
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "ALTREP"){
                                
-                               CommentListAltRep[ObjectSeekCount] = dataiter->second;
+                               commentListAltRep[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "LANGUAGE"){
                                
-                               CommentListLanguage[ObjectSeekCount] = dataiter->second;
+                               commentListLanguage[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       CommentListTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       commentListTokens[objectSeekCount] = propertyTokens;
                }
                        
-               CommentList[ObjectSeekCount] = iter->second;
+               commentList[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
        // Process the data from CONTACT.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "CONTACT");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, true, "CONTACT");
 
-       ObjectSeekCount = 0;
+       objectSeekCount = 0;
        
-       for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-               iter != DataReceived.end(); 
+       for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+               iter != dataReceived.end(); 
                ++iter){
                
-               ContactListTokens.push_back("");
-               ContactListAltRep.push_back("");
-               ContactListLanguage.push_back("");
-               ContactList.push_back("");
+               contactListTokens.push_back("");
+               contactListAltRep.push_back("");
+               contactListLanguage.push_back("");
+               contactList.push_back("");
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "ALTREP"){
                                
-                               ContactListAltRep[ObjectSeekCount] = dataiter->second;
+                               contactListAltRep[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "LANGUAGE"){
                                
-                               ContactListLanguage[ObjectSeekCount] = dataiter->second;
+                               contactListLanguage[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       ContactListTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       contactListTokens[objectSeekCount] = propertyTokens;
                }
                        
-               ContactList[ObjectSeekCount] = iter->second;
+               contactList[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
        // Process the data from Description.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "DESCRIPTION");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, true, "DESCRIPTION");
 
-       ObjectSeekCount = 0;
+       objectSeekCount = 0;
        
-       for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-               iter != DataReceived.end(); 
+       for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+               iter != dataReceived.end(); 
                ++iter){
                
-               DescriptionListTokens.push_back("");
-               DescriptionListAltRep.push_back("");
-               DescriptionListLanguage.push_back("");
-               DescriptionList.push_back("");
+               descriptionListTokens.push_back("");
+               descriptionListAltRep.push_back("");
+               descriptionListLanguage.push_back("");
+               descriptionList.push_back("");
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "ALTREP"){
                                
-                               DescriptionListAltRep[ObjectSeekCount] = dataiter->second;
+                               descriptionListAltRep[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "LANGUAGE"){
                                
-                               DescriptionListLanguage[ObjectSeekCount] = dataiter->second;
+                               descriptionListLanguage[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       DescriptionListTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       descriptionListTokens[objectSeekCount] = propertyTokens;
                }
                        
-               DescriptionList[ObjectSeekCount] = iter->second;
+               descriptionList[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
        // Process the data from EXDATE.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "EXDATE");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, true, "EXDATE");
 
-       ObjectSeekCount = 0;
+       objectSeekCount = 0;
        
-       for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-               iter != DataReceived.end(); 
+       for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+               iter != dataReceived.end(); 
                ++iter){
                
-               ExcludeDateDataTokens.push_back("");
-               ExcludeDateDataValue.push_back("");
-               ExcludeDateDataTimeZoneParam.push_back("");
-               ExcludeDateData.push_back("");
+               excludeDateDataTokens.push_back("");
+               excludeDateDataValue.push_back("");
+               excludeDateDataTimeZoneParam.push_back("");
+               excludeDateData.push_back("");
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "VALUE"){
                                
-                               ExcludeDateDataValue[ObjectSeekCount] = dataiter->second;
+                               excludeDateDataValue[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "TZID"){
                                
-                               ExcludeDateDataTimeZoneParam[ObjectSeekCount] = dataiter->second;
+                               excludeDateDataTimeZoneParam[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       ExcludeDateDataTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       excludeDateDataTokens[objectSeekCount] = propertyTokens;
                }
                        
-               ExcludeDateData[ObjectSeekCount] = iter->second;
+               excludeDateData[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
        // Process the data from RELATED-TO.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "RELATED-TO");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, true, "RELATED-TO");
 
-       ObjectSeekCount = 0;
+       objectSeekCount = 0;
        
-       for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-               iter != DataReceived.end(); 
+       for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+               iter != dataReceived.end(); 
                ++iter){
                
-               RelatedToDataTokens.push_back("");
-               RelatedToDataRelationType.push_back("");
-               RelatedToData.push_back("");
+               relatedToDataTokens.push_back("");
+               relatedToDataRelationType.push_back("");
+               relatedToData.push_back("");
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "RELTYPE"){
                                
-                               RelatedToDataRelationType[ObjectSeekCount] = dataiter->second;
+                               relatedToDataRelationType[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       RelatedToDataTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       relatedToDataTokens[objectSeekCount] = propertyTokens;
                }
                        
-               RelatedToData[ObjectSeekCount] = iter->second;
+               relatedToData[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
        // Process the data from RDATE.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "RDATE");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, true, "RDATE");
 
-       ObjectSeekCount = 0;
+       objectSeekCount = 0;
        
-       for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-               iter != DataReceived.end(); 
+       for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+               iter != dataReceived.end(); 
                ++iter){
                
-               RecurranceDateDataTokens.push_back("");
-               RecurranceDateDataValue.push_back("");
-               RecurranceDateDataTimeZoneParam.push_back("");
-               RecurranceDateData.push_back("");
+               recurranceDateDataTokens.push_back("");
+               recurranceDateDataValue.push_back("");
+               recurranceDateDataTimeZoneParam.push_back("");
+               recurranceDateData.push_back("");
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "VALUE"){
                                
-                               RecurranceDateDataValue[ObjectSeekCount] = dataiter->second;
+                               recurranceDateDataValue[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "TZID"){
                                
-                               RecurranceDateDataTimeZoneParam[ObjectSeekCount] = dataiter->second;
+                               recurranceDateDataTimeZoneParam[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       RecurranceDateDataTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       recurranceDateDataTokens[objectSeekCount] = propertyTokens;
                }
                        
-               RecurranceDateData[ObjectSeekCount] = iter->second;
+               recurranceDateData[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
        // Process the data from REQUEST-STATUS.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "REQUEST-STATUS");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, true, "REQUEST-STATUS");
 
-       ObjectSeekCount = 0;
+       objectSeekCount = 0;
        
-       for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-               iter != DataReceived.end(); 
+       for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+               iter != dataReceived.end(); 
                ++iter){
                
-               RequestStatusTokens.push_back("");
-               RequestStatusLanguage.push_back("");
-               RequestStatusData.push_back("");
+               requestStatusTokens.push_back("");
+               requestStatusLanguage.push_back("");
+               requestStatusData.push_back("");
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "LANGUAGE"){
                                
-                               RequestStatusLanguage[ObjectSeekCount] = dataiter->second;
+                               requestStatusLanguage[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       RequestStatusTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       requestStatusTokens[objectSeekCount] = propertyTokens;
                }
                        
-               RequestStatusData[ObjectSeekCount] = iter->second;
+               requestStatusData[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
-       ObjectSeekCount = 0;
+       objectSeekCount = 0;
        
        // Process data from X-*
        
-       for(vector<string>::iterator iter = ObjectName.begin(); 
-               iter != ObjectName.end(); ++iter){
+       for(vector<string>::iterator iter = objectName.begin(); 
+               iter != objectName.end(); ++iter){
                        
-               bool TokenData = false;
-               string PropertyTokens;
+               bool tokenData = false;
+               string propertyTokens;
                
                if (iter->substr(0,2) == "X-" &&
                        iter->size() > 2){
                        
-                       XTokensData.push_back(ObjectData[ObjectSeekCount]);
-                       XTokensDataTokens.push_back(ObjectName[ObjectSeekCount]);
+                       xTokensData.push_back(objectData[objectSeekCount]);
+                       xTokensDataTokens.push_back(objectName[objectSeekCount]);
                                
                }
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
        
index c2e4a4a..9344911 100644 (file)
@@ -28,7 +28,7 @@ class CalendarJournalObject: public CalendarObject{
        private:
        
        void ProcessData();
-       void SaveObjectData(string *SaveData);
+       void SaveObjectData(string *saveData);
        
 };
 
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy