Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
camelCase: Converted code in calendartimezone directory
authorSteve Brokenshire <sbrokenshire@xestia.co.uk>
Sat, 28 Jan 2017 21:13:35 +0000 (21:13 +0000)
committerSteve Brokenshire <sbrokenshire@xestia.co.uk>
Sat, 28 Jan 2017 21:13:35 +0000 (21:13 +0000)
source/objects/calendartimezone/CalendarTimezone-Save.cpp
source/objects/calendartimezone/CalendarTimezone.cpp
source/objects/calendartimezone/CalendarTimezone.h

index 1a72a0b..109d664 100644 (file)
@@ -1,4 +1,4 @@
-// CalendarTimezone-Save.cpp - CalendarTimezone class save functions
+// Calendartimezone-Save.cpp - Calendartimezone class save functions
 //
 // (c) 2016-2017 Xestia Software Development.
 //
 // You should have received a copy of the GNU General Public License along
 // with Xestia Calendar. If not, see <http://www.gnu.org/licenses/>
 
-#include "CalendarTimezone.h"
+#include "Calendartimezone.h"
 
 using namespace std;
 
-void CalendarTimezoneObject::SaveObjectData(string *SaveData){
+void CalendartimezoneObject::SaveObjectData(string *saveData){
 
-       string DataLine = "";
-       string DataLineProcessed = "";
+       string dataLine = "";
+       string dataLineProcessed = "";
        
-       *SaveData += "BEGIN:VTIMEZONE\n";
+       *saveData += "BEGIN:VTIMEZONE\n";
        
        // Process the TZID.
        
-       if (TimeZoneData.size() > 0){
+       if (timeZoneData.size() > 0){
                
-               if (TimeZoneDataTokens.size() > 0){
+               if (timeZoneDataTokens.size() > 0){
                
-                       DataLine += "TZID;";
-                       DataLine += TimeZoneDataTokens;
+                       dataLine += "TZID;";
+                       dataLine += timeZoneDataTokens;
                        
                } else {
 
-                       DataLine += "TZID";
+                       dataLine += "TZID";
                        
                }
 
-               DataLine += ":";
-               DataLine += TimeZoneData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += timeZoneData;
+               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 TZURL value.
        
-       if (TimeZoneURLData.size() > 0){
+       if (timeZoneURLData.size() > 0){
                
-               if (TimeZoneURLTokens.size() > 0){
+               if (timeZoneURLTokens.size() > 0){
                
-                       DataLine += "TZURL;";
-                       DataLine += TimeZoneURLTokens;
+                       dataLine += "TZURL;";
+                       dataLine += timeZoneURLTokens;
                        
                } else {
 
-                       DataLine += "TZURL";
+                       dataLine += "TZURL";
                        
                }
 
-               DataLine += ":";
-               DataLine += TimeZoneURLData;
-               DataLine += "\n";
+               dataLine += ":";
+               dataLine += timeZoneURLData;
+               dataLine += "\n";
                
-               DataLineProcessed = OutputText(&DataLine);
+               dataLineProcessed = OutputText(&dataLine);
                
-               *SaveData += DataLineProcessed;
+               *saveData += dataLineProcessed;
                
-               DataLine.clear();
-               DataLineProcessed.clear();
+               dataLine.clear();
+               dataLineProcessed.clear();
                
        }
 
        // Process Standard timezones.
        
-       if (TimezoneStandardCollection.size() > 0){
+       if (timezoneStandardCollection.size() > 0){
                
-               for (int TimezoneStandardSeek = 0; TimezoneStandardSeek < TimezoneStandardCollection.size();
-                       TimezoneStandardSeek++){
+               for (int timezoneStandardSeek = 0; timezoneStandardSeek < timezoneStandardCollection.size();
+                       timezoneStandardSeek++){
                                
-                       *SaveData += "BEGIN:STANDARD\n";
+                       *saveData += "BEGIN:STANDARD\n";
                                
                        // Process the DTSTART value.
        
-                       if (TimezoneStandardCollection[TimezoneStandardSeek].DateTimeStartData.size() > 0){
+                       if (timezoneStandardCollection[timezoneStandardSeek].dateTimeStartData.size() > 0){
                
-                               if (TimezoneStandardCollection[TimezoneStandardSeek].DateTimeStartTokens.size() > 0){
+                               if (timezoneStandardCollection[timezoneStandardSeek].dateTimeStartTokens.size() > 0){
                
-                                       DataLine += "DTSTART;";
-                                       DataLine += TimezoneStandardCollection[TimezoneStandardSeek].DateTimeStartTokens;
+                                       dataLine += "DTSTART;";
+                                       dataLine += timezoneStandardCollection[timezoneStandardSeek].dateTimeStartTokens;
                        
                                } else {
 
-                                       DataLine += "DTSTART";
+                                       dataLine += "DTSTART";
                        
                                }
 
-                               DataLine += ":";
-                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].DateTimeStartData;
-                               DataLine += "\n";
+                               dataLine += ":";
+                               dataLine += timezoneStandardCollection[timezoneStandardSeek].dateTimeStartData;
+                               dataLine += "\n";
                
-                               DataLineProcessed = OutputText(&DataLine);
+                               dataLineProcessed = OutputText(&dataLine);
                
-                               *SaveData += DataLineProcessed;
+                               *saveData += dataLineProcessed;
                
-                               DataLine.clear();
-                               DataLineProcessed.clear();
+                               dataLine.clear();
+                               dataLineProcessed.clear();
                
                        }
                        
                        // Process the TZOFFSETFROM value.
        
-                       if (TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneOffsetFromData.size() > 0){
+                       if (timezoneStandardCollection[timezoneStandardSeek].timeZoneOffsetFromData.size() > 0){
                
-                               if (TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneOffsetFromTokens.size() > 0){
+                               if (timezoneStandardCollection[timezoneStandardSeek].timeZoneOffsetFromTokens.size() > 0){
                
-                                       DataLine += "TZOFFSETFROM;";
-                                       DataLine += TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneOffsetFromTokens;
+                                       dataLine += "TZOFFSETFROM;";
+                                       dataLine += timezoneStandardCollection[timezoneStandardSeek].timeZoneOffsetFromTokens;
                        
                                } else {
 
-                                       DataLine += "TZOFFSETFROM";
+                                       dataLine += "TZOFFSETFROM";
                        
                                }
 
-                               DataLine += ":";
-                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneOffsetFromData;
-                               DataLine += "\n";
+                               dataLine += ":";
+                               dataLine += timezoneStandardCollection[timezoneStandardSeek].timeZoneOffsetFromData;
+                               dataLine += "\n";
                
-                               DataLineProcessed = OutputText(&DataLine);
+                               dataLineProcessed = OutputText(&dataLine);
                
-                               *SaveData += DataLineProcessed;
+                               *saveData += dataLineProcessed;
                
-                               DataLine.clear();
-                               DataLineProcessed.clear();
+                               dataLine.clear();
+                               dataLineProcessed.clear();
                
                        }
                        
                        // Process the TZOFFSETTO value.
        
-                       if (TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneOffsetToData.size() > 0){
+                       if (timezoneStandardCollection[timezoneStandardSeek].timeZoneOffsetToData.size() > 0){
                
-                               if (TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneOffsetToTokens.size() > 0){
+                               if (timezoneStandardCollection[timezoneStandardSeek].timeZoneOffsetToTokens.size() > 0){
                
-                                       DataLine += "TZOFFSETTO;";
-                                       DataLine += TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneOffsetToTokens;
+                                       dataLine += "TZOFFSETTO;";
+                                       dataLine += timezoneStandardCollection[timezoneStandardSeek].timeZoneOffsetToTokens;
                        
                                } else {
 
-                                       DataLine += "TZOFFSETTO";
+                                       dataLine += "TZOFFSETTO";
                        
                                }
 
-                               DataLine += ":";
-                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneOffsetToData;
-                               DataLine += "\n";
+                               dataLine += ":";
+                               dataLine += timezoneStandardCollection[timezoneStandardSeek].timeZoneOffsetToData;
+                               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 (TimezoneStandardCollection[TimezoneStandardSeek].RecurranceRuleData.size() > 0){
+                       if (timezoneStandardCollection[timezoneStandardSeek].recurranceRuleData.size() > 0){
                
-                               if (TimezoneStandardCollection[TimezoneStandardSeek].RecurranceRuleDataTokens.size() > 0){
+                               if (timezoneStandardCollection[timezoneStandardSeek].recurranceRuleDataTokens.size() > 0){
                
-                                       DataLine += "RRULE;";
-                                       DataLine += TimezoneStandardCollection[TimezoneStandardSeek].RecurranceRuleDataTokens;
+                                       dataLine += "RRULE;";
+                                       dataLine += timezoneStandardCollection[timezoneStandardSeek].recurranceRuleDataTokens;
                        
                                } else {
 
-                                       DataLine += "RRULE";
+                                       dataLine += "RRULE";
                        
                                }
 
-                               DataLine += ":";
-                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].RecurranceRuleData;
-                               DataLine += "\n";
+                               dataLine += ":";
+                               dataLine += timezoneStandardCollection[timezoneStandardSeek].recurranceRuleData;
+                               dataLine += "\n";
                
-                               DataLineProcessed = OutputText(&DataLine);
+                               dataLineProcessed = OutputText(&dataLine);
                
-                               *SaveData += DataLineProcessed;
+                               *saveData += dataLineProcessed;
                
-                               DataLine.clear();
-                               DataLineProcessed.clear();
+                               dataLine.clear();
+                               dataLineProcessed.clear();
                
                        }
                        
                        // Process the COMMENT value.
        
-                       if (TimezoneStandardCollection[TimezoneStandardSeek].CommentList.size() > 0){
+                       if (timezoneStandardCollection[timezoneStandardSeek].commentList.size() > 0){
                
-                               for (int CommentListSeek = 0; CommentListSeek < TimezoneStandardCollection[TimezoneStandardSeek].CommentList.size();
-                                       CommentListSeek++){
+                               for (int commentListSeek = 0; commentListSeek < timezoneStandardCollection[timezoneStandardSeek].commentList.size();
+                                       commentListSeek++){
        
-                                       DataLine += "COMMENT";
+                                       dataLine += "COMMENT";
                        
-                                       if (TimezoneStandardCollection[TimezoneStandardSeek].CommentListAltRep[CommentListSeek].size() > 0){
+                                       if (timezoneStandardCollection[timezoneStandardSeek].commentListAltRep[commentListSeek].size() > 0){
                
-                                               DataLine += ";ALTREP=\"";
-                                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].CommentListAltRep[CommentListSeek];
-                                               DataLine += "\"";
+                                               dataLine += ";ALTREP=\"";
+                                               dataLine += timezoneStandardCollection[timezoneStandardSeek].commentListAltRep[commentListSeek];
+                                               dataLine += "\"";
                        
                                        }
                                
-                                       if (TimezoneStandardCollection[TimezoneStandardSeek].CommentListLanguage[CommentListSeek].size() > 0){
+                                       if (timezoneStandardCollection[timezoneStandardSeek].commentListLanguage[commentListSeek].size() > 0){
                
-                                               DataLine += ";LANGUAGE=";
-                                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].CommentListLanguage[CommentListSeek];
+                                               dataLine += ";LANGUAGE=";
+                                               dataLine += timezoneStandardCollection[timezoneStandardSeek].commentListLanguage[commentListSeek];
                        
                                        }
                        
-                                       if (TimezoneStandardCollection[TimezoneStandardSeek].CommentListTokens[CommentListSeek].size() > 0){
+                                       if (timezoneStandardCollection[timezoneStandardSeek].commentListTokens[commentListSeek].size() > 0){
                
-                                               DataLine += ";";
-                                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].CommentListTokens[CommentListSeek];
+                                               dataLine += ";";
+                                               dataLine += timezoneStandardCollection[timezoneStandardSeek].commentListTokens[commentListSeek];
                        
                                        }
                                
-                                       DataLine += ":";
-                                       DataLine += TimezoneStandardCollection[TimezoneStandardSeek].CommentList[CommentListSeek];
-                                       DataLine += "\n";
+                                       dataLine += ":";
+                                       dataLine += timezoneStandardCollection[timezoneStandardSeek].commentList[commentListSeek];
+                                       dataLine += "\n";
 
-                                       DataLineProcessed = OutputText(&DataLine);
+                                       dataLineProcessed = OutputText(&dataLine);
                
-                                       *SaveData += DataLineProcessed;
+                                       *saveData += dataLineProcessed;
 
-                                       DataLine.clear();
-                                       DataLineProcessed.clear();
+                                       dataLine.clear();
+                                       dataLineProcessed.clear();
                                
                                }
                
@@ -280,44 +280,44 @@ void CalendarTimezoneObject::SaveObjectData(string *SaveData){
                        
                        // Process the RDATE value.
 
-                       if (TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateData.size() > 0){
+                       if (timezoneStandardCollection[timezoneStandardSeek].recurranceDateData.size() > 0){
                
-                               for (int RecurranceDataSeek = 0; RecurranceDataSeek < TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateData.size();
-                                       RecurranceDataSeek++){
+                               for (int recurranceDataSeek = 0; recurranceDataSeek < timezoneStandardCollection[timezoneStandardSeek].recurranceDateData.size();
+                                       recurranceDataSeek++){
        
-                                       DataLine += "RDATE";
+                                       dataLine += "RDATE";
                        
-                                       if (TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataValue[RecurranceDataSeek].size() > 0){
+                                       if (timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataValue[recurranceDataSeek].size() > 0){
                
-                                               DataLine += ";VALUE=";
-                                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataValue[RecurranceDataSeek];
+                                               dataLine += ";VALUE=";
+                                               dataLine += timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataValue[recurranceDataSeek];
                        
                                        }
                                
-                                       if (TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataTimeZoneParam[RecurranceDataSeek].size() > 0){
+                                       if (timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataTimeZoneParam[recurranceDataSeek].size() > 0){
                
-                                               DataLine += ";TZID=";
-                                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataTimeZoneParam[RecurranceDataSeek];
+                                               dataLine += ";TZID=";
+                                               dataLine += timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataTimeZoneParam[recurranceDataSeek];
                        
                                        }
                        
-                                       if (TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataTokens[RecurranceDataSeek].size() > 0){
+                                       if (timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataTokens[recurranceDataSeek].size() > 0){
                
-                                               DataLine += ";";
-                                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataTokens[RecurranceDataSeek];
+                                               dataLine += ";";
+                                               dataLine += timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataTokens[recurranceDataSeek];
                        
                                        }
                                
-                                       DataLine += ":";
-                                       DataLine += TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateData[RecurranceDataSeek];
-                                       DataLine += "\n";
+                                       dataLine += ":";
+                                       dataLine += timezoneStandardCollection[timezoneStandardSeek].recurranceDateData[recurranceDataSeek];
+                                       dataLine += "\n";
 
-                                       DataLineProcessed = OutputText(&DataLine);
+                                       dataLineProcessed = OutputText(&dataLine);
                
-                                       *SaveData += DataLineProcessed;
+                                       *saveData += dataLineProcessed;
 
-                                       DataLine.clear();
-                                       DataLineProcessed.clear();
+                                       dataLine.clear();
+                                       dataLineProcessed.clear();
                                
                                }
                
@@ -325,37 +325,37 @@ void CalendarTimezoneObject::SaveObjectData(string *SaveData){
                        
                        // Process the TZNAME value.
 
-                       if (TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameData.size() > 0){
+                       if (timezoneStandardCollection[timezoneStandardSeek].timeZoneNameData.size() > 0){
                
-                               for (int TimezoneNameSeek = 0; TimezoneNameSeek < TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameData.size();
-                                       TimezoneNameSeek++){
+                               for (int timezoneNameSeek = 0; timezoneNameSeek < timezoneStandardCollection[timezoneStandardSeek].timeZoneNameData.size();
+                                       timezoneNameSeek++){
        
-                                       DataLine += "TZNAME";
+                                       dataLine += "TZNAME";
 
-                                       if (TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameLanguage[TimezoneNameSeek].size() > 0){
+                                       if (timezoneStandardCollection[timezoneStandardSeek].timeZoneNameLanguage[timezoneNameSeek].size() > 0){
                
-                                               DataLine += ";LANGUAGE=";
-                                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameLanguage[TimezoneNameSeek];
+                                               dataLine += ";LANGUAGE=";
+                                               dataLine += timezoneStandardCollection[timezoneStandardSeek].timeZoneNameLanguage[timezoneNameSeek];
                        
                                        }
                        
-                                       if (TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameTokens[TimezoneNameSeek].size() > 0){
+                                       if (timezoneStandardCollection[timezoneStandardSeek].timeZoneNameTokens[timezoneNameSeek].size() > 0){
                
-                                               DataLine += ";";
-                                               DataLine += TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameTokens[TimezoneNameSeek];
+                                               dataLine += ";";
+                                               dataLine += timezoneStandardCollection[timezoneStandardSeek].timeZoneNameTokens[timezoneNameSeek];
                        
                                        }
                                
-                                       DataLine += ":";
-                                       DataLine += TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameData[TimezoneNameSeek];
-                                       DataLine += "\n";
+                                       dataLine += ":";
+                                       dataLine += timezoneStandardCollection[timezoneStandardSeek].timeZoneNameData[timezoneNameSeek];
+                                       dataLine += "\n";
 
-                                       DataLineProcessed = OutputText(&DataLine);
+                                       dataLineProcessed = OutputText(&dataLine);
                
-                                       *SaveData += DataLineProcessed;
+                                       *saveData += dataLineProcessed;
 
-                                       DataLine.clear();
-                                       DataLineProcessed.clear();
+                                       dataLine.clear();
+                                       dataLineProcessed.clear();
                                
                                }
                
@@ -363,28 +363,28 @@ void CalendarTimezoneObject::SaveObjectData(string *SaveData){
                        
                        // Process data from X-*
        
-                       if (TimezoneStandardCollection[TimezoneStandardSeek].XTokensData.size() > 0){
+                       if (timezoneStandardCollection[timezoneStandardSeek].xTokensData.size() > 0){
                                
-                               for (int TimezoneXTokenSeek = 0; TimezoneXTokenSeek < TimezoneStandardCollection[TimezoneStandardSeek].XTokensData.size();
-                                       TimezoneXTokenSeek++){
+                               for (int timezoneXTokenSeek = 0; timezoneXTokenSeek < timezoneStandardCollection[timezoneStandardSeek].xTokensData.size();
+                                       timezoneXTokenSeek++){
                                
-                                       DataLine += TimezoneStandardCollection[TimezoneStandardSeek].XTokensDataTokens[TimezoneXTokenSeek];
-                                       DataLine += ":";
-                                       DataLine += TimezoneStandardCollection[TimezoneStandardSeek].XTokensData[TimezoneXTokenSeek];
-                                       DataLine += "\n";
+                                       dataLine += timezoneStandardCollection[timezoneStandardSeek].xTokensDataTokens[timezoneXTokenSeek];
+                                       dataLine += ":";
+                                       dataLine += timezoneStandardCollection[timezoneStandardSeek].xTokensData[timezoneXTokenSeek];
+                                       dataLine += "\n";
 
-                                       DataLineProcessed = OutputText(&DataLine);
+                                       dataLineProcessed = OutputText(&dataLine);
                
-                                       *SaveData += DataLineProcessed;
+                                       *saveData += dataLineProcessed;
 
-                                       DataLine.clear();
-                                       DataLineProcessed.clear();
+                                       dataLine.clear();
+                                       dataLineProcessed.clear();
                                                
                                }
                                
                        }
                        
-                       *SaveData += "END:STANDARD\n";
+                       *saveData += "END:STANDARD\n";
                                
                }
                
@@ -392,166 +392,166 @@ void CalendarTimezoneObject::SaveObjectData(string *SaveData){
        
        // Process Daylight timezones.
        
-       if (TimezoneDaylightCollection.size() > 0){
+       if (timezoneDaylightCollection.size() > 0){
 
-               for (int TimezoneDaylightSeek = 0; TimezoneDaylightSeek < TimezoneDaylightCollection.size();
-                       TimezoneDaylightSeek++){
+               for (int timezoneDaylightSeek = 0; timezoneDaylightSeek < timezoneDaylightCollection.size();
+                       timezoneDaylightSeek++){
                
-                       *SaveData += "BEGIN:DAYLIGHT\n";
+                       *saveData += "BEGIN:DAYLIGHT\n";
                                
                        // Process the DTSTART value.
        
-                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].DateTimeStartData.size() > 0){
+                       if (timezoneDaylightCollection[timezoneDaylightSeek].dateTimeStartData.size() > 0){
                
-                               if (TimezoneStandardCollection[TimezoneDaylightSeek].DateTimeStartTokens.size() > 0){
+                               if (timezoneStandardCollection[timezoneDaylightSeek].dateTimeStartTokens.size() > 0){
                
-                                       DataLine += "DTSTART;";
-                                       DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].DateTimeStartTokens;
+                                       dataLine += "DTSTART;";
+                                       dataLine += timezoneDaylightCollection[timezoneDaylightSeek].dateTimeStartTokens;
                        
                                } else {
 
-                                       DataLine += "DTSTART";
+                                       dataLine += "DTSTART";
                        
                                }
 
-                               DataLine += ":";
-                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].DateTimeStartData;
-                               DataLine += "\n";
+                               dataLine += ":";
+                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].dateTimeStartData;
+                               dataLine += "\n";
                
-                               DataLineProcessed = OutputText(&DataLine);
+                               dataLineProcessed = OutputText(&dataLine);
                
-                               *SaveData += DataLineProcessed;
+                               *saveData += dataLineProcessed;
                
-                               DataLine.clear();
-                               DataLineProcessed.clear();
+                               dataLine.clear();
+                               dataLineProcessed.clear();
                
                        }
                        
                        // Process the TZOFFSETFROM value.
        
-                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneOffsetFromData.size() > 0){
+                       if (timezoneDaylightCollection[timezoneDaylightSeek].timeZoneOffsetFromData.size() > 0){
                
-                               if (TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneOffsetFromTokens.size() > 0){
+                               if (timezoneDaylightCollection[timezoneDaylightSeek].timeZoneOffsetFromTokens.size() > 0){
                
-                                       DataLine += "TZOFFSETFROM;";
-                                       DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneOffsetFromTokens;
+                                       dataLine += "TZOFFSETFROM;";
+                                       dataLine += timezoneDaylightCollection[timezoneDaylightSeek].timeZoneOffsetFromTokens;
                        
                                } else {
 
-                                       DataLine += "TZOFFSETFROM";
+                                       dataLine += "TZOFFSETFROM";
                        
                                }
 
-                               DataLine += ":";
-                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneOffsetFromData;
-                               DataLine += "\n";
+                               dataLine += ":";
+                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].timeZoneOffsetFromData;
+                               dataLine += "\n";
                
-                               DataLineProcessed = OutputText(&DataLine);
+                               dataLineProcessed = OutputText(&dataLine);
                
-                               *SaveData += DataLineProcessed;
+                               *saveData += dataLineProcessed;
                
-                               DataLine.clear();
-                               DataLineProcessed.clear();
+                               dataLine.clear();
+                               dataLineProcessed.clear();
                
                        }
                        
                        // Process the TZOFFSETTO value.
        
-                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneOffsetToData.size() > 0){
+                       if (timezoneDaylightCollection[timezoneDaylightSeek].timeZoneOffsetToData.size() > 0){
                
-                               if (TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneOffsetToTokens.size() > 0){
+                               if (timezoneDaylightCollection[timezoneDaylightSeek].timeZoneOffsetToTokens.size() > 0){
                
-                                       DataLine += "TZOFFSETTO;";
-                                       DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneOffsetToTokens;
+                                       dataLine += "TZOFFSETTO;";
+                                       dataLine += timezoneDaylightCollection[timezoneDaylightSeek].timeZoneOffsetToTokens;
                        
                                } else {
 
-                                       DataLine += "TZOFFSETTO";
+                                       dataLine += "TZOFFSETTO";
                        
                                }
 
-                               DataLine += ":";
-                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneOffsetToData;
-                               DataLine += "\n";
+                               dataLine += ":";
+                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].timeZoneOffsetToData;
+                               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 (TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceRuleData.size() > 0){
+                       if (timezoneDaylightCollection[timezoneDaylightSeek].recurranceRuleData.size() > 0){
                
-                               if (TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceRuleDataTokens.size() > 0){
+                               if (timezoneDaylightCollection[timezoneDaylightSeek].recurranceRuleDataTokens.size() > 0){
                
-                                       DataLine += "RRULE;";
-                                       DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceRuleDataTokens;
+                                       dataLine += "RRULE;";
+                                       dataLine += timezoneDaylightCollection[timezoneDaylightSeek].recurranceRuleDataTokens;
                        
                                } else {
 
-                                       DataLine += "RRULE";
+                                       dataLine += "RRULE";
                        
                                }
 
-                               DataLine += ":";
-                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceRuleData;
-                               DataLine += "\n";
+                               dataLine += ":";
+                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].recurranceRuleData;
+                               dataLine += "\n";
                
-                               DataLineProcessed = OutputText(&DataLine);
+                               dataLineProcessed = OutputText(&dataLine);
                
-                               *SaveData += DataLineProcessed;
+                               *saveData += dataLineProcessed;
                
-                               DataLine.clear();
-                               DataLineProcessed.clear();
+                               dataLine.clear();
+                               dataLineProcessed.clear();
                
                        }
                        
                        // Process the COMMENT value.
        
-                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].CommentList.size() > 0){
+                       if (timezoneDaylightCollection[timezoneDaylightSeek].commentList.size() > 0){
                
-                               for (int CommentListSeek = 0; CommentListSeek < TimezoneDaylightCollection[TimezoneDaylightSeek].CommentList.size();
-                                       CommentListSeek++){
+                               for (int commentListSeek = 0; commentListSeek < timezoneDaylightCollection[timezoneDaylightSeek].commentList.size();
+                                       commentListSeek++){
        
-                                       DataLine += "COMMENT";
+                                       dataLine += "COMMENT";
                        
-                                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListAltRep[CommentListSeek].size() > 0){
+                                       if (timezoneDaylightCollection[timezoneDaylightSeek].commentListAltRep[commentListSeek].size() > 0){
                
-                                               DataLine += ";ALTREP=\"";
-                                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListAltRep[CommentListSeek];
-                                               DataLine += "\"";
+                                               dataLine += ";ALTREP=\"";
+                                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].commentListAltRep[commentListSeek];
+                                               dataLine += "\"";
                        
                                        }
                                
-                                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListLanguage[CommentListSeek].size() > 0){
+                                       if (timezoneDaylightCollection[timezoneDaylightSeek].commentListLanguage[commentListSeek].size() > 0){
                
-                                               DataLine += ";LANGUAGE=";
-                                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListLanguage[CommentListSeek];
+                                               dataLine += ";LANGUAGE=";
+                                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].commentListLanguage[commentListSeek];
                        
                                        }
                        
-                                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListTokens[CommentListSeek].size() > 0){
+                                       if (timezoneDaylightCollection[timezoneDaylightSeek].commentListTokens[commentListSeek].size() > 0){
                
-                                               DataLine += ";";
-                                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListTokens[CommentListSeek];
+                                               dataLine += ";";
+                                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].commentListTokens[commentListSeek];
                        
                                        }
                                
-                                       DataLine += ":";
-                                       DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].CommentList[CommentListSeek];
-                                       DataLine += "\n";
+                                       dataLine += ":";
+                                       dataLine += timezoneDaylightCollection[timezoneDaylightSeek].commentList[commentListSeek];
+                                       dataLine += "\n";
 
-                                       DataLineProcessed = OutputText(&DataLine);
+                                       dataLineProcessed = OutputText(&dataLine);
                
-                                       *SaveData += DataLineProcessed;
+                                       *saveData += dataLineProcessed;
 
-                                       DataLine.clear();
-                                       DataLineProcessed.clear();
+                                       dataLine.clear();
+                                       dataLineProcessed.clear();
                                
                                }
                
@@ -559,44 +559,44 @@ void CalendarTimezoneObject::SaveObjectData(string *SaveData){
                        
                        // Process the RDATE value.
 
-                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateData.size() > 0){
+                       if (timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateData.size() > 0){
                
-                               for (int RecurranceDataSeek = 0; RecurranceDataSeek < TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateData.size();
-                                       RecurranceDataSeek++){
+                               for (int recurranceDataSeek = 0; recurranceDataSeek < timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateData.size();
+                                       recurranceDataSeek++){
        
-                                       DataLine += "RDATE";
+                                       dataLine += "RDATE";
                        
-                                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataValue[RecurranceDataSeek].size() > 0){
+                                       if (timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataValue[recurranceDataSeek].size() > 0){
                
-                                               DataLine += ";VALUE=";
-                                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataValue[RecurranceDataSeek];
+                                               dataLine += ";VALUE=";
+                                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataValue[recurranceDataSeek];
                        
                                        }
                                
-                                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataTimeZoneParam[RecurranceDataSeek].size() > 0){
+                                       if (timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataTimeZoneParam[recurranceDataSeek].size() > 0){
                
-                                               DataLine += ";TZID=";
-                                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataTimeZoneParam[RecurranceDataSeek];
+                                               dataLine += ";TZID=";
+                                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataTimeZoneParam[recurranceDataSeek];
                        
                                        }
                        
-                                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataTokens[RecurranceDataSeek].size() > 0){
+                                       if (timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataTokens[recurranceDataSeek].size() > 0){
                
-                                               DataLine += ";";
-                                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataTokens[RecurranceDataSeek];
+                                               dataLine += ";";
+                                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataTokens[recurranceDataSeek];
                        
                                        }
                                
-                                       DataLine += ":";
-                                       DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateData[RecurranceDataSeek];
-                                       DataLine += "\n";
+                                       dataLine += ":";
+                                       dataLine += timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateData[recurranceDataSeek];
+                                       dataLine += "\n";
 
-                                       DataLineProcessed = OutputText(&DataLine);
+                                       dataLineProcessed = OutputText(&dataLine);
                
-                                       *SaveData += DataLineProcessed;
+                                       *saveData += dataLineProcessed;
 
-                                       DataLine.clear();
-                                       DataLineProcessed.clear();
+                                       dataLine.clear();
+                                       dataLineProcessed.clear();
                                
                                }
                
@@ -604,37 +604,37 @@ void CalendarTimezoneObject::SaveObjectData(string *SaveData){
 
                        // Process the TZNAME value.
 
-                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameData.size() > 0){
+                       if (timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameData.size() > 0){
                
-                               for (int TimezoneNameSeek = 0; TimezoneNameSeek < TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameData.size();
-                                       TimezoneNameSeek++){
+                               for (int timezoneNameSeek = 0; timezoneNameSeek < timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameData.size();
+                                       timezoneNameSeek++){
        
-                                       DataLine += "TZNAME";
+                                       dataLine += "TZNAME";
 
-                                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameLanguage[TimezoneNameSeek].size() > 0){
+                                       if (timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameLanguage[timezoneNameSeek].size() > 0){
                
-                                               DataLine += ";LANGUAGE=";
-                                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameLanguage[TimezoneNameSeek];
+                                               dataLine += ";LANGUAGE=";
+                                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameLanguage[timezoneNameSeek];
                        
                                        }
                        
-                                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameTokens[TimezoneNameSeek].size() > 0){
+                                       if (timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameTokens[timezoneNameSeek].size() > 0){
                
-                                               DataLine += ";";
-                                               DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameTokens[TimezoneNameSeek];
+                                               dataLine += ";";
+                                               dataLine += timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameTokens[timezoneNameSeek];
                        
                                        }
                                
-                                       DataLine += ":";
-                                       DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameData[TimezoneNameSeek];
-                                       DataLine += "\n";
+                                       dataLine += ":";
+                                       dataLine += timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameData[timezoneNameSeek];
+                                       dataLine += "\n";
 
-                                       DataLineProcessed = OutputText(&DataLine);
+                                       dataLineProcessed = OutputText(&dataLine);
                
-                                       *SaveData += DataLineProcessed;
+                                       *saveData += dataLineProcessed;
 
-                                       DataLine.clear();
-                                       DataLineProcessed.clear();
+                                       dataLine.clear();
+                                       dataLineProcessed.clear();
                                
                                }
                
@@ -642,33 +642,33 @@ void CalendarTimezoneObject::SaveObjectData(string *SaveData){
 
                        // Process data from X-*
        
-                       if (TimezoneDaylightCollection[TimezoneDaylightSeek].XTokensData.size() > 0){
+                       if (timezoneDaylightCollection[timezoneDaylightSeek].xTokensData.size() > 0){
                                
-                               for (int TimezoneXTokenSeek = 0; TimezoneXTokenSeek < TimezoneDaylightCollection[TimezoneDaylightSeek].XTokensData.size();
-                                       TimezoneXTokenSeek++){
+                               for (int timezoneXTokenSeek = 0; timezoneXTokenSeek < timezoneDaylightCollection[timezoneDaylightSeek].xTokensData.size();
+                                       timezoneXTokenSeek++){
                                
-                                       DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].XTokensDataTokens[TimezoneXTokenSeek];
-                                       DataLine += ":";
-                                       DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].XTokensData[TimezoneXTokenSeek];
-                                       DataLine += "\n";
+                                       dataLine += timezoneDaylightCollection[timezoneDaylightSeek].xTokensDataTokens[timezoneXTokenSeek];
+                                       dataLine += ":";
+                                       dataLine += timezoneDaylightCollection[timezoneDaylightSeek].xTokensData[timezoneXTokenSeek];
+                                       dataLine += "\n";
 
-                                       DataLineProcessed = OutputText(&DataLine);
+                                       dataLineProcessed = OutputText(&dataLine);
                
-                                       *SaveData += DataLineProcessed;
+                                       *saveData += dataLineProcessed;
 
-                                       DataLine.clear();
-                                       DataLineProcessed.clear();
+                                       dataLine.clear();
+                                       dataLineProcessed.clear();
                                                
                                }
                                
                        }
                        
-                       *SaveData += "END:DAYLIGHT\n";
+                       *saveData += "END:DAYLIGHT\n";
                                
                }
                
        }
        
-       *SaveData += "END:VTIMEZONE\n";
+       *saveData += "END:VTIMEZONE\n";
        
 }
\ No newline at end of file
index d699f13..a1f6648 100644 (file)
@@ -22,49 +22,49 @@ using namespace std;
 
 CalendarObjectValidResult CalendarTimezoneObject::ValidObject(){
  
-       bool ValidBegin = false;
-       bool ValidEnd = false;
-       bool ValidTimeZoneID = false;
-       int SeekCount = 0;
-       string PropertyName;
+       bool validBegin = false;
+       bool validEnd = false;
+       bool validTimeZoneID = false;
+int seekCount = 0;
+       string propertyName;
        
        // Look for BEGIN:VEVENT.
        
-       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] == "VTIMEZONE"){
+               if (objectName[seekCount] == "BEGIN" &&
+                       objectData[seekCount] == "VTIMEZONE"){
                        
-                       if (ValidBegin == false){
-                               ValidBegin = true;
+                       if (validBegin == false){
+                               validBegin = true;
                        } else {
                                return CALENDAROBJECTVALID_INVALIDFORMAT;
                        }
                                
                }
                
-               if (ObjectName[SeekCount] == "END" &&
-                       ObjectData[SeekCount] == "VTIMEZONE" &&
-                       ValidBegin == false){
+               if (objectName[seekCount] == "END" &&
+                       objectData[seekCount] == "VTIMEZONE" &&
+                       validBegin == false){
                
                        return CALENDAROBJECTVALID_INVALIDFORMAT;
                                
                }
                
-               SeekCount++;
+               seekCount++;
                        
        }
        
-       SeekCount = 0;
+       seekCount = 0;
        
        // Look for TZID.
        
-       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,4);
+                       PropertyName = objectName[seekCount].substr(0,4);
                }
                        
                catch(const out_of_range& oor){
@@ -73,45 +73,45 @@ CalendarObjectValidResult CalendarTimezoneObject::ValidObject(){
                
                if (PropertyName == "TZID"){
                        
-                       if (ValidTimeZoneID == false){
-                               ValidTimeZoneID = true;
+                       if (validTimeZoneID == false){
+                               validTimeZoneID = true;
                        } else {
                                return CALENDAROBJECTVALID_INVALIDFORMAT;
                        }
                                
                }
                        
-               SeekCount++;
+               seekCount++;
                        
        }
        
-       SeekCount = 0;
+       seekCount = 0;
        
        // Look for END:VEVENT.
        
-       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] == "VTIMEZONE"){
+               if (objectName[seekCount] == "END" &&
+                       objectData[seekCount] == "VTIMEZONE"){
                        
-                       if (ValidEnd == false){
-                               ValidEnd = true;
+                       if (validEnd == false){
+                               validEnd = true;
                        } else {
                                return CALENDAROBJECTVALID_INVALIDFORMAT;
                        }
                                
                }
                        
-               SeekCount++;
+               seekCount++;
                        
        }
        
        // Check if the VEVENT is valid.
        
-       if (ValidBegin == true && 
-               ValidEnd == true && 
-               ValidTimeZoneID == true){
+       if (validBegin == true && 
+               validEnd == true && 
+               validTimeZoneID == true){
                
                return CALENDAROBJECTVALID_OK;
                        
@@ -127,668 +127,666 @@ void CalendarTimezoneObject::ProcessData(){
 
        // Process the data.
        
-       multimap<string,string> DataReceived;
-       map<string,string> PropertyData;
-       string *PropertyNameData = nullptr;
-       int ObjectSeekCount = 0;
+       multimap<string,string> dataReceived;
+       map<string,string> propertyData;
+       string *propertyNameData = nullptr;
+       int objectSeekCount = 0;
        
        // Process the data from TZID.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "TZID");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "TZID");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
                try {
-                       TimeZoneDataTokens = DataReceived.begin()->first.substr(5);
+                       timeZoneDataTokens = dataReceived.begin()->first.substr(5);
                }
                
                catch(const out_of_range &oor){
                        // Do nothing as there is no data.
                }               
                
-               TimeZoneData = DataReceived.begin()->second;
+               timeZoneData = 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 TZURL.
        
-       DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "TZURL");
+       dataReceived = ProcessTextVectors(&objectName, &objectData, false, "TZURL");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
                try {
-                       TimeZoneURLTokens = DataReceived.begin()->first.substr(6);
+                       timeZoneURLTokens = dataReceived.begin()->first.substr(6);
                }
                
                catch(const out_of_range &oor){
                        // Do nothing as there is no data.
                }               
                
-               TimeZoneURLData = DataReceived.begin()->second;
+               timeZoneURLData = dataReceived.begin()->second;
                
        }
        
        // Process data from each STANDARD and DAYLIGHT.
        
        ProcessStandardDaylight();
+
+       int seekCount = 0;
        
-       int TZSeekCount = 0;
-       int SeekCount = 0;
-       
-       for (vector<vector<string>>::iterator tzsiter = TimezoneStandardName.begin();
-               tzsiter != TimezoneStandardName.end(); tzsiter++){
+       for (vector<vector<string>>::iterator tzsiter = timezoneStandardName.begin();
+               tzsiter != timezoneStandardName.end(); tzsiter++){
 
-               bool DateTimeStartFound = false;
-               bool TimeZoneOffsetToFound = false;
-               bool TimeZoneOffsetFromFound = false;
+               bool dateTimeStartFound = false;
+               bool timeZoneOffsetToFound = false;
+               bool timeZoneOffsetFromFound = false;
                
-               TimezoneDataStruct NewTZData;
+               timezoneDataStruct newTZData;
                                        
                // Process the data from DTSTART.
        
-               DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-                               &TimezoneStandardData[SeekCount], false, "DTSTART");
+               dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+                               &timezoneStandardData[seekCount], false, "DTSTART");
        
-               if (DataReceived.begin() != DataReceived.end()){
+               if (dataReceived.begin() != dataReceived.end()){
        
                        try {
-                               NewTZData.DateTimeStartTokens = DataReceived.begin()->first.substr(8);
+                               newTZData.dateTimeStartTokens = dataReceived.begin()->first.substr(8);
                        }
                
                        catch(const out_of_range &oor){
                                // Do nothing as there is no data.
                        }
                
-                       NewTZData.DateTimeStartData = DataReceived.begin()->second;
-                       DateTimeStartFound = true;
+                       newTZData.dateTimeStartData = dataReceived.begin()->second;
+                       dateTimeStartFound = true;
                
                }
                        
                // Process the data from TZOFFSETFROM.
                        
-               DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-                               &TimezoneStandardData[SeekCount], false, "TZOFFSETFROM");
+               dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+                               &timezoneStandardData[seekCount], false, "TZOFFSETFROM");
        
-               if (DataReceived.begin() != DataReceived.end()){
+               if (dataReceived.begin() != dataReceived.end()){
        
                        try {
-                               NewTZData.TimeZoneOffsetFromTokens = DataReceived.begin()->first.substr(13);
+                               newTZData.timeZoneOffsetFromTokens = dataReceived.begin()->first.substr(13);
                        }
                
                        catch(const out_of_range &oor){
                                // Do nothing as there is no data.
                        }
                
-                       NewTZData.TimeZoneOffsetFromData = DataReceived.begin()->second;
-                       TimeZoneOffsetFromFound = true;
+                       newTZData.timeZoneOffsetFromData = dataReceived.begin()->second;
+                       timeZoneOffsetFromFound = true;
                
                }
                        
                // Process the data from TZOFFSETTO.
                        
-               DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-                               &TimezoneStandardData[SeekCount], false, "TZOFFSETTO");
+               dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+                               &timezoneStandardData[seekCount], false, "TZOFFSETTO");
        
-               if (DataReceived.begin() != DataReceived.end()){
+               if (dataReceived.begin() != dataReceived.end()){
        
                        try {
-                               NewTZData.TimeZoneOffsetToTokens = DataReceived.begin()->first.substr(11);
+                               newTZData.timeZoneOffsetToTokens = dataReceived.begin()->first.substr(11);
                        }
                
                        catch(const out_of_range &oor){
                                // Do nothing as there is no data.
                        }
                
-                       NewTZData.TimeZoneOffsetToData = DataReceived.begin()->second;
-                       TimeZoneOffsetToFound = true;
+                       newTZData.timeZoneOffsetToData = dataReceived.begin()->second;
+                       timeZoneOffsetToFound = true;
                
                }
                
                // Process the data from RRULE.
 
-               DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-                       &TimezoneStandardData[SeekCount], false, "RRULE");
+               dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+                       &timezoneStandardData[seekCount], false, "RRULE");
        
-               if (DataReceived.begin() != DataReceived.end()){
+               if (dataReceived.begin() != dataReceived.end()){
        
                        try {
-                               NewTZData.RecurranceRuleDataTokens = DataReceived.begin()->first.substr(6);
+                               newTZData.recurranceRuleDataTokens = dataReceived.begin()->first.substr(6);
                        }
                
                        catch(const out_of_range &oor){
                                // Do nothing as there is no data.
                        }               
                        
-                       NewTZData.RecurranceRuleData = DataReceived.begin()->second;
+                       newTZData.recurranceRuleData = dataReceived.begin()->second;
                
                }
                        
                // Process the data from COMMENT.
        
-               DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-                       &TimezoneStandardData[SeekCount], true, "COMMENT");
+               dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+                       &timezoneStandardData[seekCount], true, "COMMENT");
 
-               ObjectSeekCount = 0;
+               objectSeekCount = 0;
        
-               for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-                       propiter != DataReceived.end(); 
+               for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+                       propiter != dataReceived.end(); 
                        ++propiter){
                
-                       NewTZData.CommentListTokens.push_back("");
-                       NewTZData.CommentListAltRep.push_back("");
-                       NewTZData.CommentListLanguage.push_back("");
-                       NewTZData.CommentList.push_back("");
+                       newTZData.commentListTokens.push_back("");
+                       newTZData.commentListAltRep.push_back("");
+                       newTZData.commentListLanguage.push_back("");
+                       newTZData.commentList.push_back("");
                        
                        bool TokenData = false;
-                       string PropertyTokens;
+                       string propertyTokens;
                
-                       PropertyNameData = (string*)&propiter->first;
+                       propertyNameData = (string*)&propiter->first;
                
-                       PropertyData = SplitValues(*PropertyNameData);
+                       propertyData = SplitValues(*propertyNameData);
                        
-                       for(map<string,string>::iterator propdataiter = PropertyData.begin();
-                               propdataiter != PropertyData.end(); propdataiter++){
+                       for(map<string,string>::iterator propdataiter = propertyData.begin();
+                               propdataiter != propertyData.end(); propdataiter++){
                        
                                if (propdataiter->first == "ALTREP"){
                                
-                                       NewTZData.CommentListAltRep[ObjectSeekCount] = propdataiter->second;
+                                       newTZData.commentListAltRep[objectSeekCount] = propdataiter->second;
                                
                                } else if (propdataiter->first == "LANGUAGE"){
                                
-                                       NewTZData.CommentListLanguage[ObjectSeekCount] = propdataiter->second;
+                                       newTZData.commentListLanguage[objectSeekCount] = propdataiter->second;
                                
                                } else {
                                
                                        if (TokenData == false){
                                                TokenData = true;
                                        } else {
-                                               PropertyTokens += ";";
+                                               propertyTokens += ";";
                                        }
                                
-                                       PropertyTokens += propdataiter->first;
-                                       PropertyTokens += "=";
-                                       PropertyTokens += propdataiter->second;
+                                       propertyTokens += propdataiter->first;
+                                       propertyTokens += "=";
+                                       propertyTokens += propdataiter->second;
                                
                                }
                                
                        }
                
-                       if (PropertyTokens.size() > 0){
-                               NewTZData.CommentListTokens[ObjectSeekCount] = PropertyTokens;
+                       if (propertyTokens.size() > 0){
+                               newTZData.commentListTokens[objectSeekCount] = propertyTokens;
                        }
                        
-                       NewTZData.CommentList[ObjectSeekCount] = propiter->second;
+                       newTZData.commentList[objectSeekCount] = propiter->second;
                        
-                       ObjectSeekCount++;
+                       objectSeekCount++;
                
                }
                
                // Process the data from RDATE.
                        
-               DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-                       &TimezoneStandardData[SeekCount], true, "RDATE");
+               dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+                       &timezoneStandardData[seekCount], true, "RDATE");
 
-               ObjectSeekCount = 0;
+               objectSeekCount = 0;
        
-               for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-                       propiter != DataReceived.end(); 
+               for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+                       propiter != dataReceived.end(); 
                        ++propiter){
                
-                       NewTZData.RecurranceDateDataTokens.push_back("");
-                       NewTZData.RecurranceDateDataValue.push_back("");
-                       NewTZData.RecurranceDateDataTimeZoneParam.push_back("");
-                       NewTZData.RecurranceDateData.push_back("");
+                       newTZData.recurranceDateDataTokens.push_back("");
+                       newTZData.recurranceDateDataValue.push_back("");
+                       newTZData.recurranceDateDataTimeZoneParam.push_back("");
+                       newTZData.recurranceDateData.push_back("");
                        
                        bool TokenData = false;
-                       string PropertyTokens;
+                       string propertyTokens;
                
-                       PropertyNameData = (string*)&propiter->first;
+                       propertyNameData = (string*)&propiter->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"){
                        
-                                       NewTZData.RecurranceDateDataValue[ObjectSeekCount] = dataiter->second;
+                                       newTZData.recurranceDateDataValue[objectSeekCount] = dataiter->second;
                                
                                } else if (dataiter->first == "TZID"){
                                
-                                       NewTZData.RecurranceDateDataTimeZoneParam[ObjectSeekCount] = dataiter->second;
+                                       newTZData.recurranceDateDataTimeZoneParam[objectSeekCount] = dataiter->second;
                                
                                } else {
                                
                                        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){
-                               NewTZData.RecurranceDateDataTokens[ObjectSeekCount] = PropertyTokens;
+                       if (propertyTokens.size() > 0){
+                               newTZData.recurranceDateDataTokens[objectSeekCount] = propertyTokens;
                        }
                        
-                       NewTZData.RecurranceDateData[ObjectSeekCount] = propiter->second;
+                       newTZData.recurranceDateData[objectSeekCount] = propiter->second;
                
-                       ObjectSeekCount++;
+                       objectSeekCount++;
                
                }
                        
-               // Process the data from TZNAME.
+// Process the data from TZNAME.
                        
-               DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-                       &TimezoneStandardData[SeekCount], true, "TZNAME");
+               dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+                       &timezoneStandardData[seekCount], true, "TZNAME");
 
-               ObjectSeekCount = 0;
+               objectSeekCount = 0;
        
-               for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-                       propiter != DataReceived.end(); 
+               for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+                       propiter != dataReceived.end(); 
                        ++propiter){
                
-                       NewTZData.TimeZoneNameTokens.push_back("");
-                       NewTZData.TimeZoneNameLanguage.push_back("");
-                       NewTZData.TimeZoneNameData.push_back("");
+                       newTZData.timeZoneNameTokens.push_back("");
+                       newTZData.timeZoneNameLanguage.push_back("");
+                       newTZData.timeZoneNameData.push_back("");
                        
                        bool TokenData = false;
-                       string PropertyTokens;
+                       string propertyTokens;
                
-                       PropertyNameData = (string*)&propiter->first;
+                       propertyNameData = (string*)&propiter->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"){
                                
-                                       NewTZData.TimeZoneNameLanguage[ObjectSeekCount] = dataiter->second;
+                                       newTZData.timeZoneNameLanguage[objectSeekCount] = dataiter->second;
                                
                                } else {
                                
                                        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){
-                               NewTZData.TimeZoneNameTokens[ObjectSeekCount] = PropertyTokens;
+                       if (propertyTokens.size() > 0){
+                               newTZData.timeZoneNameTokens[objectSeekCount] = propertyTokens;
                        }
                        
-                       NewTZData.TimeZoneNameData[ObjectSeekCount] = propiter->second;
+                       newTZData.timeZoneNameData[objectSeekCount] = propiter->second;
                
-                       ObjectSeekCount++;
+                       objectSeekCount++;
                
                }
                        
-               ObjectSeekCount = 0;
+               objectSeekCount = 0;
        
                // Process data from X-*
        
-               for(vector<string>::iterator propiter = TimezoneStandardName[SeekCount].begin(); 
-                       propiter != TimezoneStandardName[SeekCount].end(); ++propiter){
+               for(vector<string>::iterator propiter = timezoneStandardName[seekCount].begin(); 
+                       propiter != timezoneStandardName[seekCount].end(); ++propiter){
                
                        if (propiter->substr(0,2) == "X-" &&
                                propiter->size() > 2){
                                        
-                               NewTZData.XTokensData.push_back(TimezoneStandardData[SeekCount][ObjectSeekCount]);
-                               NewTZData.XTokensDataTokens.push_back(TimezoneStandardName[SeekCount][ObjectSeekCount]);
+                               newTZData.xTokensData.push_back(timezoneStandardData[seekCount][objectSeekCount]);
+                               newTZData.xTokensDataTokens.push_back(timezoneStandardName[seekCount][objectSeekCount]);
                                
                        }
                
-                       ObjectSeekCount++;
+                       objectSeekCount++;
                
                }
                
                // Check if the required values were given and
-               // insert NewTZData into the vector list of
+               // insert newTZData into the vector list of
                // standard timezones.
                        
-               if (DateTimeStartFound == true &&
-                       TimeZoneOffsetToFound == true &&
-                       TimeZoneOffsetFromFound == true){
+               if (dateTimeStartFound == true &&
+                       timeZoneOffsetToFound == true &&
+                       timeZoneOffsetFromFound == true){
                                        
-                       TimezoneStandardCollection.push_back(NewTZData);
+                       timezoneStandardCollection.push_back(newTZData);
                                        
                }
                        
-               SeekCount++;
+               seekCount++;
                        
        }
 
-       TZSeekCount = 0;
-       SeekCount = 0;
+       seekCount = 0;
        
-       for (vector<vector<string>>::iterator tzsiter = TimezoneDaylightName.begin();
-               tzsiter != TimezoneDaylightName.end(); tzsiter++){
+       for (vector<vector<string>>::iterator tzsiter = timezoneDaylightName.begin();
+               tzsiter != timezoneDaylightName.end(); tzsiter++){
 
-               bool DateTimeStartFound = false;
-               bool TimeZoneOffsetToFound = false;
-               bool TimeZoneOffsetFromFound = false;
+               bool dateTimeStartFound = false;
+               bool timeZoneOffsetToFound = false;
+               bool timeZoneOffsetFromFound = false;
                
-               TimezoneDataStruct NewTZData;
+               TimezoneDataStruct newTZData;
                                        
                // Process the data from DTSTART.
        
-               DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-                               &TimezoneDaylightData[SeekCount], false, "DTSTART");
+               dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+                               &timezoneDaylightData[seekCount], false, "DTSTART");
        
-               if (DataReceived.begin() != DataReceived.end()){
+               if (dataReceived.begin() != dataReceived.end()){
        
                        try {
-                               NewTZData.DateTimeStartTokens = DataReceived.begin()->first.substr(8);
+                               newTZData.dateTimeStartTokens = dataReceived.begin()->first.substr(8);
                        }
                
                        catch(const out_of_range &oor){
                                // Do nothing as there is no data.
                        }
                
-                       NewTZData.DateTimeStartData = DataReceived.begin()->second;
-                       DateTimeStartFound = true;
+                       newTZData.dateTimeStartData = dataReceived.begin()->second;
+                       dateTimeStartFound = true;
                
                }
                        
                // Process the data from TZOFFSETFROM.
                        
-               DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-                               &TimezoneDaylightData[SeekCount], false, "TZOFFSETFROM");
+               dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+                               &timezoneDaylightData[seekCount], false, "TZOFFSETFROM");
        
-               if (DataReceived.begin() != DataReceived.end()){
+               if (dataReceived.begin() != dataReceived.end()){
        
                        try {
-                               NewTZData.TimeZoneOffsetFromTokens = DataReceived.begin()->first.substr(13);
+                               newTZData.timeZoneOffsetFromTokens = dataReceived.begin()->first.substr(13);
                        }
                
                        catch(const out_of_range &oor){
                                // Do nothing as there is no data.
                        }
                
-                       NewTZData.TimeZoneOffsetFromData = DataReceived.begin()->second;
-                       TimeZoneOffsetFromFound = true;
+                       newTZData.timeZoneOffsetFromData = dataReceived.begin()->second;
+                       timeZoneOffsetFromFound = true;
                
                }
                        
                // Process the data from TZOFFSETTO.
                        
-               DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-                               &TimezoneDaylightData[SeekCount], false, "TZOFFSETTO");
+               dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+                               &timezoneDaylightData[seekCount], false, "TZOFFSETTO");
        
-               if (DataReceived.begin() != DataReceived.end()){
+               if (dataReceived.begin() != dataReceived.end()){
        
                        try {
-                               NewTZData.TimeZoneOffsetToTokens = DataReceived.begin()->first.substr(11);
+                               newTZData.timeZoneOffsetToTokens = dataReceived.begin()->first.substr(11);
                        }
                
                        catch(const out_of_range &oor){
                                // Do nothing as there is no data.
                        }
                
-                       NewTZData.TimeZoneOffsetToData = DataReceived.begin()->second;
-                       TimeZoneOffsetToFound = true;
+                       newTZData.timeZoneOffsetToData = dataReceived.begin()->second;
+                       timeZoneOffsetToFound = true;
                
                }
                
                // Process the data from RRULE.
 
-               DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-                       &TimezoneDaylightData[SeekCount], false, "RRULE");
+               dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+                       &timezoneDaylightData[seekCount], false, "RRULE");
        
-               if (DataReceived.begin() != DataReceived.end()){
+               if (dataReceived.begin() != dataReceived.end()){
        
                        try {
-                               NewTZData.RecurranceRuleDataTokens = DataReceived.begin()->first.substr(6);
+                               newTZData.recurranceRuleDataTokens = dataReceived.begin()->first.substr(6);
                        }
                
                        catch(const out_of_range &oor){
                                // Do nothing as there is no data.
                        }               
                        
-                       NewTZData.RecurranceRuleData = DataReceived.begin()->second;
+                       newTZData.recurranceRuleData = dataReceived.begin()->second;
                
                }
                        
                // Process the data from COMMENT.
        
-               DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-                       &TimezoneDaylightData[SeekCount], true, "COMMENT");
+               dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+                       &timezoneDaylightData[seekCount], true, "COMMENT");
 
-               ObjectSeekCount = 0;
+               objectSeekCount = 0;
        
-               for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-                       propiter != DataReceived.end(); 
+               for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+                       propiter != dataReceived.end(); 
                        ++propiter){
                
-                       NewTZData.CommentListTokens.push_back("");
-                       NewTZData.CommentListAltRep.push_back("");
-                       NewTZData.CommentListLanguage.push_back("");
-                       NewTZData.CommentList.push_back("");
+                       newTZData.commentListTokens.push_back("");
+                       newTZData.commentListAltRep.push_back("");
+                       newTZData.commentListLanguage.push_back("");
+                       newTZData.commentList.push_back("");
                        
                        bool TokenData = false;
-                       string PropertyTokens;
+                       string propertyTokens;
                
-                       PropertyNameData = (string*)&propiter->first;
+                       propertyNameData = (string*)&propiter->first;
                
-                       PropertyData = SplitValues(*PropertyNameData);
+                       propertyData = SplitValues(*propertyNameData);
                        
-                       for(map<string,string>::iterator propdataiter = PropertyData.begin();
-                               propdataiter != PropertyData.end(); propdataiter++){
+                       for(map<string,string>::iterator propdataiter = propertyData.begin();
+                               propdataiter != propertyData.end(); propdataiter++){
                        
                                if (propdataiter->first == "ALTREP"){
                                
-                                       NewTZData.CommentListAltRep[ObjectSeekCount] = propdataiter->second;
+                                       newTZData.commentListAltRep[objectSeekCount] = propdataiter->second;
                                
                                } else if (propdataiter->first == "LANGUAGE"){
                                
-                                       NewTZData.CommentListLanguage[ObjectSeekCount] = propdataiter->second;
+                                       newTZData.commentListLanguage[objectSeekCount] = propdataiter->second;
                                
                                } else {
                                
                                        if (TokenData == false){
                                                TokenData = true;
                                        } else {
-                                               PropertyTokens += ";";
+                                               propertyTokens += ";";
                                        }
                                
-                                       PropertyTokens += propdataiter->first;
-                                       PropertyTokens += "=";
-                                       PropertyTokens += propdataiter->second;
+                                       propertyTokens += propdataiter->first;
+                                       propertyTokens += "=";
+                                       propertyTokens += propdataiter->second;
                                
                                }
                                
                        }
                
-                       if (PropertyTokens.size() > 0){
-                               NewTZData.CommentListTokens[ObjectSeekCount] = PropertyTokens;
+                       if (propertyTokens.size() > 0){
+                               newTZData.commentListTokens[objectSeekCount] = propertyTokens;
                        }
                        
-                       NewTZData.CommentList[ObjectSeekCount] = propiter->second;
+                       newTZData.commentList[objectSeekCount] = propiter->second;
                        
-                       ObjectSeekCount++;
+                       objectSeekCount++;
                
                }
                
                // Process the data from RDATE.
                        
-               DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-                       &TimezoneDaylightData[SeekCount], true, "RDATE");
+               dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+                       &timezoneDaylightData[seekCount], true, "RDATE");
 
-               ObjectSeekCount = 0;
+               objectSeekCount = 0;
        
-               for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-                       propiter != DataReceived.end(); 
+               for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+                       propiter != dataReceived.end(); 
                        ++propiter){
                
-                       NewTZData.RecurranceDateDataTokens.push_back("");
-                       NewTZData.RecurranceDateDataValue.push_back("");
-                       NewTZData.RecurranceDateDataTimeZoneParam.push_back("");
-                       NewTZData.RecurranceDateData.push_back("");
+                       newTZData.recurranceDateDataTokens.push_back("");
+                       newTZData.recurranceDateDataValue.push_back("");
+                       newTZData.recurranceDateDataTimeZoneParam.push_back("");
+                       newTZData.recurranceDateData.push_back("");
                        
                        bool TokenData = false;
-                       string PropertyTokens;
+                       string propertyTokens;
                
-                       PropertyNameData = (string*)&propiter->first;
+                       propertyNameData = (string*)&propiter->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"){
                        
-                                       NewTZData.RecurranceDateDataValue[ObjectSeekCount] = dataiter->second;
+                                       newTZData.recurranceDateDataValue[objectSeekCount] = dataiter->second;
                                
                                } else if (dataiter->first == "TZID"){
                                
-                                       NewTZData.RecurranceDateDataTimeZoneParam[ObjectSeekCount] = dataiter->second;
+                                       newTZData.recurranceDateDataTimeZoneParam[objectSeekCount] = dataiter->second;
                                
                                } else {
                                
                                        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){
-                               NewTZData.RecurranceDateDataTokens[ObjectSeekCount] = PropertyTokens;
+                       if (propertyTokens.size() > 0){
+                               newTZData.recurranceDateDataTokens[objectSeekCount] = propertyTokens;
                        }
                        
-                       NewTZData.RecurranceDateData[ObjectSeekCount] = propiter->second;
+                       newTZData.recurranceDateData[objectSeekCount] = propiter->second;
                
-                       ObjectSeekCount++;
+                       objectSeekCount++;
                
                }
                        
                // Process the data from TZNAME.
                        
-               DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-                       &TimezoneDaylightData[SeekCount], true, "TZNAME");
+               dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+                       &timezoneDaylightData[seekCount], true, "TZNAME");
 
-               ObjectSeekCount = 0;
+               objectSeekCount = 0;
        
-               for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-                       propiter != DataReceived.end(); 
+               for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+                       propiter != dataReceived.end(); 
                        ++propiter){
                
-                       NewTZData.TimeZoneNameTokens.push_back("");
-                       NewTZData.TimeZoneNameLanguage.push_back("");
-                       NewTZData.TimeZoneNameData.push_back("");
+                       newTZData.timeZoneNameTokens.push_back("");
+                       newTZData.timeZoneNameLanguage.push_back("");
+                       newTZData.timeZoneNameData.push_back("");
                        
                        bool TokenData = false;
-                       string PropertyTokens;
+                       string propertyTokens;
                
-                       PropertyNameData = (string*)&propiter->first;
+                       propertyNameData = (string*)&propiter->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"){
                                
-                                       NewTZData.TimeZoneNameLanguage[ObjectSeekCount] = dataiter->second;
+                                       newTZData.timeZoneNameLanguage[objectSeekCount] = dataiter->second;
                                
                                } else {
                                
                                        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){
-                               NewTZData.TimeZoneNameTokens[ObjectSeekCount] = PropertyTokens;
+                       if (propertyTokens.size() > 0){
+                               newTZData.timeZoneNameTokens[objectSeekCount] = propertyTokens;
                        }
                        
-                       NewTZData.TimeZoneNameData[ObjectSeekCount] = propiter->second;
+                       newTZData.timeZoneNameData[objectSeekCount] = propiter->second;
                
-                       ObjectSeekCount++;
+                       objectSeekCount++;
                
                }
                        
-               ObjectSeekCount = 0;
+               objectSeekCount = 0;
        
                // Process data from X-*
        
-               for(vector<string>::iterator propiter = TimezoneDaylightName[SeekCount].begin(); 
-                       propiter != TimezoneDaylightName[SeekCount].end(); ++propiter){
+               for(vector<string>::iterator propiter = timezoneDaylightName[seekCount].begin(); 
+                       propiter != timezoneDaylightName[seekCount].end(); ++propiter){
                
                        if (propiter->substr(0,2) == "X-" &&
                                propiter->size() > 2){
                                        
-                               NewTZData.XTokensData.push_back(TimezoneDaylightData[SeekCount][ObjectSeekCount]);
-                               NewTZData.XTokensDataTokens.push_back(TimezoneDaylightName[SeekCount][ObjectSeekCount]);
+                               newTZData.xTokensData.push_back(timezoneDaylightData[seekCount][objectSeekCount]);
+                               newTZData.xTokensDataTokens.push_back(timezoneDaylightName[seekCount][objectSeekCount]);
                                
                        }
                
-                       ObjectSeekCount++;
+                       objectSeekCount++;
                
                }
                
                // Check if the required values were given and
-               // insert NewTZData into the vector list of
+               // insert newTZData into the vector list of
                // daylight timezones.
                        
-               if (DateTimeStartFound == true &&
-                       TimeZoneOffsetToFound == true &&
-                       TimeZoneOffsetFromFound == true){
+               if (dateTimeStartFound == true &&
+                       timeZoneOffsetToFound == true &&
+                       timeZoneOffsetFromFound == true){
                                        
-                       TimezoneDaylightCollection.push_back(NewTZData);
+                       timezoneDaylightCollection.push_back(newTZData);
                                        
                }
                        
-               SeekCount++;
+               seekCount++;
                        
        }
        
@@ -796,36 +794,36 @@ void CalendarTimezoneObject::ProcessData(){
 
 void CalendarTimezoneObject::ProcessStandardDaylight(){
 
-       int SeekCount = 0;
+       int seekCount = 0;
        
        bool TZMode = false; // False = STANDARD, True = DAYLIGHT.
-       bool ValidBegin = false;
-       vector<string> TimezoneObjectName;
-       vector<string> TimezoneObjectData;
+       bool validBegin = false;
+       vector<string> timezoneObjectName;
+       vector<string> timezoneObjectData;
        
-       for (vector<string>::iterator iter = ObjectName.begin();
-               iter != ObjectName.end(); iter++){      
+       for (vector<string>::iterator iter = objectName.begin();
+               iter != objectName.end(); iter++){      
        
                // Check if the current name is BEGIN and
                // data is either STANDARD or DAYLIGHT.
                        
-               if (ObjectName[SeekCount] == "BEGIN" &&
-                       (ObjectData[SeekCount] == "STANDARD" || 
-                       ObjectData[SeekCount] == "DAYLIGHT")){
+               if (objectName[seekCount] == "BEGIN" &&
+                       (objectData[seekCount] == "STANDARD" || 
+                       objectData[seekCount] == "DAYLIGHT")){
                        
-                       if (ValidBegin == false){
-                               ValidBegin = true;
+                       if (validBegin == false){
+                               validBegin = true;
                        } else {
                                
                        }
                        
-                       if (ObjectData[SeekCount] == "STANDARD"){
+                       if (objectData[seekCount] == "STANDARD"){
                                TZMode = false;
-                       } else if (ObjectData[SeekCount] == "DAYLIGHT") {
+                       } else if (objectData[seekCount] == "DAYLIGHT") {
                                TZMode = true;
                        }
                        
-                       SeekCount++;
+                       seekCount++;
                        continue;
                        
                }
@@ -833,34 +831,34 @@ void CalendarTimezoneObject::ProcessStandardDaylight(){
                // Check if current name is END and
                // data is either STANDARD or DAYLIGHT.
                
-               if (ObjectName[SeekCount] == "END" &&
-                       (ObjectData[SeekCount] == "STANDARD" || 
-                       ObjectData[SeekCount] == "DAYLIGHT") && 
-                       ValidBegin == true){
+               if (objectName[seekCount] == "END" &&
+                       (objectData[seekCount] == "STANDARD" || 
+                       objectData[seekCount] == "DAYLIGHT") && 
+                       validBegin == true){
                                
-                       if (TZMode == false && TimezoneObjectName.size() > 0){
-                               TimezoneStandardName.push_back(TimezoneObjectName);
-                               TimezoneStandardData.push_back(TimezoneObjectData);
+                       if (TZMode == false && timezoneObjectName.size() > 0){
+                               timezoneStandardName.push_back(timezoneObjectName);
+                               timezoneStandardData.push_back(timezoneObjectData);
                        } else {
-                               TimezoneDaylightName.push_back(TimezoneObjectName);
-                               TimezoneDaylightData.push_back(TimezoneObjectData);
+                               timezoneDaylightName.push_back(timezoneObjectName);
+                               timezoneDaylightData.push_back(timezoneObjectData);
                        }
                        
-                       TimezoneObjectName.clear();
-                       TimezoneObjectData.clear();
+                       timezoneObjectName.clear();
+                       timezoneObjectData.clear();
                        
-                       ValidBegin = false;
+                       validBegin = false;
                                
                }
                
-               if (ValidBegin == true){
+               if (validBegin == true){
                        
-                       TimezoneObjectName.push_back(ObjectName[SeekCount]);
-                       TimezoneObjectData.push_back(ObjectData[SeekCount]);
+                       timezoneObjectName.push_back(objectName[seekCount]);
+                       timezoneObjectData.push_back(objectData[seekCount]);
                        
                }
                
-               SeekCount++;
+               seekCount++;
                        
        }
                        
index 20240ea..50cd0c8 100644 (file)
 using namespace std;
 
 struct TimezoneDataStruct{
-       string DateTimeStartData;
-       string DateTimeStartTokens;
-       string TimeZoneOffsetToData;
-       string TimeZoneOffsetToTokens;
-       string TimeZoneOffsetFromData;
-       string TimeZoneOffsetFromTokens;
+       string dateTimeStartData;
+       string dateTimeStartTokens;
+       string timeZoneOffsetToData;
+       string timeZoneOffsetToTokens;
+       string timeZoneOffsetFromData;
+       string timeZoneOffsetFromTokens;
        
-       string RecurranceRuleData;
-       string RecurranceRuleDataTokens;
+       string recurranceRuleData;
+       string recurranceRuleDataTokens;
        
-       vector<string> CommentList;
-       vector<string> CommentListAltRep;
-       vector<string> CommentListLanguage;
-       vector<string> CommentListTokens;
+       vector<string> commentList;
+       vector<string> commentListAltRep;
+       vector<string> commentListLanguage;
+       vector<string> commentListTokens;
        
-       vector<string> RecurranceDateData;
-       vector<string> RecurranceDateDataValue;
-       vector<string> RecurranceDateDataTimeZoneParam;
-       vector<string> RecurranceDateDataTokens;
+       vector<string> recurranceDateData;
+       vector<string> recurranceDateDataValue;
+       vector<string> recurranceDateDataTimeZoneParam;
+       vector<string> recurranceDateDataTokens;
        
-       vector<string> TimeZoneNameData;
-       vector<string> TimeZoneNameLanguage;
-       vector<string> TimeZoneNameTokens;
+       vector<string> timeZoneNameData;
+       vector<string> timeZoneNameLanguage;
+       vector<string> timeZoneNameTokens;
        
-       vector<string> XTokensData;
-       vector<string> XTokensDataTokens;
+       vector<string> xTokensData;
+       vector<string> xTokensDataTokens;
 };
 
 class CalendarTimezoneObject: public CalendarObject{
@@ -57,19 +57,19 @@ class CalendarTimezoneObject: public CalendarObject{
        CalendarObjectValidResult ValidObject();
        
        public:
-       vector<vector<string>> TimezoneStandardName;
-       vector<vector<string>> TimezoneStandardData;
-       vector<vector<string>> TimezoneDaylightName;    
-       vector<vector<string>> TimezoneDaylightData;
+       vector<vector<string>> timezoneStandardName;
+       vector<vector<string>> timezoneStandardData;
+       vector<vector<string>> timezoneDaylightName;    
+       vector<vector<string>> timezoneDaylightData;
        
-       vector<TimezoneDataStruct> TimezoneStandardCollection;
-       vector<TimezoneDataStruct> TimezoneDaylightCollection;
+       vector<TimezoneDataStruct> timezoneStandardCollection;
+       vector<TimezoneDataStruct> timezoneDaylightCollection;
        
        private:
        
        void ProcessData();
        void ProcessStandardDaylight();
-       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