camelCase: Converted remaining code that was missed

[xestiacalendar/.git] / source / objects / calendarevent / CalendarEvent.cpp

diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp
index 1ca0345..339012a 100644 (file)
--- a/source/objects/calendarevent/CalendarEvent.cpp
+++ b/source/objects/calendarevent/CalendarEvent.cpp
@@ -158,8 +158,8 @@ CalendarObjectValidResult CalendarEventObject::ValidObject(){
        for (vector<string>::iterator iter = objectName.begin();
                iter != objectName.end(); iter++){
        
-               if (objectName[SeekCount] == "END" &&
-                       objectData[SeekCount] == "VEVENT"){
+               if (objectName[seekCount] == "END" &&
+                       objectData[seekCount] == "VEVENT"){
                        
                        if (validEnd == false){
                                validEnd = true;
@@ -418,7 +418,7 @@ void CalendarEventObject::ProcessData(){
        
        dataReceived = ProcessTextVectors(&objectName, &objectData, false, "LOCATION");
        
-       if (DataReceived.begin() != DataReceived.end()){
+       if (dataReceived.begin() != dataReceived.end()){
        
                bool tokenData = false;
                string propertyTokens;
@@ -514,7 +514,7 @@ void CalendarEventObject::ProcessData(){
                
                if (propertyTokens.size() > 0){
                        
-                       organiserDataTokens = PropertyTokens;
+                       organiserDataTokens = propertyTokens;
                        
                }
                
@@ -612,7 +612,7 @@ void CalendarEventObject::ProcessData(){
                        
                }
                
-               statusData = DataReceived.begin()->second;
+               statusData = dataReceived.begin()->second;
                
        }
        
@@ -833,10 +833,36 @@ void CalendarEventObject::ProcessData(){
                
                dataReceived = ProcessTextVectors(&objectName, &objectData, false, "DURATION");
                
-               if (dataReceived.begin() != dataReceived.end()){
+               bool tokenData = false;
+               string propertyTokens;
                
+               if (dataReceived.begin() != dataReceived.end()){
+                       
                        durationData = dataReceived.begin()->second;
                
+                       propertyNameData = (string*)&dataReceived.begin()->first;
+                       
+                       propertyData = SplitValues(*propertyNameData);
+                       
+                       for(map<string,string>::iterator dataiter = propertyData.begin();
+                               dataiter != propertyData.end(); dataiter++){
+                       
+                               if (tokenData == false){
+                                       tokenData = true;
+                               } else {
+                                       propertyTokens += ";";
+                               }
+                               
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
+                                       
+                       }
+                       
+                       if (propertyTokens.size() > 0){
+                               durationDataTokens = propertyTokens;
+                       }
+                       
                }
                
        }
@@ -959,7 +985,7 @@ void CalendarEventObject::ProcessData(){
                                
                        } else if (dataiter->first == "DELEGATED-TO"){
                                
-                               AttendeeListDelegatedTo[ObjectSeekCount] = dataiter->second;
+                               attendeeListDelegatedTo[objectSeekCount] = dataiter->second;
                                
                        } else if (dataiter->first == "DELEGATED-FROM"){
                                
@@ -1309,40 +1335,40 @@ void CalendarEventObject::ProcessData(){
                bool tokenData = false;
                string propertyTokens;
                
-               PropertyNameData = (string*)&iter->first;
+               propertyNameData = (string*)&iter->first;
                
-               PropertyData = SplitValues(*PropertyNameData);
+               propertyData = SplitValues(*propertyNameData);
                        
-               for(map<string,string>::iterator dataiter = PropertyData.begin();
-                       dataiter != PropertyData.end(); dataiter++){
+               for(map<string,string>::iterator dataiter = propertyData.begin();
+                       dataiter != propertyData.end(); dataiter++){
                        
                        if (dataiter->first == "RELTYPE"){
                                
-                               RelatedToDataRelationType[ObjectSeekCount] = dataiter->second;
+                               relatedToDataRelationType[objectSeekCount] = dataiter->second;
                                
                        } else {
                                
-                               if (TokenData == false){
-                                       TokenData = true;
+                               if (tokenData == false){
+                                       tokenData = true;
                                } else {
-                                       PropertyTokens += ";";
+                                       propertyTokens += ";";
                                }
                                
-                               PropertyTokens += dataiter->first;
-                               PropertyTokens += "=";
-                               PropertyTokens += dataiter->second;
+                               propertyTokens += dataiter->first;
+                               propertyTokens += "=";
+                               propertyTokens += dataiter->second;
                                
                        }
                                
                }
                
-               if (PropertyTokens.size() > 0){
-                       RelatedToDataTokens[ObjectSeekCount] = PropertyTokens;
+               if (propertyTokens.size() > 0){
+                       relatedToDataTokens[objectSeekCount] = propertyTokens;
                }
                        
-               RelatedToData[ObjectSeekCount] = iter->second;
+               relatedToData[objectSeekCount] = iter->second;
                
-               ObjectSeekCount++;
+               objectSeekCount++;
                
        }
 
@@ -1821,7 +1847,7 @@ void CalendarEventObject::ProcessData(){
                        }
                
                        if (propertyTokens.size() > 0){
-                               newAlarmData.attendeeListTokens[objectSeekCount] = PropertyTokens;
+                               newAlarmData.attendeeListTokens[objectSeekCount] = propertyTokens;
                        }
                        
                        newAlarmData.attendeeList[objectSeekCount] = iter->second;
@@ -1907,8 +1933,8 @@ void CalendarEventObject::ProcessData(){
                        if (xtokeniter->substr(0,2) == "X-" &&
                                xtokeniter->size() > 2){
                        
-                               newAlarmData.xTokensData.push_back(EventAlarmData[seekCount][alarmObjectCount]);
-                               newAlarmData.xTokensDataTokens.push_back(EventAlarmName[seekCount][alarmObjectCount]);
+                               newAlarmData.xTokensData.push_back(eventAlarmData[seekCount][alarmObjectCount]);
+                               newAlarmData.xTokensDataTokens.push_back(eventAlarmName[seekCount][alarmObjectCount]);
                                
                        }