Changeset 3382

Timestamp:

06/24/08 20:19:29 (2 months ago)

Author:

bricks

Message:

Next literals for ticket #82

Files:

• trunk/formats/xmlformat-calendar.h (modified) (7 diffs)
• trunk/formats/xmlformat-common.h (modified) (2 diffs)
• trunk/formats/xmlformat-event.h (added)
• trunk/formats/xmlformat-note.h (modified) (2 diffs)
• trunk/formats/xmlformat-todo.h (modified) (4 diffs)

trunk/formats/xmlformat-calendar.h

@@ -18 +18 @@
- */
-
-#include "xmlformat-common.h"
-
-#ifndef XMLFORMAT_CALENDAR_H
-#define XMLFORMAT_CALENDAR_H
+
+#include "xmlformat-common.h"
-
-#define XMLFORMAT_CALENDAR_ROOT                         "note"
@@ -47 +47 @@
-#define XMLFORMAT_CALENDAR_ALARM_FORMATTYPE             "FormatType"
-#define XMLFORMAT_CALENDAR_ALARM_ENCODING               "Encoding"
-#define XMLFORMAT_CALENDAR_
-#define XMLFORMAT_CALENDAR_
-#define XMLFORMAT_CALENDAR_
-#define XMLFORMAT_CALENDAR_
-
-// Attachment
@@ -102 +98 @@
-#define XMLFORMAT_CALENDAR_DURATION_SECONDS             "Seconds"
-
+// FreeBusy
+#define XMLFORMAT_CALENDAR_FREEBUSY                     "FreeBusy"
+#define XMLFORMAT_CALENDAR_FREEBUSY_ATTENDEE            "Attendee"
+#define XMLFORMAT_CALENDAR_FREEBUSY_CONTACT             "Contact"
+#define XMLFORMAT_CALENDAR_FREEBUSY_COMMENT             "Comment"
+#define XMLFORMAT_CALENDAR_FREEBUSY_CONTENT             "Content"
+#define XMLFORMAT_CALENDAR_FREEBUSY_DATEEND             "DateEnd"
+#define XMLFORMAT_CALENDAR_FREEBUSY_DATESTAMP           "DateStamp"
+#define XMLFORMAT_CALENDAR_FREEBUSY_DATESTARTED         "DateStarted"
+#define XMLFORMAT_CALENDAR_FREEBUSY_DURATION            "Duration"
+#define XMLFORMAT_CALENDAR_FREEBUSY_ORGANIZER           "Organizer"
+#define XMLFORMAT_CALENDAR_FREEBUSY_RSTATUS             "RStatus"
+#define XMLFORMAT_CALENDAR_FREEBUSY_UID                 "Uid"
+#define XMLFORMAT_CALENDAR_FREEBUSY_URL                 "Url"
+
+// FreeBusyElement
+#define XMLFORMAT_CALENDAR_FREEBUSYELEMENT              "FreeBusyElement"
+#define XMLFORMAT_CALENDAR_FREEBUSYELEMENT_TYPE         "Type"
+#define XMLFORMAT_CALENDAR_FREEBUSYELEMENT_PERIOD       "Period"
+
-// IntegerContent
-#define XMLFORMAT_CALENDAR_INTEGERCONTENT               "IntegerContent"
@@ -114 +130 @@
-#define XMLFORMAT_CALENDAR_ORGANIZER_LANGUAGE           "Language"
-
+// Period
+#define XMLFORMAT_CALENDAR_PERIOD                       "Period"
+#define XMLFORMAT_CALENDAR_PERIOD_START                 "Start"
+#define XMLFORMAT_CALENDAR_PERIOD_DURATION              "Duration"
+#define XMLFORMAT_CALENDAR_PERIOD_END                   "End"
+
-// Priority
-#define XMLFORMAT_CALENDAR_PRIORITY                     "Priority"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-// RecurrenceId
@@ -142 +173 @@
-#define XMLFORMAT_CALENDAR_RECURRENCERULE_TZCOMPONENT   "TZComponent"
-
+// RecurrenceRuleExtended
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED       "RecurrenceRuleExtended"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_FREQUENCY     "Frequency"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_UNTIL         "Until"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_COUNT         "Count"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_INTERVAL      "Interval"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_BYSECOND      "BySecond"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_BYMINUTE      "ByMinute"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_BYHOUR        "ByHour"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_BYDAY         "ByDay"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_BYMONTHDAY    "ByMonthDay"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_BYYEARDAY     "ByYearDay"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_BYWEEKNO      "ByWeekNo"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_BYMONTH       "ByMonth"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_BYSETPOS      "BySetPos"
+#define XMLFORMAT_CALENDAR_RECURRENCERULEEXTENDED_WKST          "WKST"
+
-// RelatedType
-#define XMLFORMAT_CALENDAR_RELATEDTYPE                  "RelatedType"
@@ -182 +230 @@
-#define XMLFORMAT_CALENDAR_STATUS_CONTENT_CANCELLED     "CANCELLED"
-
+// TimeTransparency
+#define XMLFORMAT_CALENDAR_TIMETRANSPARENCY             "TimeTransparency"
+#define XMLFORMAT_CALENDAR_TIMETRANSPARENCY_CONTENT     "Content"
+#define XMLFORMAT_CALENDAR_TIMETRANSPARENCY_CONTENT_OPAQUE      "OPAQUE"
+#define XMLFORMAT_CALENDAR_TIMETRANSPARENCY_CONTENT_TRANSPARENT "TRANSPARENT"
+
+// Timezone
+#define XMLFORMAT_CALENDAR_TIMEZONE                     "Timezone"
+#define XMLFORMAT_CALENDAR_TIMEZONE_LASTMODIFIED        "LastModified"                  // Type DateTimeContent
+#define XMLFORMAT_CALENDAR_TIMEZONE_TZURL               "TZUrl"                         // Element
+#define XMLFORMAT_CALENDAR_TIMEZONE_XLOCATION           "X-Location"                    // Element
+#define XMLFORMAT_CALENDAR_TIMEZONE_TIMEZONEID          "TimezoneID"                    // Attribute
+#define XMLFORMAT_CALENDAR_TIMEZONE_TZCOMPONENT         "TZComponent"                   // Attribute
+
+// TimezoneComponent
+#define XMLFORMAT_CALENDAR_TIMEZONECOMPONENT            "TimezoneComponent"
+#define XMLFORMAT_CALENDAR_TIMEZONECOMPONENT_COMMENT    "Comment"                       // Type MultiText
+#define XMLFORMAT_CALENDAR_TIMEZONECOMPONENT_RECURRENCEDATETIME "RecurrenceDateTime"    // Type RecurrenceDateTimeList
+#define XMLFORMAT_CALENDAR_TIMEZONECOMPONENT_DATETIMESTART      "DateTimeStart"         // Element
+#define XMLFORMAT_CALENDAR_TIMEZONECOMPONENT_TZNAME     "TZName"                        // Element
+#define XMLFORMAT_CALENDAR_TIMEZONECOMPONENT_TZOFFSETFROM       "TZOffsetFrom"          // Type UtcOffset
+#define XMLFORMAT_CALENDAR_TIMEZONECOMPONENT_TZOFFSETTO "TZOffsetTo"                    // Type UtcOffset
+#define XMLFORMAT_CALENDAR_TIMEZONECOMPONENT_TIMEZONEID "TimezoneID"                    // Attribute
+#define XMLFORMAT_CALENDAR_TIMEZONECOMPONENT_TZCOMPONENT        "TZComponent"           // Attribute
+#define XMLFORMAT_CALENDAR_TIMEZONECOMPONENT_LANGUAGE   "Language"                      // Attribute
+
-// TriggerType
-#define XMLFORMAT_CALENDAR_TRIGGERTYPE                  "TriggerType"
@@ -191 +265 @@
-#define XMLFORMAT_CALENDAR_URLCONTENT_CONTENT           "Content"
-
+// Weekday
+#define XMLFORMAT_CALENDAR_WEEKDAY                      "Weekday"
+#define XMLFORMAT_CALENDAR_WEEKDAY_SUNDAY               "SU"
+#define XMLFORMAT_CALENDAR_WEEKDAY_MONDAY               "MO"
+#define XMLFORMAT_CALENDAR_WEEKDAY_TUESDAY              "TU"
+#define XMLFORMAT_CALENDAR_WEEKDAY_WEDNESDAY            "WE"
+#define XMLFORMAT_CALENDAR_WEEKDAY_THURSDAY             "TH"
+#define XMLFORMAT_CALENDAR_WEEKDAY_FRIDAY               "FR"
+#define XMLFORMAT_CALENDAR_WEEKDAY_SATURDAY             "SA"
+
-#endif /* XMLFORMAT_CALENDAR_H */

trunk/formats/xmlformat-common.h

@@ -27 +27 @@
-// Class
-#define XMLFORMAT_COMMON_CLASS                          "Class"
-
-ONTENT_PUBLIC        
-
-ONTENT_CONFIDENTIAL  
-
+LASS_C
+LASS_CONTENT_PUBLIC
+LASS_C
+LASS_CONTENT_CONFIDENTIAL
+LASS_C
-
-// DateValueType
@@ -40 +40 @@
-// DateTimeContent
-#define XMLFORMAT_COMMON_DATETIMECONTENT                "DateTimeContent"
-
-
-
+              // Element
+                        // Attribute
+           // Attribute
-
-// Multitext

trunk/formats/xmlformat-note.h

@@ -18 +18 @@
- */
-
+#ifndef XMLFORMAT_NOTE_H
+#define XMLFORMAT_NOTE_H
+
-#include "xmlformat-common.h"
-#include "xmlformat-calendar.h"
-
-#ifndef XMLFORMAT_NOTE_H
-#define XMLFORMAT_NOTE_H
-
-#define XMLFORMAT_NOTE_ROOT                             "note"
-#define XMLFORMAT_NOTE_VERSION                          "version"
-
-ment
+
-#define XMLFORMAT_NOTE_ATTACH                           "Attach"
-#define XMLFORMAT_NOTE_ATTACH_CONTENT                   XMLFORMAT_CALENDAR_ATTACHMENT_CONTENT
@@ -66 +66 @@
-// Class
-#define XMLFORMAT_NOTE_CLASS                            "Class"
-
-
-
-
+LASS_C
+LASS_C
+LASS_C
+LASS_C
-
-// Comment

trunk/formats/xmlformat-todo.h

@@ -20 +20 @@
-#ifndef XMLFORMAT_TODO_H
-#define XMLFORMAT_TODO_H
+
+#include "xmlformat-common.h"
+#include "xmlformat-calendar.h"
-
-#define XMLFORMAT_TODO_ROOT                             "todo"
@@ -95 +98 @@
-// Class
-#define XMLFORMAT_TODO_CLASS                            "Class"
-
-
-
-
+LASS_C
+LASS_C
+LASS_C
+LASS_C
-
-// Comment
@@ -235 +238 @@
-#define XMLFORMAT_TODO_PRODUCTID_CONTENT                XMLFORMAT_COMMON_STRINGCONTENT_CONTENT
-
+// RecurrenceDateTime
+#define XMLFORMAT_TODO_RECURRENCEDATETIME               "RecurrenceDateTime"
+#define XMLFORMAT_TODO_RECURRENCEDATETIME_CONTENT        XMLFORMAT_CALENDAR_RECURRENCEDATETIMELIST_CONTENT
+#define XMLFORMAT_TODO_RECURRENCEDATETIME_TIMEZONEID    XMLFORMAT_CALENDAR_RECURRENCEDATETIMELIST_TIMEZONEID
+#define XMLFORMAT_TODO_RECURRENCEDATETIME_VALUE         XMLFORMAT_CALENDAR_RECURRENCEDATETIMELIST_VALUE                         // Attribute type RecurrenceDateTimeList
+#define XMLFORMAT_TODO_RECURRENCEDATETIME_VALUE_DATETIME        XMLFORMAT_CALENDAR_RECURRENCEDATETIMELIST_VALUE_DATETIME
+#define XMLFORMAT_TODO_RECURRENCEDATETIME_VALUE_DATE    XMLFORMAT_CALENDAR_RECURRENCEDATETIMELIST_VALUE_DATE
+#define XMLFORMAT_TODO_RECURRENCEDATETIME_VALUE_PERIOD  XMLFORMAT_CALENDAR_RECURRENCEDATETIMELIST_VALUE_PERIOD
+
-// RecurrenceId
-#define XMLFORMAT_TODO_RECURRENCEID                     "RecurrenceId"
@@ -242 +254 @@
-#define XMLFORMAT_TODO_RECURRENCEID_RANGE_THISANDPRIOR  XMLFORMAT_CALENDAR_RECURRENCEID_RANGE_THISANDPRIOR
-#define XMLFORMAT_TODO_RECURRENCEID_RANGE_THISANDFUTURE XMLFORMAT_CALENDAR_RECURRENCEID_RANGE_THISANDFUTURE
-
+                          
-#define XMLFORMAT_TODO_RECURRENCEID_VALUE_DATE          XMLFORMAT_COMMON_DATEVALUETYPE_DATE
-#define XMLFORMAT_TODO_RECURRENCEID_VALUE_DATETIME      XMLFORMAT_COMMON_DATEVALUETYPE_DATETIME