author | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-06-07 18:53:14 (UTC) |
commit | 640d964cfdc7467f6cacb513087cd3acda2c04f0 (patch) (unidiff) | |
tree | 9a784686c1795f8b1f81eb344598f3b549d43467 /library/backend/event.h | |
parent | dfb9c76738bb68e235114c5ad43dbd26a59b98ab (diff) | |
download | opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.zip opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.gz opie-640d964cfdc7467f6cacb513087cd3acda2c04f0.tar.bz2 |
Backing out unintentional merge from TT branch.
-rw-r--r-- | library/backend/event.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/library/backend/event.h b/library/backend/event.h index 0ebe9ea..277aadd 100644 --- a/library/backend/event.h +++ b/library/backend/event.h | |||
@@ -119,49 +119,54 @@ public: | |||
119 | // returns a proper days-char for a given dayOfWeek() | 119 | // returns a proper days-char for a given dayOfWeek() |
120 | static char day( int dayOfWeek ) { return 1 << ( dayOfWeek - 1 ); } | 120 | static char day( int dayOfWeek ) { return 1 << ( dayOfWeek - 1 ); } |
121 | // returns the dayOfWeek for the *first* day it finds (ignores | 121 | // returns the dayOfWeek for the *first* day it finds (ignores |
122 | // any further days!). Returns 1 (Monday) if there isn't any day found | 122 | // any further days!). Returns 1 (Monday) if there isn't any day found |
123 | static int dayOfWeek( char day ); | 123 | static int dayOfWeek( char day ); |
124 | // returns the difference of months from first to second. | 124 | // returns the difference of months from first to second. |
125 | static int monthDiff( const QDate& first, const QDate& second ); | 125 | static int monthDiff( const QDate& first, const QDate& second ); |
126 | bool match( const QRegExp &r ) const; | 126 | bool match( const QRegExp &r ) const; |
127 | 127 | ||
128 | private: | 128 | private: |
129 | Qtopia::UidGen &uidGen() { return sUidGen; } | 129 | Qtopia::UidGen &uidGen() { return sUidGen; } |
130 | static Qtopia::UidGen sUidGen; | 130 | static Qtopia::UidGen sUidGen; |
131 | 131 | ||
132 | QString descript, locat, categ; | 132 | QString descript, locat, categ; |
133 | Type typ : 4; | 133 | Type typ : 4; |
134 | bool startTimeDirty : 1; | 134 | bool startTimeDirty : 1; |
135 | bool endTimeDirty : 1; | 135 | bool endTimeDirty : 1; |
136 | time_t startUTC, endUTC; | 136 | time_t startUTC, endUTC; |
137 | QString tz; | 137 | QString tz; |
138 | bool hAlarm, hRepeat; | 138 | bool hAlarm, hRepeat; |
139 | int aMinutes; | 139 | int aMinutes; |
140 | SoundTypeChoice aSound; | 140 | SoundTypeChoice aSound; |
141 | RepeatPattern pattern; | 141 | RepeatPattern pattern; |
142 | QString note; | 142 | QString note; |
143 | // ADDITION | ||
144 | int mRid;// Recode ID | ||
145 | int mRinfo;// Recode Info | ||
146 | // | ||
143 | EventPrivate *d; | 147 | EventPrivate *d; |
148 | |||
144 | }; | 149 | }; |
145 | 150 | ||
146 | // Since an event spans multiple day, it is better to have this | 151 | // Since an event spans multiple day, it is better to have this |
147 | // class to represent a day instead of creating many | 152 | // class to represent a day instead of creating many |
148 | // dummy events... | 153 | // dummy events... |
149 | 154 | ||
150 | class EffectiveEventPrivate; | 155 | class EffectiveEventPrivate; |
151 | class QPC_EXPORT EffectiveEvent | 156 | class QPC_EXPORT EffectiveEvent |
152 | { | 157 | { |
153 | public: | 158 | public: |
154 | // If we calculate the effective event of a multi-day event | 159 | // If we calculate the effective event of a multi-day event |
155 | // we have to figure out whether we are at the first day, | 160 | // we have to figure out whether we are at the first day, |
156 | // at the end, or anywhere else ("middle"). This is important | 161 | // at the end, or anywhere else ("middle"). This is important |
157 | // for the start/end times (00:00/23:59) | 162 | // for the start/end times (00:00/23:59) |
158 | // MidWay: 00:00 -> 23:59, as we are "in the middle" of a multi- | 163 | // MidWay: 00:00 -> 23:59, as we are "in the middle" of a multi- |
159 | // day event | 164 | // day event |
160 | // Start: start time -> 23:59 | 165 | // Start: start time -> 23:59 |
161 | // End: 00:00 -> end time | 166 | // End: 00:00 -> end time |
162 | // Start | End == StartEnd: for single-day events (default) | 167 | // Start | End == StartEnd: for single-day events (default) |
163 | // here we draw start time -> end time | 168 | // here we draw start time -> end time |
164 | enum Position { MidWay = 0, Start = 1, End = 2, StartEnd = 3 }; | 169 | enum Position { MidWay = 0, Start = 1, End = 2, StartEnd = 3 }; |
165 | 170 | ||
166 | EffectiveEvent(); | 171 | EffectiveEvent(); |
167 | EffectiveEvent( const Event &event, const QDate &startDate, Position pos = StartEnd ); | 172 | EffectiveEvent( const Event &event, const QDate &startDate, Position pos = StartEnd ); |