camelCase: Converted remaining code that was missed

[xestiacalendar/.git] / source / libraries / CalendarDataStorage / CalendarDataStorage.cpp

diff --git a/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp b/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
index b1d2c5b..4a690b2 100644 (file)
--- a/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
+++ b/source/libraries/CalendarDataStorage/CalendarDataStorage.cpp
@@ -1,9 +1,25 @@
+// CalendarDataStorage.cpp - CalendarDataStorage class
+//
+// (c) 2016-2017 Xestia Software Development.
+//
+// This file is part of Xestia Calendar.
+//
+// Xestia Calendar is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Calendar is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Calendar. If not, see <http://www.gnu.org/licenses/>
+
 #include "CalendarDataStorage.h"
 
 #define CDS_RANDOMPOW 24
 
-#include <iostream>
-
 using namespace std;
 
 static int callback(void *NotUsed, int argc, char **argv, char **azColName){
@@ -958,14 +974,14 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
        
        // Start Date.
        
-       if (eventData.DateTimeStartData.size() < 16){
+       if (eventData.dateTimeStartData.size() < 16){
                
                addResult.addEventResult = CDSENTRY_INVALIDFILE;
                return addResult;
                
        }
        
-       eventString = eventData.DateTimeStartData.substr(0,4);
+       eventString = eventData.dateTimeStartData.substr(0,4);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -978,7 +994,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
        }
 
-       eventString = eventData.DateTimeStartData.substr(4,2);
+       eventString = eventData.dateTimeStartData.substr(4,2);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -991,7 +1007,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
        }
        
-       eventString = eventData.DateTimeStartData.substr(6,2);
+       eventString = eventData.dateTimeStartData.substr(6,2);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1004,7 +1020,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
        }
 
-       eventString = eventData.DateTimeStartData.substr(9,2);
+       eventString = eventData.dateTimeStartData.substr(9,2);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1017,7 +1033,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
        }
        
-       eventString = eventData.DateTimeStartData.substr(11,2);
+       eventString = eventData.dateTimeStartData.substr(11,2);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1030,7 +1046,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
        }
        
-       eventString = eventData.DateTimeStartData.substr(13,2);
+       eventString = eventData.dateTimeStartData.substr(13,2);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1055,16 +1071,16 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
        int eventEndSecond = 0;
        int eventEndDuration = 0;
        
-       if (eventData.DateTimeEndData != ""){
+       if (eventData.dateTimeEndData != ""){
        
-               if (eventData.DateTimeEndData.size() < 16){
+               if (eventData.dateTimeEndData.size() < 16){
                
                        addResult.addEventResult = CDSENTRY_INVALIDFILE;
                        return addResult;
                
                }
        
-               eventString = eventData.DateTimeEndData.substr(0,4);
+               eventString = eventData.dateTimeEndData.substr(0,4);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1077,7 +1093,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
                }
 
-               eventString = eventData.DateTimeEndData.substr(4,2);
+               eventString = eventData.dateTimeEndData.substr(4,2);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1090,7 +1106,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
                }
        
-               eventString = eventData.DateTimeEndData.substr(6,2);
+               eventString = eventData.dateTimeEndData.substr(6,2);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1103,7 +1119,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
                }
 
-               eventString = eventData.DateTimeEndData.substr(9,2);
+               eventString = eventData.dateTimeEndData.substr(9,2);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1116,7 +1132,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
                }
        
-               eventString = eventData.DateTimeEndData.substr(11,2);
+               eventString = eventData.dateTimeEndData.substr(11,2);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1129,7 +1145,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
                }
        
-               eventString = eventData.DateTimeEndData.substr(13,2);
+               eventString = eventData.dateTimeEndData.substr(13,2);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1144,7 +1160,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
                
        }
 
-       eventString = eventData.DurationData;
+       eventString = eventData.durationData;
        
        // Process the duration data.
        
@@ -1156,22 +1172,22 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
        
        // Get the duration (if DTEND hasn't been specified).
        
-       if (eventData.DurationData.size() > 0){
+       if (eventData.durationData.size() > 0){
                
                bool FoundP = false;
                bool FoundW = false;
                bool DateTimeMode = false;
                
-               std::string::iterator eventDataChar = eventData.DurationData.begin();
+               std::string::iterator eventDataChar = eventData.durationData.begin();
                std::string currentValue = "";
                
                if (*eventDataChar != 'P'){
                        
-                       eventDataChar = eventData.DurationData.end();
+                       eventDataChar = eventData.durationData.end();
                        
                }
                
-               for(eventDataChar; eventDataChar != eventData.DurationData.end(); eventDataChar++){
+               for(eventDataChar; eventDataChar != eventData.durationData.end(); eventDataChar++){
                        
                        // Check if value is a digit.
                        
@@ -1240,7 +1256,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
        
        // Process Entry Name.
        
-       resultCode = sqlite3_bind_text(statementHandle, 2, eventData.SummaryData.c_str(), -1, SQLITE_STATIC);
+       resultCode = sqlite3_bind_text(statementHandle, 2, eventData.summaryData.c_str(), -1, SQLITE_STATIC);
        
        if (resultCode != 0){
                addResult.addEventResult = CDSENTRY_FAILED;
@@ -1252,7 +1268,7 @@ CDSAddEntryResult CalendarDataStorage::AddEvent(int calendarID, std::string file
        string eventDescription;
        
        try {
-               eventDescription = eventData.DescriptionList.at(0);
+               eventDescription = eventData.descriptionList.at(0);
        }
        
        catch (out_of_range &err){
@@ -1489,14 +1505,14 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
        
        // Start Date.
        
-       if (eventData.DateTimeStartData.size() < 16){
+       if (eventData.dateTimeStartData.size() < 16){
                
                editResult.editEventResult = CDSENTRY_INVALIDFILE;
                return editResult;
                
        }
        
-       eventString = eventData.DateTimeStartData.substr(0,4);
+       eventString = eventData.dateTimeStartData.substr(0,4);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1509,7 +1525,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
        }
 
-       eventString = eventData.DateTimeStartData.substr(4,2);
+       eventString = eventData.dateTimeStartData.substr(4,2);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1522,7 +1538,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
        }
        
-       eventString = eventData.DateTimeStartData.substr(6,2);
+       eventString = eventData.dateTimeStartData.substr(6,2);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1535,7 +1551,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
        }
 
-       eventString = eventData.DateTimeStartData.substr(9,2);
+       eventString = eventData.dateTimeStartData.substr(9,2);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1548,7 +1564,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
        }
        
-       eventString = eventData.DateTimeStartData.substr(11,2);
+       eventString = eventData.dateTimeStartData.substr(11,2);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1561,7 +1577,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
        }
        
-       eventString = eventData.DateTimeStartData.substr(13,2);
+       eventString = eventData.dateTimeStartData.substr(13,2);
        
        if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1586,16 +1602,16 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
        int eventEndSecond = 0;
        int eventEndDuration = 0;
        
-       if (eventData.DateTimeEndData != ""){
+       if (eventData.dateTimeEndData != ""){
        
-               if (eventData.DateTimeEndData.size() < 16){
+               if (eventData.dateTimeEndData.size() < 16){
                
                        editResult.editEventResult = CDSENTRY_INVALIDFILE;
                        return editResult;
                
                }
        
-               eventString = eventData.DateTimeEndData.substr(0,4);
+               eventString = eventData.dateTimeEndData.substr(0,4);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1608,7 +1624,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
                }
 
-               eventString = eventData.DateTimeEndData.substr(4,2);
+               eventString = eventData.dateTimeEndData.substr(4,2);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1621,7 +1637,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
                }
        
-               eventString = eventData.DateTimeEndData.substr(6,2);
+               eventString = eventData.dateTimeEndData.substr(6,2);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1634,7 +1650,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
                }
 
-               eventString = eventData.DateTimeEndData.substr(9,2);
+               eventString = eventData.dateTimeEndData.substr(9,2);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1647,7 +1663,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
                }
        
-               eventString = eventData.DateTimeEndData.substr(11,2);
+               eventString = eventData.dateTimeEndData.substr(11,2);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1660,7 +1676,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
                }
        
-               eventString = eventData.DateTimeEndData.substr(13,2);
+               eventString = eventData.dateTimeEndData.substr(13,2);
        
                if (all_of(eventString.begin(), eventString.end(), ::isdigit)){
                
@@ -1675,7 +1691,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
                
        }
 
-       eventString = eventData.DurationData;
+       eventString = eventData.durationData;
        
        // Process the duration data.
        
@@ -1687,22 +1703,22 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
        
        // Get the duration (if DTEND hasn't been specified).
        
-       if (eventData.DurationData.size() > 0){
+       if (eventData.durationData.size() > 0){
                
                bool FoundP = false;
                bool FoundW = false;
                bool DateTimeMode = false;
                
-               std::string::iterator eventDataChar = eventData.DurationData.begin();
+               std::string::iterator eventDataChar = eventData.durationData.begin();
                std::string currentValue = "";
                
                if (*eventDataChar != 'P'){
                        
-                       eventDataChar = eventData.DurationData.end();
+                       eventDataChar = eventData.durationData.end();
                        
                }
                
-               for(eventDataChar; eventDataChar != eventData.DurationData.end(); eventDataChar++){
+               for(eventDataChar; eventDataChar != eventData.durationData.end(); eventDataChar++){
                        
                        // Check if value is a digit.
                        
@@ -1769,7 +1785,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
        
        // Process Entry Name.
        
-       resultCode = sqlite3_bind_text(statementHandle, 2, eventData.SummaryData.c_str(), -1, SQLITE_STATIC);
+       resultCode = sqlite3_bind_text(statementHandle, 2, eventData.summaryData.c_str(), -1, SQLITE_STATIC);
        
        if (resultCode != 0){
                editResult.editEventResult = CDSENTRY_FAILED;
@@ -1781,7 +1797,7 @@ CDSEditEntryResult CalendarDataStorage::UpdateEvent(int eventID, std::string fil
        string eventDescription;
        
        try {
-               eventDescription = eventData.DescriptionList.at(0);
+               eventDescription = eventData.descriptionList.at(0);
        }
        
        catch (out_of_range &err){