Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiacalendar
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e3ae5d
)
camelCase: Converted code in calendartimezone directory
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Sat, 28 Jan 2017 21:13:35 +0000
(21:13 +0000)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Sat, 28 Jan 2017 21:13:35 +0000
(21:13 +0000)
source/objects/calendartimezone/CalendarTimezone-Save.cpp
patch
|
blob
|
history
source/objects/calendartimezone/CalendarTimezone.cpp
patch
|
blob
|
history
source/objects/calendartimezone/CalendarTimezone.h
patch
|
blob
|
history
diff --git
a/source/objects/calendartimezone/CalendarTimezone-Save.cpp
b/source/objects/calendartimezone/CalendarTimezone-Save.cpp
index
1a72a0b
..
109d664
100644
(file)
--- a/
source/objects/calendartimezone/CalendarTimezone-Save.cpp
+++ b/
source/objects/calendartimezone/CalendarTimezone-Save.cpp
@@
-1,4
+1,4
@@
-// Calendar
Timezone-Save.cpp - CalendarT
imezone class save functions
+// Calendar
timezone-Save.cpp - Calendart
imezone class save functions
//
// (c) 2016-2017 Xestia Software Development.
//
//
// (c) 2016-2017 Xestia Software Development.
//
@@
-16,263
+16,263
@@
// You should have received a copy of the GNU General Public License along
// with Xestia Calendar. If not, see <http://www.gnu.org/licenses/>
// 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 "Calendar
T
imezone.h"
+#include "Calendar
t
imezone.h"
using namespace std;
using namespace std;
-void Calendar
TimezoneObject::SaveObjectData(string *S
aveData){
+void Calendar
timezoneObject::SaveObjectData(string *s
aveData){
- string
D
ataLine = "";
- string
D
ataLineProcessed = "";
+ string
d
ataLine = "";
+ string
d
ataLineProcessed = "";
- *
S
aveData += "BEGIN:VTIMEZONE\n";
+ *
s
aveData += "BEGIN:VTIMEZONE\n";
// Process the TZID.
// Process the TZID.
- if (
T
imeZoneData.size() > 0){
+ if (
t
imeZoneData.size() > 0){
- if (
T
imeZoneDataTokens.size() > 0){
+ if (
t
imeZoneDataTokens.size() > 0){
-
D
ataLine += "TZID;";
-
DataLine += T
imeZoneDataTokens;
+
d
ataLine += "TZID;";
+
dataLine += t
imeZoneDataTokens;
} else {
} else {
-
D
ataLine += "TZID";
+
d
ataLine += "TZID";
}
}
-
D
ataLine += ":";
-
DataLine += T
imeZoneData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += t
imeZoneData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process the LAST-MODIFIED value.
}
// Process the LAST-MODIFIED value.
- if (
L
astModifiedData.size() > 0){
+ if (
l
astModifiedData.size() > 0){
- if (
L
astModifiedTokens.size() > 0){
+ if (
l
astModifiedTokens.size() > 0){
-
D
ataLine += "LAST-MODIFIED;";
-
DataLine += L
astModifiedTokens;
+
d
ataLine += "LAST-MODIFIED;";
+
dataLine += l
astModifiedTokens;
} else {
} else {
-
D
ataLine += "LAST-MODIFIED";
+
d
ataLine += "LAST-MODIFIED";
}
}
-
D
ataLine += ":";
-
DataLine += L
astModifiedData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += l
astModifiedData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process the TZURL value.
}
// Process the TZURL value.
- if (
T
imeZoneURLData.size() > 0){
+ if (
t
imeZoneURLData.size() > 0){
- if (
T
imeZoneURLTokens.size() > 0){
+ if (
t
imeZoneURLTokens.size() > 0){
-
D
ataLine += "TZURL;";
-
DataLine += T
imeZoneURLTokens;
+
d
ataLine += "TZURL;";
+
dataLine += t
imeZoneURLTokens;
} else {
} else {
-
D
ataLine += "TZURL";
+
d
ataLine += "TZURL";
}
}
-
D
ataLine += ":";
-
DataLine += T
imeZoneURLData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += t
imeZoneURLData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process Standard timezones.
}
// Process Standard timezones.
- if (
T
imezoneStandardCollection.size() > 0){
+ if (
t
imezoneStandardCollection.size() > 0){
- for (int
TimezoneStandardSeek = 0; TimezoneStandardSeek < T
imezoneStandardCollection.size();
-
T
imezoneStandardSeek++){
+ for (int
timezoneStandardSeek = 0; timezoneStandardSeek < t
imezoneStandardCollection.size();
+
t
imezoneStandardSeek++){
- *
S
aveData += "BEGIN:STANDARD\n";
+ *
s
aveData += "BEGIN:STANDARD\n";
// Process the DTSTART value.
// Process the DTSTART value.
- if (
TimezoneStandardCollection[TimezoneStandardSeek].D
ateTimeStartData.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].d
ateTimeStartData.size() > 0){
- if (
TimezoneStandardCollection[TimezoneStandardSeek].D
ateTimeStartTokens.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].d
ateTimeStartTokens.size() > 0){
-
D
ataLine += "DTSTART;";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].D
ateTimeStartTokens;
+
d
ataLine += "DTSTART;";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].d
ateTimeStartTokens;
} else {
} else {
-
D
ataLine += "DTSTART";
+
d
ataLine += "DTSTART";
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].D
ateTimeStartData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].d
ateTimeStartData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process the TZOFFSETFROM value.
}
// Process the TZOFFSETFROM value.
- if (
TimezoneStandardCollection[TimezoneStandardSeek].T
imeZoneOffsetFromData.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].t
imeZoneOffsetFromData.size() > 0){
- if (
TimezoneStandardCollection[TimezoneStandardSeek].T
imeZoneOffsetFromTokens.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].t
imeZoneOffsetFromTokens.size() > 0){
-
D
ataLine += "TZOFFSETFROM;";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].T
imeZoneOffsetFromTokens;
+
d
ataLine += "TZOFFSETFROM;";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].t
imeZoneOffsetFromTokens;
} else {
} else {
-
D
ataLine += "TZOFFSETFROM";
+
d
ataLine += "TZOFFSETFROM";
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].T
imeZoneOffsetFromData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].t
imeZoneOffsetFromData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process the TZOFFSETTO value.
}
// Process the TZOFFSETTO value.
- if (
TimezoneStandardCollection[TimezoneStandardSeek].T
imeZoneOffsetToData.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].t
imeZoneOffsetToData.size() > 0){
- if (
TimezoneStandardCollection[TimezoneStandardSeek].T
imeZoneOffsetToTokens.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].t
imeZoneOffsetToTokens.size() > 0){
-
D
ataLine += "TZOFFSETTO;";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].T
imeZoneOffsetToTokens;
+
d
ataLine += "TZOFFSETTO;";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].t
imeZoneOffsetToTokens;
} else {
} else {
-
D
ataLine += "TZOFFSETTO";
+
d
ataLine += "TZOFFSETTO";
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].T
imeZoneOffsetToData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].t
imeZoneOffsetToData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process the RRULE value.
}
// Process the RRULE value.
- if (
TimezoneStandardCollection[TimezoneStandardSeek].R
ecurranceRuleData.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].r
ecurranceRuleData.size() > 0){
- if (
TimezoneStandardCollection[TimezoneStandardSeek].R
ecurranceRuleDataTokens.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].r
ecurranceRuleDataTokens.size() > 0){
-
D
ataLine += "RRULE;";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].R
ecurranceRuleDataTokens;
+
d
ataLine += "RRULE;";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].r
ecurranceRuleDataTokens;
} else {
} else {
-
D
ataLine += "RRULE";
+
d
ataLine += "RRULE";
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].R
ecurranceRuleData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].r
ecurranceRuleData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process the COMMENT value.
}
// Process the COMMENT value.
- if (
TimezoneStandardCollection[TimezoneStandardSeek].C
ommentList.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].c
ommentList.size() > 0){
- for (int
CommentListSeek = 0; CommentListSeek < TimezoneStandardCollection[TimezoneStandardSeek].C
ommentList.size();
-
C
ommentListSeek++){
+ for (int
commentListSeek = 0; commentListSeek < timezoneStandardCollection[timezoneStandardSeek].c
ommentList.size();
+
c
ommentListSeek++){
-
D
ataLine += "COMMENT";
+
d
ataLine += "COMMENT";
- if (
TimezoneStandardCollection[TimezoneStandardSeek].CommentListAltRep[C
ommentListSeek].size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].commentListAltRep[c
ommentListSeek].size() > 0){
-
D
ataLine += ";ALTREP=\"";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].CommentListAltRep[C
ommentListSeek];
-
D
ataLine += "\"";
+
d
ataLine += ";ALTREP=\"";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].commentListAltRep[c
ommentListSeek];
+
d
ataLine += "\"";
}
}
- if (
TimezoneStandardCollection[TimezoneStandardSeek].CommentListLanguage[C
ommentListSeek].size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].commentListLanguage[c
ommentListSeek].size() > 0){
-
D
ataLine += ";LANGUAGE=";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].CommentListLanguage[C
ommentListSeek];
+
d
ataLine += ";LANGUAGE=";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].commentListLanguage[c
ommentListSeek];
}
}
- if (
TimezoneStandardCollection[TimezoneStandardSeek].CommentListTokens[C
ommentListSeek].size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].commentListTokens[c
ommentListSeek].size() > 0){
-
D
ataLine += ";";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].CommentListTokens[C
ommentListSeek];
+
d
ataLine += ";";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].commentListTokens[c
ommentListSeek];
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].CommentList[C
ommentListSeek];
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].commentList[c
ommentListSeek];
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
}
@@
-280,44
+280,44
@@
void CalendarTimezoneObject::SaveObjectData(string *SaveData){
// Process the RDATE value.
// Process the RDATE value.
- if (
TimezoneStandardCollection[TimezoneStandardSeek].R
ecurranceDateData.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].r
ecurranceDateData.size() > 0){
- for (int
RecurranceDataSeek = 0; RecurranceDataSeek < TimezoneStandardCollection[TimezoneStandardSeek].R
ecurranceDateData.size();
-
R
ecurranceDataSeek++){
+ for (int
recurranceDataSeek = 0; recurranceDataSeek < timezoneStandardCollection[timezoneStandardSeek].r
ecurranceDateData.size();
+
r
ecurranceDataSeek++){
-
D
ataLine += "RDATE";
+
d
ataLine += "RDATE";
- if (
TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataValue[R
ecurranceDataSeek].size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataValue[r
ecurranceDataSeek].size() > 0){
-
D
ataLine += ";VALUE=";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataValue[R
ecurranceDataSeek];
+
d
ataLine += ";VALUE=";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataValue[r
ecurranceDataSeek];
}
}
- if (
TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataTimeZoneParam[R
ecurranceDataSeek].size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataTimeZoneParam[r
ecurranceDataSeek].size() > 0){
-
D
ataLine += ";TZID=";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataTimeZoneParam[R
ecurranceDataSeek];
+
d
ataLine += ";TZID=";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataTimeZoneParam[r
ecurranceDataSeek];
}
}
- if (
TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataTokens[R
ecurranceDataSeek].size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataTokens[r
ecurranceDataSeek].size() > 0){
-
D
ataLine += ";";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateDataTokens[R
ecurranceDataSeek];
+
d
ataLine += ";";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].recurranceDateDataTokens[r
ecurranceDataSeek];
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].RecurranceDateData[R
ecurranceDataSeek];
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].recurranceDateData[r
ecurranceDataSeek];
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
}
@@
-325,37
+325,37
@@
void CalendarTimezoneObject::SaveObjectData(string *SaveData){
// Process the TZNAME value.
// Process the TZNAME value.
- if (
TimezoneStandardCollection[TimezoneStandardSeek].T
imeZoneNameData.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].t
imeZoneNameData.size() > 0){
- for (int
TimezoneNameSeek = 0; TimezoneNameSeek < TimezoneStandardCollection[TimezoneStandardSeek].T
imeZoneNameData.size();
-
T
imezoneNameSeek++){
+ for (int
timezoneNameSeek = 0; timezoneNameSeek < timezoneStandardCollection[timezoneStandardSeek].t
imeZoneNameData.size();
+
t
imezoneNameSeek++){
-
D
ataLine += "TZNAME";
+
d
ataLine += "TZNAME";
- if (
TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameLanguage[T
imezoneNameSeek].size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].timeZoneNameLanguage[t
imezoneNameSeek].size() > 0){
-
D
ataLine += ";LANGUAGE=";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameLanguage[T
imezoneNameSeek];
+
d
ataLine += ";LANGUAGE=";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].timeZoneNameLanguage[t
imezoneNameSeek];
}
}
- if (
TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameTokens[T
imezoneNameSeek].size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].timeZoneNameTokens[t
imezoneNameSeek].size() > 0){
-
D
ataLine += ";";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameTokens[T
imezoneNameSeek];
+
d
ataLine += ";";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].timeZoneNameTokens[t
imezoneNameSeek];
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].TimeZoneNameData[T
imezoneNameSeek];
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].timeZoneNameData[t
imezoneNameSeek];
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
}
@@
-363,28
+363,28
@@
void CalendarTimezoneObject::SaveObjectData(string *SaveData){
// Process data from X-*
// Process data from X-*
- if (
TimezoneStandardCollection[TimezoneStandardSeek].X
TokensData.size() > 0){
+ if (
timezoneStandardCollection[timezoneStandardSeek].x
TokensData.size() > 0){
- for (int
TimezoneXTokenSeek = 0; TimezoneXTokenSeek < TimezoneStandardCollection[TimezoneStandardSeek].X
TokensData.size();
-
T
imezoneXTokenSeek++){
+ for (int
timezoneXTokenSeek = 0; timezoneXTokenSeek < timezoneStandardCollection[timezoneStandardSeek].x
TokensData.size();
+
t
imezoneXTokenSeek++){
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].XTokensDataTokens[T
imezoneXTokenSeek];
-
D
ataLine += ":";
-
DataLine += TimezoneStandardCollection[TimezoneStandardSeek].XTokensData[T
imezoneXTokenSeek];
-
D
ataLine += "\n";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].xTokensDataTokens[t
imezoneXTokenSeek];
+
d
ataLine += ":";
+
dataLine += timezoneStandardCollection[timezoneStandardSeek].xTokensData[t
imezoneXTokenSeek];
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
}
}
}
- *
S
aveData += "END:STANDARD\n";
+ *
s
aveData += "END:STANDARD\n";
}
}
@@
-392,166
+392,166
@@
void CalendarTimezoneObject::SaveObjectData(string *SaveData){
// Process Daylight timezones.
// Process Daylight timezones.
- if (
T
imezoneDaylightCollection.size() > 0){
+ if (
t
imezoneDaylightCollection.size() > 0){
- for (int
TimezoneDaylightSeek = 0; TimezoneDaylightSeek < T
imezoneDaylightCollection.size();
-
T
imezoneDaylightSeek++){
+ for (int
timezoneDaylightSeek = 0; timezoneDaylightSeek < t
imezoneDaylightCollection.size();
+
t
imezoneDaylightSeek++){
- *
S
aveData += "BEGIN:DAYLIGHT\n";
+ *
s
aveData += "BEGIN:DAYLIGHT\n";
// Process the DTSTART value.
// Process the DTSTART value.
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].D
ateTimeStartData.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].d
ateTimeStartData.size() > 0){
- if (
TimezoneStandardCollection[TimezoneDaylightSeek].D
ateTimeStartTokens.size() > 0){
+ if (
timezoneStandardCollection[timezoneDaylightSeek].d
ateTimeStartTokens.size() > 0){
-
D
ataLine += "DTSTART;";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].D
ateTimeStartTokens;
+
d
ataLine += "DTSTART;";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].d
ateTimeStartTokens;
} else {
} else {
-
D
ataLine += "DTSTART";
+
d
ataLine += "DTSTART";
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].D
ateTimeStartData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].d
ateTimeStartData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process the TZOFFSETFROM value.
}
// Process the TZOFFSETFROM value.
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].T
imeZoneOffsetFromData.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].t
imeZoneOffsetFromData.size() > 0){
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].T
imeZoneOffsetFromTokens.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].t
imeZoneOffsetFromTokens.size() > 0){
-
D
ataLine += "TZOFFSETFROM;";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].T
imeZoneOffsetFromTokens;
+
d
ataLine += "TZOFFSETFROM;";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].t
imeZoneOffsetFromTokens;
} else {
} else {
-
D
ataLine += "TZOFFSETFROM";
+
d
ataLine += "TZOFFSETFROM";
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].T
imeZoneOffsetFromData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].t
imeZoneOffsetFromData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process the TZOFFSETTO value.
}
// Process the TZOFFSETTO value.
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].T
imeZoneOffsetToData.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].t
imeZoneOffsetToData.size() > 0){
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].T
imeZoneOffsetToTokens.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].t
imeZoneOffsetToTokens.size() > 0){
-
D
ataLine += "TZOFFSETTO;";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].T
imeZoneOffsetToTokens;
+
d
ataLine += "TZOFFSETTO;";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].t
imeZoneOffsetToTokens;
} else {
} else {
-
D
ataLine += "TZOFFSETTO";
+
d
ataLine += "TZOFFSETTO";
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].T
imeZoneOffsetToData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].t
imeZoneOffsetToData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process the RRULE value.
}
// Process the RRULE value.
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].R
ecurranceRuleData.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].r
ecurranceRuleData.size() > 0){
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].R
ecurranceRuleDataTokens.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].r
ecurranceRuleDataTokens.size() > 0){
-
D
ataLine += "RRULE;";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].R
ecurranceRuleDataTokens;
+
d
ataLine += "RRULE;";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].r
ecurranceRuleDataTokens;
} else {
} else {
-
D
ataLine += "RRULE";
+
d
ataLine += "RRULE";
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].R
ecurranceRuleData;
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].r
ecurranceRuleData;
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
// Process the COMMENT value.
}
// Process the COMMENT value.
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].C
ommentList.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].c
ommentList.size() > 0){
- for (int
CommentListSeek = 0; CommentListSeek < TimezoneDaylightCollection[TimezoneDaylightSeek].C
ommentList.size();
-
C
ommentListSeek++){
+ for (int
commentListSeek = 0; commentListSeek < timezoneDaylightCollection[timezoneDaylightSeek].c
ommentList.size();
+
c
ommentListSeek++){
-
D
ataLine += "COMMENT";
+
d
ataLine += "COMMENT";
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListAltRep[C
ommentListSeek].size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].commentListAltRep[c
ommentListSeek].size() > 0){
-
D
ataLine += ";ALTREP=\"";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListAltRep[C
ommentListSeek];
-
D
ataLine += "\"";
+
d
ataLine += ";ALTREP=\"";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].commentListAltRep[c
ommentListSeek];
+
d
ataLine += "\"";
}
}
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListLanguage[C
ommentListSeek].size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].commentListLanguage[c
ommentListSeek].size() > 0){
-
D
ataLine += ";LANGUAGE=";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListLanguage[C
ommentListSeek];
+
d
ataLine += ";LANGUAGE=";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].commentListLanguage[c
ommentListSeek];
}
}
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListTokens[C
ommentListSeek].size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].commentListTokens[c
ommentListSeek].size() > 0){
-
D
ataLine += ";";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].CommentListTokens[C
ommentListSeek];
+
d
ataLine += ";";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].commentListTokens[c
ommentListSeek];
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].CommentList[C
ommentListSeek];
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].commentList[c
ommentListSeek];
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
}
@@
-559,44
+559,44
@@
void CalendarTimezoneObject::SaveObjectData(string *SaveData){
// Process the RDATE value.
// Process the RDATE value.
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].R
ecurranceDateData.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].r
ecurranceDateData.size() > 0){
- for (int
RecurranceDataSeek = 0; RecurranceDataSeek < TimezoneDaylightCollection[TimezoneDaylightSeek].R
ecurranceDateData.size();
-
R
ecurranceDataSeek++){
+ for (int
recurranceDataSeek = 0; recurranceDataSeek < timezoneDaylightCollection[timezoneDaylightSeek].r
ecurranceDateData.size();
+
r
ecurranceDataSeek++){
-
D
ataLine += "RDATE";
+
d
ataLine += "RDATE";
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataValue[R
ecurranceDataSeek].size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataValue[r
ecurranceDataSeek].size() > 0){
-
D
ataLine += ";VALUE=";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataValue[R
ecurranceDataSeek];
+
d
ataLine += ";VALUE=";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataValue[r
ecurranceDataSeek];
}
}
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataTimeZoneParam[R
ecurranceDataSeek].size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataTimeZoneParam[r
ecurranceDataSeek].size() > 0){
-
D
ataLine += ";TZID=";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataTimeZoneParam[R
ecurranceDataSeek];
+
d
ataLine += ";TZID=";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataTimeZoneParam[r
ecurranceDataSeek];
}
}
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataTokens[R
ecurranceDataSeek].size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataTokens[r
ecurranceDataSeek].size() > 0){
-
D
ataLine += ";";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateDataTokens[R
ecurranceDataSeek];
+
d
ataLine += ";";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateDataTokens[r
ecurranceDataSeek];
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].RecurranceDateData[R
ecurranceDataSeek];
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].recurranceDateData[r
ecurranceDataSeek];
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
}
@@
-604,37
+604,37
@@
void CalendarTimezoneObject::SaveObjectData(string *SaveData){
// Process the TZNAME value.
// Process the TZNAME value.
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].T
imeZoneNameData.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].t
imeZoneNameData.size() > 0){
- for (int
TimezoneNameSeek = 0; TimezoneNameSeek < TimezoneDaylightCollection[TimezoneDaylightSeek].T
imeZoneNameData.size();
-
T
imezoneNameSeek++){
+ for (int
timezoneNameSeek = 0; timezoneNameSeek < timezoneDaylightCollection[timezoneDaylightSeek].t
imeZoneNameData.size();
+
t
imezoneNameSeek++){
-
D
ataLine += "TZNAME";
+
d
ataLine += "TZNAME";
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameLanguage[T
imezoneNameSeek].size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameLanguage[t
imezoneNameSeek].size() > 0){
-
D
ataLine += ";LANGUAGE=";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameLanguage[T
imezoneNameSeek];
+
d
ataLine += ";LANGUAGE=";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameLanguage[t
imezoneNameSeek];
}
}
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameTokens[T
imezoneNameSeek].size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameTokens[t
imezoneNameSeek].size() > 0){
-
D
ataLine += ";";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameTokens[T
imezoneNameSeek];
+
d
ataLine += ";";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameTokens[t
imezoneNameSeek];
}
}
-
D
ataLine += ":";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].TimeZoneNameData[T
imezoneNameSeek];
-
D
ataLine += "\n";
+
d
ataLine += ":";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].timeZoneNameData[t
imezoneNameSeek];
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
}
@@
-642,33
+642,33
@@
void CalendarTimezoneObject::SaveObjectData(string *SaveData){
// Process data from X-*
// Process data from X-*
- if (
TimezoneDaylightCollection[TimezoneDaylightSeek].X
TokensData.size() > 0){
+ if (
timezoneDaylightCollection[timezoneDaylightSeek].x
TokensData.size() > 0){
- for (int
TimezoneXTokenSeek = 0; TimezoneXTokenSeek < TimezoneDaylightCollection[TimezoneDaylightSeek].X
TokensData.size();
-
T
imezoneXTokenSeek++){
+ for (int
timezoneXTokenSeek = 0; timezoneXTokenSeek < timezoneDaylightCollection[timezoneDaylightSeek].x
TokensData.size();
+
t
imezoneXTokenSeek++){
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].XTokensDataTokens[T
imezoneXTokenSeek];
-
D
ataLine += ":";
-
DataLine += TimezoneDaylightCollection[TimezoneDaylightSeek].XTokensData[T
imezoneXTokenSeek];
-
D
ataLine += "\n";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].xTokensDataTokens[t
imezoneXTokenSeek];
+
d
ataLine += ":";
+
dataLine += timezoneDaylightCollection[timezoneDaylightSeek].xTokensData[t
imezoneXTokenSeek];
+
d
ataLine += "\n";
-
DataLineProcessed = OutputText(&D
ataLine);
+
dataLineProcessed = OutputText(&d
ataLine);
- *
SaveData += D
ataLineProcessed;
+ *
saveData += d
ataLineProcessed;
-
D
ataLine.clear();
-
D
ataLineProcessed.clear();
+
d
ataLine.clear();
+
d
ataLineProcessed.clear();
}
}
}
}
- *
S
aveData += "END:DAYLIGHT\n";
+ *
s
aveData += "END:DAYLIGHT\n";
}
}
}
}
- *
S
aveData += "END:VTIMEZONE\n";
+ *
s
aveData += "END:VTIMEZONE\n";
}
\ No newline at end of file
}
\ No newline at end of file
diff --git
a/source/objects/calendartimezone/CalendarTimezone.cpp
b/source/objects/calendartimezone/CalendarTimezone.cpp
index
d699f13
..
a1f6648
100644
(file)
--- a/
source/objects/calendartimezone/CalendarTimezone.cpp
+++ b/
source/objects/calendartimezone/CalendarTimezone.cpp
@@
-22,49
+22,49
@@
using namespace std;
CalendarObjectValidResult CalendarTimezoneObject::ValidObject(){
CalendarObjectValidResult CalendarTimezoneObject::ValidObject(){
- bool
V
alidBegin = false;
- bool
V
alidEnd = false;
- bool
V
alidTimeZoneID = false;
-
int S
eekCount = 0;
- string
P
ropertyName;
+ bool
v
alidBegin = false;
+ bool
v
alidEnd = false;
+ bool
v
alidTimeZoneID = false;
+
int s
eekCount = 0;
+ string
p
ropertyName;
// Look for BEGIN:VEVENT.
// Look for BEGIN:VEVENT.
- for (vector<string>::iterator iter =
O
bjectName.begin();
- iter !=
O
bjectName.end(); iter++){
+ for (vector<string>::iterator iter =
o
bjectName.begin();
+ iter !=
o
bjectName.end(); iter++){
- if (
ObjectName[S
eekCount] == "BEGIN" &&
-
ObjectData[S
eekCount] == "VTIMEZONE"){
+ if (
objectName[s
eekCount] == "BEGIN" &&
+
objectData[s
eekCount] == "VTIMEZONE"){
- if (
V
alidBegin == false){
-
V
alidBegin = true;
+ if (
v
alidBegin == false){
+
v
alidBegin = true;
} else {
return CALENDAROBJECTVALID_INVALIDFORMAT;
}
}
} else {
return CALENDAROBJECTVALID_INVALIDFORMAT;
}
}
- if (
ObjectName[S
eekCount] == "END" &&
-
ObjectData[S
eekCount] == "VTIMEZONE" &&
-
V
alidBegin == false){
+ if (
objectName[s
eekCount] == "END" &&
+
objectData[s
eekCount] == "VTIMEZONE" &&
+
v
alidBegin == false){
return CALENDAROBJECTVALID_INVALIDFORMAT;
}
return CALENDAROBJECTVALID_INVALIDFORMAT;
}
-
S
eekCount++;
+
s
eekCount++;
}
}
-
S
eekCount = 0;
+
s
eekCount = 0;
// Look for TZID.
// Look for TZID.
- for (vector<string>::iterator iter =
O
bjectName.begin();
- iter !=
O
bjectName.end(); iter++){
+ for (vector<string>::iterator iter =
o
bjectName.begin();
+ iter !=
o
bjectName.end(); iter++){
try{
try{
- PropertyName =
ObjectName[S
eekCount].substr(0,4);
+ PropertyName =
objectName[s
eekCount].substr(0,4);
}
catch(const out_of_range& oor){
}
catch(const out_of_range& oor){
@@
-73,45
+73,45
@@
CalendarObjectValidResult CalendarTimezoneObject::ValidObject(){
if (PropertyName == "TZID"){
if (PropertyName == "TZID"){
- if (
V
alidTimeZoneID == false){
-
V
alidTimeZoneID = true;
+ if (
v
alidTimeZoneID == false){
+
v
alidTimeZoneID = true;
} else {
return CALENDAROBJECTVALID_INVALIDFORMAT;
}
}
} else {
return CALENDAROBJECTVALID_INVALIDFORMAT;
}
}
-
S
eekCount++;
+
s
eekCount++;
}
}
-
S
eekCount = 0;
+
s
eekCount = 0;
// Look for END:VEVENT.
// Look for END:VEVENT.
- for (vector<string>::iterator iter =
O
bjectName.begin();
- iter !=
O
bjectName.end(); iter++){
+ for (vector<string>::iterator iter =
o
bjectName.begin();
+ iter !=
o
bjectName.end(); iter++){
- if (
ObjectName[S
eekCount] == "END" &&
-
ObjectData[S
eekCount] == "VTIMEZONE"){
+ if (
objectName[s
eekCount] == "END" &&
+
objectData[s
eekCount] == "VTIMEZONE"){
- if (
V
alidEnd == false){
-
V
alidEnd = true;
+ if (
v
alidEnd == false){
+
v
alidEnd = true;
} else {
return CALENDAROBJECTVALID_INVALIDFORMAT;
}
}
} else {
return CALENDAROBJECTVALID_INVALIDFORMAT;
}
}
-
S
eekCount++;
+
s
eekCount++;
}
// Check if the VEVENT is valid.
}
// Check if the VEVENT is valid.
- if (
V
alidBegin == true &&
-
V
alidEnd == true &&
-
V
alidTimeZoneID == true){
+ if (
v
alidBegin == true &&
+
v
alidEnd == true &&
+
v
alidTimeZoneID == true){
return CALENDAROBJECTVALID_OK;
return CALENDAROBJECTVALID_OK;
@@
-127,668
+127,666
@@
void CalendarTimezoneObject::ProcessData(){
// Process the data.
// Process the data.
- multimap<string,string>
D
ataReceived;
- map<string,string>
P
ropertyData;
- string *
P
ropertyNameData = nullptr;
- int
O
bjectSeekCount = 0;
+ multimap<string,string>
d
ataReceived;
+ map<string,string>
p
ropertyData;
+ string *
p
ropertyNameData = nullptr;
+ int
o
bjectSeekCount = 0;
// Process the data from TZID.
// Process the data from TZID.
-
DataReceived = ProcessTextVectors(&ObjectName, &O
bjectData, false, "TZID");
+
dataReceived = ProcessTextVectors(&objectName, &o
bjectData, false, "TZID");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
TimeZoneDataTokens = D
ataReceived.begin()->first.substr(5);
+
timeZoneDataTokens = d
ataReceived.begin()->first.substr(5);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
TimeZoneData = D
ataReceived.begin()->second;
+
timeZoneData = d
ataReceived.begin()->second;
}
// Process the data from LAST-MODIFIED.
}
// Process the data from LAST-MODIFIED.
-
DataReceived = ProcessTextVectors(&ObjectName, &O
bjectData, false, "LAST-MODIFIED");
+
dataReceived = ProcessTextVectors(&objectName, &o
bjectData, false, "LAST-MODIFIED");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
LastModifiedTokens = D
ataReceived.begin()->first.substr(14);
+
lastModifiedTokens = d
ataReceived.begin()->first.substr(14);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
LastModifiedData = D
ataReceived.begin()->second;
+
lastModifiedData = d
ataReceived.begin()->second;
}
// Process the data from TZURL.
}
// Process the data from TZURL.
-
DataReceived = ProcessTextVectors(&ObjectName, &O
bjectData, false, "TZURL");
+
dataReceived = ProcessTextVectors(&objectName, &o
bjectData, false, "TZURL");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
TimeZoneURLTokens = D
ataReceived.begin()->first.substr(6);
+
timeZoneURLTokens = d
ataReceived.begin()->first.substr(6);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
TimeZoneURLData = D
ataReceived.begin()->second;
+
timeZoneURLData = d
ataReceived.begin()->second;
}
// Process data from each STANDARD and DAYLIGHT.
ProcessStandardDaylight();
}
// 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
D
ateTimeStartFound = false;
- bool
T
imeZoneOffsetToFound = false;
- bool
T
imeZoneOffsetFromFound = false;
+ bool
d
ateTimeStartFound = false;
+ bool
t
imeZoneOffsetToFound = false;
+ bool
t
imeZoneOffsetFromFound = false;
-
TimezoneDataStruct N
ewTZData;
+
timezoneDataStruct n
ewTZData;
// Process the data from DTSTART.
// Process the data from DTSTART.
-
DataReceived = ProcessTextVectors(&TimezoneStandardName[S
eekCount],
- &
TimezoneStandardData[S
eekCount], false, "DTSTART");
+
dataReceived = ProcessTextVectors(&timezoneStandardName[s
eekCount],
+ &
timezoneStandardData[s
eekCount], false, "DTSTART");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
NewTZData.DateTimeStartTokens = D
ataReceived.begin()->first.substr(8);
+
newTZData.dateTimeStartTokens = d
ataReceived.begin()->first.substr(8);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
NewTZData.DateTimeStartData = D
ataReceived.begin()->second;
-
D
ateTimeStartFound = true;
+
newTZData.dateTimeStartData = d
ataReceived.begin()->second;
+
d
ateTimeStartFound = true;
}
// Process the data from TZOFFSETFROM.
}
// Process the data from TZOFFSETFROM.
-
DataReceived = ProcessTextVectors(&TimezoneStandardName[S
eekCount],
- &
TimezoneStandardData[S
eekCount], false, "TZOFFSETFROM");
+
dataReceived = ProcessTextVectors(&timezoneStandardName[s
eekCount],
+ &
timezoneStandardData[s
eekCount], false, "TZOFFSETFROM");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
NewTZData.TimeZoneOffsetFromTokens = D
ataReceived.begin()->first.substr(13);
+
newTZData.timeZoneOffsetFromTokens = d
ataReceived.begin()->first.substr(13);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
NewTZData.TimeZoneOffsetFromData = D
ataReceived.begin()->second;
-
T
imeZoneOffsetFromFound = true;
+
newTZData.timeZoneOffsetFromData = d
ataReceived.begin()->second;
+
t
imeZoneOffsetFromFound = true;
}
// Process the data from TZOFFSETTO.
}
// Process the data from TZOFFSETTO.
-
DataReceived = ProcessTextVectors(&TimezoneStandardName[S
eekCount],
- &
TimezoneStandardData[S
eekCount], false, "TZOFFSETTO");
+
dataReceived = ProcessTextVectors(&timezoneStandardName[s
eekCount],
+ &
timezoneStandardData[s
eekCount], false, "TZOFFSETTO");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
NewTZData.TimeZoneOffsetToTokens = D
ataReceived.begin()->first.substr(11);
+
newTZData.timeZoneOffsetToTokens = d
ataReceived.begin()->first.substr(11);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
NewTZData.TimeZoneOffsetToData = D
ataReceived.begin()->second;
-
T
imeZoneOffsetToFound = true;
+
newTZData.timeZoneOffsetToData = d
ataReceived.begin()->second;
+
t
imeZoneOffsetToFound = true;
}
// Process the data from RRULE.
}
// Process the data from RRULE.
-
DataReceived = ProcessTextVectors(&TimezoneStandardName[S
eekCount],
- &
TimezoneStandardData[S
eekCount], false, "RRULE");
+
dataReceived = ProcessTextVectors(&timezoneStandardName[s
eekCount],
+ &
timezoneStandardData[s
eekCount], false, "RRULE");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
NewTZData.RecurranceRuleDataTokens = D
ataReceived.begin()->first.substr(6);
+
newTZData.recurranceRuleDataTokens = d
ataReceived.begin()->first.substr(6);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
NewTZData.RecurranceRuleData = D
ataReceived.begin()->second;
+
newTZData.recurranceRuleData = d
ataReceived.begin()->second;
}
// Process the data from COMMENT.
}
// Process the data from COMMENT.
-
DataReceived = ProcessTextVectors(&TimezoneStandardName[S
eekCount],
- &
TimezoneStandardData[S
eekCount], true, "COMMENT");
+
dataReceived = ProcessTextVectors(&timezoneStandardName[s
eekCount],
+ &
timezoneStandardData[s
eekCount], true, "COMMENT");
-
O
bjectSeekCount = 0;
+
o
bjectSeekCount = 0;
- for(multimap<string,string>::iterator propiter =
D
ataReceived.begin();
- propiter !=
D
ataReceived.end();
+ for(multimap<string,string>::iterator propiter =
d
ataReceived.begin();
+ propiter !=
d
ataReceived.end();
++propiter){
++propiter){
-
NewTZData.C
ommentListTokens.push_back("");
-
NewTZData.C
ommentListAltRep.push_back("");
-
NewTZData.C
ommentListLanguage.push_back("");
-
NewTZData.C
ommentList.push_back("");
+
newTZData.c
ommentListTokens.push_back("");
+
newTZData.c
ommentListAltRep.push_back("");
+
newTZData.c
ommentListLanguage.push_back("");
+
newTZData.c
ommentList.push_back("");
bool TokenData = false;
bool TokenData = false;
- string
P
ropertyTokens;
+ string
p
ropertyTokens;
-
P
ropertyNameData = (string*)&propiter->first;
+
p
ropertyNameData = (string*)&propiter->first;
-
PropertyData = SplitValues(*P
ropertyNameData);
+
propertyData = SplitValues(*p
ropertyNameData);
- for(map<string,string>::iterator propdataiter =
P
ropertyData.begin();
- propdataiter !=
P
ropertyData.end(); propdataiter++){
+ for(map<string,string>::iterator propdataiter =
p
ropertyData.begin();
+ propdataiter !=
p
ropertyData.end(); propdataiter++){
if (propdataiter->first == "ALTREP"){
if (propdataiter->first == "ALTREP"){
-
NewTZData.CommentListAltRep[O
bjectSeekCount] = propdataiter->second;
+
newTZData.commentListAltRep[o
bjectSeekCount] = propdataiter->second;
} else if (propdataiter->first == "LANGUAGE"){
} else if (propdataiter->first == "LANGUAGE"){
-
NewTZData.CommentListLanguage[O
bjectSeekCount] = propdataiter->second;
+
newTZData.commentListLanguage[o
bjectSeekCount] = propdataiter->second;
} else {
if (TokenData == false){
TokenData = true;
} else {
} else {
if (TokenData == false){
TokenData = true;
} else {
-
P
ropertyTokens += ";";
+
p
ropertyTokens += ";";
}
}
-
P
ropertyTokens += propdataiter->first;
-
P
ropertyTokens += "=";
-
P
ropertyTokens += propdataiter->second;
+
p
ropertyTokens += propdataiter->first;
+
p
ropertyTokens += "=";
+
p
ropertyTokens += propdataiter->second;
}
}
}
}
- if (
P
ropertyTokens.size() > 0){
-
NewTZData.CommentListTokens[ObjectSeekCount] = P
ropertyTokens;
+ if (
p
ropertyTokens.size() > 0){
+
newTZData.commentListTokens[objectSeekCount] = p
ropertyTokens;
}
}
-
NewTZData.CommentList[O
bjectSeekCount] = propiter->second;
+
newTZData.commentList[o
bjectSeekCount] = propiter->second;
-
O
bjectSeekCount++;
+
o
bjectSeekCount++;
}
// Process the data from RDATE.
}
// Process the data from RDATE.
-
DataReceived = ProcessTextVectors(&TimezoneStandardName[S
eekCount],
- &
TimezoneStandardData[S
eekCount], true, "RDATE");
+
dataReceived = ProcessTextVectors(&timezoneStandardName[s
eekCount],
+ &
timezoneStandardData[s
eekCount], true, "RDATE");
-
O
bjectSeekCount = 0;
+
o
bjectSeekCount = 0;
- for(multimap<string,string>::iterator propiter =
D
ataReceived.begin();
- propiter !=
D
ataReceived.end();
+ for(multimap<string,string>::iterator propiter =
d
ataReceived.begin();
+ propiter !=
d
ataReceived.end();
++propiter){
++propiter){
-
NewTZData.R
ecurranceDateDataTokens.push_back("");
-
NewTZData.R
ecurranceDateDataValue.push_back("");
-
NewTZData.R
ecurranceDateDataTimeZoneParam.push_back("");
-
NewTZData.R
ecurranceDateData.push_back("");
+
newTZData.r
ecurranceDateDataTokens.push_back("");
+
newTZData.r
ecurranceDateDataValue.push_back("");
+
newTZData.r
ecurranceDateDataTimeZoneParam.push_back("");
+
newTZData.r
ecurranceDateData.push_back("");
bool TokenData = false;
bool TokenData = false;
- string
P
ropertyTokens;
+ string
p
ropertyTokens;
-
P
ropertyNameData = (string*)&propiter->first;
+
p
ropertyNameData = (string*)&propiter->first;
-
PropertyData = SplitValues(*P
ropertyNameData);
+
propertyData = SplitValues(*p
ropertyNameData);
- for(map<string,string>::iterator dataiter =
P
ropertyData.begin();
- dataiter !=
P
ropertyData.end(); dataiter++){
+ for(map<string,string>::iterator dataiter =
p
ropertyData.begin();
+ dataiter !=
p
ropertyData.end(); dataiter++){
if (dataiter->first == "VALUE"){
if (dataiter->first == "VALUE"){
-
NewTZData.RecurranceDateDataValue[O
bjectSeekCount] = dataiter->second;
+
newTZData.recurranceDateDataValue[o
bjectSeekCount] = dataiter->second;
} else if (dataiter->first == "TZID"){
} else if (dataiter->first == "TZID"){
-
NewTZData.RecurranceDateDataTimeZoneParam[O
bjectSeekCount] = dataiter->second;
+
newTZData.recurranceDateDataTimeZoneParam[o
bjectSeekCount] = dataiter->second;
} else {
if (TokenData == false){
TokenData = true;
} else {
} else {
if (TokenData == false){
TokenData = true;
} else {
-
P
ropertyTokens += ";";
+
p
ropertyTokens += ";";
}
}
-
P
ropertyTokens += dataiter->first;
-
P
ropertyTokens += "=";
-
P
ropertyTokens += dataiter->second;
+
p
ropertyTokens += dataiter->first;
+
p
ropertyTokens += "=";
+
p
ropertyTokens += dataiter->second;
}
}
}
}
- if (
P
ropertyTokens.size() > 0){
-
NewTZData.RecurranceDateDataTokens[ObjectSeekCount] = P
ropertyTokens;
+ if (
p
ropertyTokens.size() > 0){
+
newTZData.recurranceDateDataTokens[objectSeekCount] = p
ropertyTokens;
}
}
-
NewTZData.RecurranceDateData[O
bjectSeekCount] = propiter->second;
+
newTZData.recurranceDateData[o
bjectSeekCount] = propiter->second;
-
O
bjectSeekCount++;
+
o
bjectSeekCount++;
}
}
-
// Process the data from TZNAME.
+// Process the data from TZNAME.
-
DataReceived = ProcessTextVectors(&TimezoneStandardName[S
eekCount],
- &
TimezoneStandardData[S
eekCount], true, "TZNAME");
+
dataReceived = ProcessTextVectors(&timezoneStandardName[s
eekCount],
+ &
timezoneStandardData[s
eekCount], true, "TZNAME");
-
O
bjectSeekCount = 0;
+
o
bjectSeekCount = 0;
- for(multimap<string,string>::iterator propiter =
D
ataReceived.begin();
- propiter !=
D
ataReceived.end();
+ for(multimap<string,string>::iterator propiter =
d
ataReceived.begin();
+ propiter !=
d
ataReceived.end();
++propiter){
++propiter){
-
NewTZData.T
imeZoneNameTokens.push_back("");
-
NewTZData.T
imeZoneNameLanguage.push_back("");
-
NewTZData.T
imeZoneNameData.push_back("");
+
newTZData.t
imeZoneNameTokens.push_back("");
+
newTZData.t
imeZoneNameLanguage.push_back("");
+
newTZData.t
imeZoneNameData.push_back("");
bool TokenData = false;
bool TokenData = false;
- string
P
ropertyTokens;
+ string
p
ropertyTokens;
-
P
ropertyNameData = (string*)&propiter->first;
+
p
ropertyNameData = (string*)&propiter->first;
-
PropertyData = SplitValues(*P
ropertyNameData);
+
propertyData = SplitValues(*p
ropertyNameData);
- for(map<string,string>::iterator dataiter =
P
ropertyData.begin();
- dataiter !=
P
ropertyData.end(); dataiter++){
+ for(map<string,string>::iterator dataiter =
p
ropertyData.begin();
+ dataiter !=
p
ropertyData.end(); dataiter++){
if (dataiter->first == "LANGUAGE"){
if (dataiter->first == "LANGUAGE"){
-
NewTZData.TimeZoneNameLanguage[O
bjectSeekCount] = dataiter->second;
+
newTZData.timeZoneNameLanguage[o
bjectSeekCount] = dataiter->second;
} else {
if (TokenData == false){
TokenData = true;
} else {
} else {
if (TokenData == false){
TokenData = true;
} else {
-
P
ropertyTokens += ";";
+
p
ropertyTokens += ";";
}
}
-
P
ropertyTokens += dataiter->first;
-
P
ropertyTokens += "=";
-
P
ropertyTokens += dataiter->second;
+
p
ropertyTokens += dataiter->first;
+
p
ropertyTokens += "=";
+
p
ropertyTokens += dataiter->second;
}
}
}
}
- if (
P
ropertyTokens.size() > 0){
-
NewTZData.TimeZoneNameTokens[ObjectSeekCount] = P
ropertyTokens;
+ if (
p
ropertyTokens.size() > 0){
+
newTZData.timeZoneNameTokens[objectSeekCount] = p
ropertyTokens;
}
}
-
NewTZData.TimeZoneNameData[O
bjectSeekCount] = propiter->second;
+
newTZData.timeZoneNameData[o
bjectSeekCount] = propiter->second;
-
O
bjectSeekCount++;
+
o
bjectSeekCount++;
}
}
-
O
bjectSeekCount = 0;
+
o
bjectSeekCount = 0;
// Process data from X-*
// Process data from X-*
- for(vector<string>::iterator propiter =
TimezoneStandardName[S
eekCount].begin();
- propiter !=
TimezoneStandardName[S
eekCount].end(); ++propiter){
+ for(vector<string>::iterator propiter =
timezoneStandardName[s
eekCount].begin();
+ propiter !=
timezoneStandardName[s
eekCount].end(); ++propiter){
if (propiter->substr(0,2) == "X-" &&
propiter->size() > 2){
if (propiter->substr(0,2) == "X-" &&
propiter->size() > 2){
-
NewTZData.XTokensData.push_back(TimezoneStandardData[SeekCount][O
bjectSeekCount]);
-
NewTZData.XTokensDataTokens.push_back(TimezoneStandardName[SeekCount][O
bjectSeekCount]);
+
newTZData.xTokensData.push_back(timezoneStandardData[seekCount][o
bjectSeekCount]);
+
newTZData.xTokensDataTokens.push_back(timezoneStandardName[seekCount][o
bjectSeekCount]);
}
}
-
O
bjectSeekCount++;
+
o
bjectSeekCount++;
}
// Check if the required values were given and
}
// Check if the required values were given and
- // insert
N
ewTZData into the vector list of
+ // insert
n
ewTZData into the vector list of
// standard timezones.
// standard timezones.
- if (
D
ateTimeStartFound == true &&
-
T
imeZoneOffsetToFound == true &&
-
T
imeZoneOffsetFromFound == true){
+ if (
d
ateTimeStartFound == true &&
+
t
imeZoneOffsetToFound == true &&
+
t
imeZoneOffsetFromFound == true){
-
TimezoneStandardCollection.push_back(N
ewTZData);
+
timezoneStandardCollection.push_back(n
ewTZData);
}
}
-
S
eekCount++;
+
s
eekCount++;
}
}
- TZSeekCount = 0;
- SeekCount = 0;
+ seekCount = 0;
- for (vector<vector<string>>::iterator tzsiter =
T
imezoneDaylightName.begin();
- tzsiter !=
T
imezoneDaylightName.end(); tzsiter++){
+ for (vector<vector<string>>::iterator tzsiter =
t
imezoneDaylightName.begin();
+ tzsiter !=
t
imezoneDaylightName.end(); tzsiter++){
- bool
D
ateTimeStartFound = false;
- bool
T
imeZoneOffsetToFound = false;
- bool
T
imeZoneOffsetFromFound = false;
+ bool
d
ateTimeStartFound = false;
+ bool
t
imeZoneOffsetToFound = false;
+ bool
t
imeZoneOffsetFromFound = false;
- TimezoneDataStruct
N
ewTZData;
+ TimezoneDataStruct
n
ewTZData;
// Process the data from DTSTART.
// Process the data from DTSTART.
-
DataReceived = ProcessTextVectors(&TimezoneDaylightName[S
eekCount],
- &
TimezoneDaylightData[S
eekCount], false, "DTSTART");
+
dataReceived = ProcessTextVectors(&timezoneDaylightName[s
eekCount],
+ &
timezoneDaylightData[s
eekCount], false, "DTSTART");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
NewTZData.DateTimeStartTokens = D
ataReceived.begin()->first.substr(8);
+
newTZData.dateTimeStartTokens = d
ataReceived.begin()->first.substr(8);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
NewTZData.DateTimeStartData = D
ataReceived.begin()->second;
-
D
ateTimeStartFound = true;
+
newTZData.dateTimeStartData = d
ataReceived.begin()->second;
+
d
ateTimeStartFound = true;
}
// Process the data from TZOFFSETFROM.
}
// Process the data from TZOFFSETFROM.
-
DataReceived = ProcessTextVectors(&TimezoneDaylightName[S
eekCount],
- &
TimezoneDaylightData[S
eekCount], false, "TZOFFSETFROM");
+
dataReceived = ProcessTextVectors(&timezoneDaylightName[s
eekCount],
+ &
timezoneDaylightData[s
eekCount], false, "TZOFFSETFROM");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
NewTZData.TimeZoneOffsetFromTokens = D
ataReceived.begin()->first.substr(13);
+
newTZData.timeZoneOffsetFromTokens = d
ataReceived.begin()->first.substr(13);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
NewTZData.TimeZoneOffsetFromData = D
ataReceived.begin()->second;
-
T
imeZoneOffsetFromFound = true;
+
newTZData.timeZoneOffsetFromData = d
ataReceived.begin()->second;
+
t
imeZoneOffsetFromFound = true;
}
// Process the data from TZOFFSETTO.
}
// Process the data from TZOFFSETTO.
-
DataReceived = ProcessTextVectors(&TimezoneDaylightName[S
eekCount],
- &
TimezoneDaylightData[S
eekCount], false, "TZOFFSETTO");
+
dataReceived = ProcessTextVectors(&timezoneDaylightName[s
eekCount],
+ &
timezoneDaylightData[s
eekCount], false, "TZOFFSETTO");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
NewTZData.TimeZoneOffsetToTokens = D
ataReceived.begin()->first.substr(11);
+
newTZData.timeZoneOffsetToTokens = d
ataReceived.begin()->first.substr(11);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
NewTZData.TimeZoneOffsetToData = D
ataReceived.begin()->second;
-
T
imeZoneOffsetToFound = true;
+
newTZData.timeZoneOffsetToData = d
ataReceived.begin()->second;
+
t
imeZoneOffsetToFound = true;
}
// Process the data from RRULE.
}
// Process the data from RRULE.
-
DataReceived = ProcessTextVectors(&TimezoneDaylightName[S
eekCount],
- &
TimezoneDaylightData[S
eekCount], false, "RRULE");
+
dataReceived = ProcessTextVectors(&timezoneDaylightName[s
eekCount],
+ &
timezoneDaylightData[s
eekCount], false, "RRULE");
- if (
DataReceived.begin() != D
ataReceived.end()){
+ if (
dataReceived.begin() != d
ataReceived.end()){
try {
try {
-
NewTZData.RecurranceRuleDataTokens = D
ataReceived.begin()->first.substr(6);
+
newTZData.recurranceRuleDataTokens = d
ataReceived.begin()->first.substr(6);
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
}
catch(const out_of_range &oor){
// Do nothing as there is no data.
}
-
NewTZData.RecurranceRuleData = D
ataReceived.begin()->second;
+
newTZData.recurranceRuleData = d
ataReceived.begin()->second;
}
// Process the data from COMMENT.
}
// Process the data from COMMENT.
-
DataReceived = ProcessTextVectors(&TimezoneDaylightName[S
eekCount],
- &
TimezoneDaylightData[S
eekCount], true, "COMMENT");
+
dataReceived = ProcessTextVectors(&timezoneDaylightName[s
eekCount],
+ &
timezoneDaylightData[s
eekCount], true, "COMMENT");
-
O
bjectSeekCount = 0;
+
o
bjectSeekCount = 0;
- for(multimap<string,string>::iterator propiter =
D
ataReceived.begin();
- propiter !=
D
ataReceived.end();
+ for(multimap<string,string>::iterator propiter =
d
ataReceived.begin();
+ propiter !=
d
ataReceived.end();
++propiter){
++propiter){
-
NewTZData.C
ommentListTokens.push_back("");
-
NewTZData.C
ommentListAltRep.push_back("");
-
NewTZData.C
ommentListLanguage.push_back("");
-
NewTZData.C
ommentList.push_back("");
+
newTZData.c
ommentListTokens.push_back("");
+
newTZData.c
ommentListAltRep.push_back("");
+
newTZData.c
ommentListLanguage.push_back("");
+
newTZData.c
ommentList.push_back("");
bool TokenData = false;
bool TokenData = false;
- string
P
ropertyTokens;
+ string
p
ropertyTokens;
-
P
ropertyNameData = (string*)&propiter->first;
+
p
ropertyNameData = (string*)&propiter->first;
-
PropertyData = SplitValues(*P
ropertyNameData);
+
propertyData = SplitValues(*p
ropertyNameData);
- for(map<string,string>::iterator propdataiter =
P
ropertyData.begin();
- propdataiter !=
P
ropertyData.end(); propdataiter++){
+ for(map<string,string>::iterator propdataiter =
p
ropertyData.begin();
+ propdataiter !=
p
ropertyData.end(); propdataiter++){
if (propdataiter->first == "ALTREP"){
if (propdataiter->first == "ALTREP"){
-
NewTZData.CommentListAltRep[O
bjectSeekCount] = propdataiter->second;
+
newTZData.commentListAltRep[o
bjectSeekCount] = propdataiter->second;
} else if (propdataiter->first == "LANGUAGE"){
} else if (propdataiter->first == "LANGUAGE"){
-
NewTZData.CommentListLanguage[O
bjectSeekCount] = propdataiter->second;
+
newTZData.commentListLanguage[o
bjectSeekCount] = propdataiter->second;
} else {
if (TokenData == false){
TokenData = true;
} else {
} else {
if (TokenData == false){
TokenData = true;
} else {
-
P
ropertyTokens += ";";
+
p
ropertyTokens += ";";
}
}
-
P
ropertyTokens += propdataiter->first;
-
P
ropertyTokens += "=";
-
P
ropertyTokens += propdataiter->second;
+
p
ropertyTokens += propdataiter->first;
+
p
ropertyTokens += "=";
+
p
ropertyTokens += propdataiter->second;
}
}
}
}
- if (
P
ropertyTokens.size() > 0){
-
NewTZData.CommentListTokens[ObjectSeekCount] = P
ropertyTokens;
+ if (
p
ropertyTokens.size() > 0){
+
newTZData.commentListTokens[objectSeekCount] = p
ropertyTokens;
}
}
-
NewTZData.CommentList[O
bjectSeekCount] = propiter->second;
+
newTZData.commentList[o
bjectSeekCount] = propiter->second;
-
O
bjectSeekCount++;
+
o
bjectSeekCount++;
}
// Process the data from RDATE.
}
// Process the data from RDATE.
-
DataReceived = ProcessTextVectors(&TimezoneDaylightName[S
eekCount],
- &
TimezoneDaylightData[S
eekCount], true, "RDATE");
+
dataReceived = ProcessTextVectors(&timezoneDaylightName[s
eekCount],
+ &
timezoneDaylightData[s
eekCount], true, "RDATE");
-
O
bjectSeekCount = 0;
+
o
bjectSeekCount = 0;
- for(multimap<string,string>::iterator propiter =
D
ataReceived.begin();
- propiter !=
D
ataReceived.end();
+ for(multimap<string,string>::iterator propiter =
d
ataReceived.begin();
+ propiter !=
d
ataReceived.end();
++propiter){
++propiter){
-
NewTZData.R
ecurranceDateDataTokens.push_back("");
-
NewTZData.R
ecurranceDateDataValue.push_back("");
-
NewTZData.R
ecurranceDateDataTimeZoneParam.push_back("");
-
NewTZData.R
ecurranceDateData.push_back("");
+
newTZData.r
ecurranceDateDataTokens.push_back("");
+
newTZData.r
ecurranceDateDataValue.push_back("");
+
newTZData.r
ecurranceDateDataTimeZoneParam.push_back("");
+
newTZData.r
ecurranceDateData.push_back("");
bool TokenData = false;
bool TokenData = false;
- string
P
ropertyTokens;
+ string
p
ropertyTokens;
-
P
ropertyNameData = (string*)&propiter->first;
+
p
ropertyNameData = (string*)&propiter->first;
-
PropertyData = SplitValues(*P
ropertyNameData);
+
propertyData = SplitValues(*p
ropertyNameData);
- for(map<string,string>::iterator dataiter =
P
ropertyData.begin();
- dataiter !=
P
ropertyData.end(); dataiter++){
+ for(map<string,string>::iterator dataiter =
p
ropertyData.begin();
+ dataiter !=
p
ropertyData.end(); dataiter++){
if (dataiter->first == "VALUE"){
if (dataiter->first == "VALUE"){
-
NewTZData.RecurranceDateDataValue[O
bjectSeekCount] = dataiter->second;
+
newTZData.recurranceDateDataValue[o
bjectSeekCount] = dataiter->second;
} else if (dataiter->first == "TZID"){
} else if (dataiter->first == "TZID"){
-
NewTZData.RecurranceDateDataTimeZoneParam[O
bjectSeekCount] = dataiter->second;
+
newTZData.recurranceDateDataTimeZoneParam[o
bjectSeekCount] = dataiter->second;
} else {
if (TokenData == false){
TokenData = true;
} else {
} else {
if (TokenData == false){
TokenData = true;
} else {
-
P
ropertyTokens += ";";
+
p
ropertyTokens += ";";
}
}
-
P
ropertyTokens += dataiter->first;
-
P
ropertyTokens += "=";
-
P
ropertyTokens += dataiter->second;
+
p
ropertyTokens += dataiter->first;
+
p
ropertyTokens += "=";
+
p
ropertyTokens += dataiter->second;
}
}
}
}
- if (
P
ropertyTokens.size() > 0){
-
NewTZData.RecurranceDateDataTokens[ObjectSeekCount] = P
ropertyTokens;
+ if (
p
ropertyTokens.size() > 0){
+
newTZData.recurranceDateDataTokens[objectSeekCount] = p
ropertyTokens;
}
}
-
NewTZData.RecurranceDateData[O
bjectSeekCount] = propiter->second;
+
newTZData.recurranceDateData[o
bjectSeekCount] = propiter->second;
-
O
bjectSeekCount++;
+
o
bjectSeekCount++;
}
// Process the data from TZNAME.
}
// Process the data from TZNAME.
-
DataReceived = ProcessTextVectors(&TimezoneDaylightName[S
eekCount],
- &
TimezoneDaylightData[S
eekCount], true, "TZNAME");
+
dataReceived = ProcessTextVectors(&timezoneDaylightName[s
eekCount],
+ &
timezoneDaylightData[s
eekCount], true, "TZNAME");
-
O
bjectSeekCount = 0;
+
o
bjectSeekCount = 0;
- for(multimap<string,string>::iterator propiter =
D
ataReceived.begin();
- propiter !=
D
ataReceived.end();
+ for(multimap<string,string>::iterator propiter =
d
ataReceived.begin();
+ propiter !=
d
ataReceived.end();
++propiter){
++propiter){
-
NewTZData.T
imeZoneNameTokens.push_back("");
-
NewTZData.T
imeZoneNameLanguage.push_back("");
-
NewTZData.T
imeZoneNameData.push_back("");
+
newTZData.t
imeZoneNameTokens.push_back("");
+
newTZData.t
imeZoneNameLanguage.push_back("");
+
newTZData.t
imeZoneNameData.push_back("");
bool TokenData = false;
bool TokenData = false;
- string
P
ropertyTokens;
+ string
p
ropertyTokens;
-
P
ropertyNameData = (string*)&propiter->first;
+
p
ropertyNameData = (string*)&propiter->first;
-
PropertyData = SplitValues(*P
ropertyNameData);
+
propertyData = SplitValues(*p
ropertyNameData);
- for(map<string,string>::iterator dataiter =
P
ropertyData.begin();
- dataiter !=
P
ropertyData.end(); dataiter++){
+ for(map<string,string>::iterator dataiter =
p
ropertyData.begin();
+ dataiter !=
p
ropertyData.end(); dataiter++){
if (dataiter->first == "LANGUAGE"){
if (dataiter->first == "LANGUAGE"){
-
NewTZData.TimeZoneNameLanguage[O
bjectSeekCount] = dataiter->second;
+
newTZData.timeZoneNameLanguage[o
bjectSeekCount] = dataiter->second;
} else {
if (TokenData == false){
TokenData = true;
} else {
} else {
if (TokenData == false){
TokenData = true;
} else {
-
P
ropertyTokens += ";";
+
p
ropertyTokens += ";";
}
}
-
P
ropertyTokens += dataiter->first;
-
P
ropertyTokens += "=";
-
P
ropertyTokens += dataiter->second;
+
p
ropertyTokens += dataiter->first;
+
p
ropertyTokens += "=";
+
p
ropertyTokens += dataiter->second;
}
}
}
}
- if (
P
ropertyTokens.size() > 0){
-
NewTZData.TimeZoneNameTokens[ObjectSeekCount] = P
ropertyTokens;
+ if (
p
ropertyTokens.size() > 0){
+
newTZData.timeZoneNameTokens[objectSeekCount] = p
ropertyTokens;
}
}
-
NewTZData.TimeZoneNameData[O
bjectSeekCount] = propiter->second;
+
newTZData.timeZoneNameData[o
bjectSeekCount] = propiter->second;
-
O
bjectSeekCount++;
+
o
bjectSeekCount++;
}
}
-
O
bjectSeekCount = 0;
+
o
bjectSeekCount = 0;
// Process data from X-*
// Process data from X-*
- for(vector<string>::iterator propiter =
TimezoneDaylightName[S
eekCount].begin();
- propiter !=
TimezoneDaylightName[S
eekCount].end(); ++propiter){
+ for(vector<string>::iterator propiter =
timezoneDaylightName[s
eekCount].begin();
+ propiter !=
timezoneDaylightName[s
eekCount].end(); ++propiter){
if (propiter->substr(0,2) == "X-" &&
propiter->size() > 2){
if (propiter->substr(0,2) == "X-" &&
propiter->size() > 2){
-
NewTZData.XTokensData.push_back(TimezoneDaylightData[SeekCount][O
bjectSeekCount]);
-
NewTZData.XTokensDataTokens.push_back(TimezoneDaylightName[SeekCount][O
bjectSeekCount]);
+
newTZData.xTokensData.push_back(timezoneDaylightData[seekCount][o
bjectSeekCount]);
+
newTZData.xTokensDataTokens.push_back(timezoneDaylightName[seekCount][o
bjectSeekCount]);
}
}
-
O
bjectSeekCount++;
+
o
bjectSeekCount++;
}
// Check if the required values were given and
}
// Check if the required values were given and
- // insert
N
ewTZData into the vector list of
+ // insert
n
ewTZData into the vector list of
// daylight timezones.
// daylight timezones.
- if (
D
ateTimeStartFound == true &&
-
T
imeZoneOffsetToFound == true &&
-
T
imeZoneOffsetFromFound == true){
+ if (
d
ateTimeStartFound == true &&
+
t
imeZoneOffsetToFound == true &&
+
t
imeZoneOffsetFromFound == true){
-
TimezoneDaylightCollection.push_back(N
ewTZData);
+
timezoneDaylightCollection.push_back(n
ewTZData);
}
}
-
S
eekCount++;
+
s
eekCount++;
}
}
@@
-796,36
+794,36
@@
void CalendarTimezoneObject::ProcessData(){
void CalendarTimezoneObject::ProcessStandardDaylight(){
void CalendarTimezoneObject::ProcessStandardDaylight(){
- int
S
eekCount = 0;
+ int
s
eekCount = 0;
bool TZMode = false; // False = STANDARD, True = DAYLIGHT.
bool TZMode = false; // False = STANDARD, True = DAYLIGHT.
- bool
V
alidBegin = false;
- vector<string>
T
imezoneObjectName;
- vector<string>
T
imezoneObjectData;
+ bool
v
alidBegin = false;
+ vector<string>
t
imezoneObjectName;
+ vector<string>
t
imezoneObjectData;
- for (vector<string>::iterator iter =
O
bjectName.begin();
- iter !=
O
bjectName.end(); iter++){
+ for (vector<string>::iterator iter =
o
bjectName.begin();
+ iter !=
o
bjectName.end(); iter++){
// Check if the current name is BEGIN and
// data is either STANDARD or DAYLIGHT.
// Check if the current name is BEGIN and
// data is either STANDARD or DAYLIGHT.
- if (
ObjectName[S
eekCount] == "BEGIN" &&
- (
ObjectData[S
eekCount] == "STANDARD" ||
-
ObjectData[S
eekCount] == "DAYLIGHT")){
+ if (
objectName[s
eekCount] == "BEGIN" &&
+ (
objectData[s
eekCount] == "STANDARD" ||
+
objectData[s
eekCount] == "DAYLIGHT")){
- if (
V
alidBegin == false){
-
V
alidBegin = true;
+ if (
v
alidBegin == false){
+
v
alidBegin = true;
} else {
}
} else {
}
- if (
ObjectData[S
eekCount] == "STANDARD"){
+ if (
objectData[s
eekCount] == "STANDARD"){
TZMode = false;
TZMode = false;
- } else if (
ObjectData[S
eekCount] == "DAYLIGHT") {
+ } else if (
objectData[s
eekCount] == "DAYLIGHT") {
TZMode = true;
}
TZMode = true;
}
-
S
eekCount++;
+
s
eekCount++;
continue;
}
continue;
}
@@
-833,34
+831,34
@@
void CalendarTimezoneObject::ProcessStandardDaylight(){
// Check if current name is END and
// data is either STANDARD or DAYLIGHT.
// Check if current name is END and
// data is either STANDARD or DAYLIGHT.
- if (
ObjectName[S
eekCount] == "END" &&
- (
ObjectData[S
eekCount] == "STANDARD" ||
-
ObjectData[S
eekCount] == "DAYLIGHT") &&
-
V
alidBegin == true){
+ if (
objectName[s
eekCount] == "END" &&
+ (
objectData[s
eekCount] == "STANDARD" ||
+
objectData[s
eekCount] == "DAYLIGHT") &&
+
v
alidBegin == true){
- if (TZMode == false &&
T
imezoneObjectName.size() > 0){
-
TimezoneStandardName.push_back(T
imezoneObjectName);
-
TimezoneStandardData.push_back(T
imezoneObjectData);
+ if (TZMode == false &&
t
imezoneObjectName.size() > 0){
+
timezoneStandardName.push_back(t
imezoneObjectName);
+
timezoneStandardData.push_back(t
imezoneObjectData);
} else {
} else {
-
TimezoneDaylightName.push_back(T
imezoneObjectName);
-
TimezoneDaylightData.push_back(T
imezoneObjectData);
+
timezoneDaylightName.push_back(t
imezoneObjectName);
+
timezoneDaylightData.push_back(t
imezoneObjectData);
}
}
-
T
imezoneObjectName.clear();
-
T
imezoneObjectData.clear();
+
t
imezoneObjectName.clear();
+
t
imezoneObjectData.clear();
-
V
alidBegin = false;
+
v
alidBegin = false;
}
}
- if (
V
alidBegin == true){
+ if (
v
alidBegin == true){
-
TimezoneObjectName.push_back(ObjectName[S
eekCount]);
-
TimezoneObjectData.push_back(ObjectData[S
eekCount]);
+
timezoneObjectName.push_back(objectName[s
eekCount]);
+
timezoneObjectData.push_back(objectData[s
eekCount]);
}
}
-
S
eekCount++;
+
s
eekCount++;
}
}
diff --git
a/source/objects/calendartimezone/CalendarTimezone.h
b/source/objects/calendartimezone/CalendarTimezone.h
index
20240ea
..
50cd0c8
100644
(file)
--- a/
source/objects/calendartimezone/CalendarTimezone.h
+++ b/
source/objects/calendartimezone/CalendarTimezone.h
@@
-24,32
+24,32
@@
using namespace std;
struct TimezoneDataStruct{
using namespace std;
struct TimezoneDataStruct{
- string
D
ateTimeStartData;
- string
D
ateTimeStartTokens;
- string
T
imeZoneOffsetToData;
- string
T
imeZoneOffsetToTokens;
- string
T
imeZoneOffsetFromData;
- string
T
imeZoneOffsetFromTokens;
+ string
d
ateTimeStartData;
+ string
d
ateTimeStartTokens;
+ string
t
imeZoneOffsetToData;
+ string
t
imeZoneOffsetToTokens;
+ string
t
imeZoneOffsetFromData;
+ string
t
imeZoneOffsetFromTokens;
- string
R
ecurranceRuleData;
- string
R
ecurranceRuleDataTokens;
+ string
r
ecurranceRuleData;
+ string
r
ecurranceRuleDataTokens;
- vector<string>
C
ommentList;
- vector<string>
C
ommentListAltRep;
- vector<string>
C
ommentListLanguage;
- vector<string>
C
ommentListTokens;
+ vector<string>
c
ommentList;
+ vector<string>
c
ommentListAltRep;
+ vector<string>
c
ommentListLanguage;
+ vector<string>
c
ommentListTokens;
- vector<string>
R
ecurranceDateData;
- vector<string>
R
ecurranceDateDataValue;
- vector<string>
R
ecurranceDateDataTimeZoneParam;
- vector<string>
R
ecurranceDateDataTokens;
+ vector<string>
r
ecurranceDateData;
+ vector<string>
r
ecurranceDateDataValue;
+ vector<string>
r
ecurranceDateDataTimeZoneParam;
+ vector<string>
r
ecurranceDateDataTokens;
- vector<string>
T
imeZoneNameData;
- vector<string>
T
imeZoneNameLanguage;
- vector<string>
T
imeZoneNameTokens;
+ vector<string>
t
imeZoneNameData;
+ vector<string>
t
imeZoneNameLanguage;
+ vector<string>
t
imeZoneNameTokens;
- vector<string>
X
TokensData;
- vector<string>
X
TokensDataTokens;
+ vector<string>
x
TokensData;
+ vector<string>
x
TokensDataTokens;
};
class CalendarTimezoneObject: public CalendarObject{
};
class CalendarTimezoneObject: public CalendarObject{
@@
-57,19
+57,19
@@
class CalendarTimezoneObject: public CalendarObject{
CalendarObjectValidResult ValidObject();
public:
CalendarObjectValidResult ValidObject();
public:
- vector<vector<string>>
T
imezoneStandardName;
- vector<vector<string>>
T
imezoneStandardData;
- vector<vector<string>>
T
imezoneDaylightName;
- vector<vector<string>>
T
imezoneDaylightData;
+ vector<vector<string>>
t
imezoneStandardName;
+ vector<vector<string>>
t
imezoneStandardData;
+ vector<vector<string>>
t
imezoneDaylightName;
+ vector<vector<string>>
t
imezoneDaylightData;
- vector<TimezoneDataStruct>
T
imezoneStandardCollection;
- vector<TimezoneDataStruct>
T
imezoneDaylightCollection;
+ vector<TimezoneDataStruct>
t
imezoneStandardCollection;
+ vector<TimezoneDataStruct>
t
imezoneDaylightCollection;
private:
void ProcessData();
void ProcessStandardDaylight();
private:
void ProcessData();
void ProcessStandardDaylight();
- void SaveObjectData(string *
S
aveData);
+ void SaveObjectData(string *
s
aveData);
};
};
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy