-rw-r--r-- | libkcal/incidencebase.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index cfef973..56c0560 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp | |||
@@ -123,64 +123,71 @@ bool KCal::operator==( const IncidenceBase& i1, const IncidenceBase& i2 ) | |||
123 | } else { | 123 | } else { |
124 | return false; | 124 | return false; |
125 | } | 125 | } |
126 | 126 | ||
127 | return ( i1.organizer() == i2.organizer() && | 127 | return ( i1.organizer() == i2.organizer() && |
128 | // i1.uid() == i2.uid() && | 128 | // i1.uid() == i2.uid() && |
129 | // Don't compare lastModified, otherwise the operator is not | 129 | // Don't compare lastModified, otherwise the operator is not |
130 | // of much use. We are not comparing for identity, after all. | 130 | // of much use. We are not comparing for identity, after all. |
131 | i1.doesFloat() == i2.doesFloat() && | 131 | i1.doesFloat() == i2.doesFloat() && |
132 | i1.pilotId() == i2.pilotId() );// && i1.syncStatus() == i2.syncStatus() ); | 132 | i1.pilotId() == i2.pilotId() );// && i1.syncStatus() == i2.syncStatus() ); |
133 | // no need to compare mObserver | 133 | // no need to compare mObserver |
134 | } | 134 | } |
135 | 135 | ||
136 | 136 | ||
137 | QDateTime IncidenceBase::getEvenTime( QDateTime dt ) | 137 | QDateTime IncidenceBase::getEvenTime( QDateTime dt ) |
138 | { | 138 | { |
139 | QTime t = dt.time(); | 139 | QTime t = dt.time(); |
140 | dt.setTime( QTime (t.hour (), t.minute (), t.second () ) ); | 140 | dt.setTime( QTime (t.hour (), t.minute (), t.second () ) ); |
141 | return dt; | 141 | return dt; |
142 | } | 142 | } |
143 | 143 | ||
144 | bool IncidenceBase::isTagged() const | 144 | bool IncidenceBase::isTagged() const |
145 | { | 145 | { |
146 | return mIsTagged; | 146 | return mIsTagged; |
147 | } | 147 | } |
148 | void IncidenceBase::setTagged( bool b) | 148 | void IncidenceBase::setTagged( bool b) |
149 | { | 149 | { |
150 | mIsTagged = b; | 150 | mIsTagged = b; |
151 | } | 151 | } |
152 | void IncidenceBase::setCalID( int id ) | 152 | void IncidenceBase::setCalID( int id ) |
153 | { | 153 | { |
154 | if ( mCalID > 0 ) { | 154 | if ( mCalID > 0 ) { |
155 | updated(); | ||
156 | } | ||
157 | mCalID = id; | ||
158 | } | ||
159 | void IncidenceBase::setCalID_block( int id ) | ||
160 | { | ||
161 | if ( mCalID > 0 ) { | ||
155 | blockLastModified = true; | 162 | blockLastModified = true; |
156 | updated(); | 163 | updated(); |
157 | blockLastModified = false; | 164 | blockLastModified = false; |
158 | } | 165 | } |
159 | mCalID = id; | 166 | mCalID = id; |
160 | } | 167 | } |
161 | int IncidenceBase::calID() const | 168 | int IncidenceBase::calID() const |
162 | { | 169 | { |
163 | return mCalID; | 170 | return mCalID; |
164 | } | 171 | } |
165 | void IncidenceBase::setCalEnabled( bool b ) | 172 | void IncidenceBase::setCalEnabled( bool b ) |
166 | { | 173 | { |
167 | mCalEnabled = b; | 174 | mCalEnabled = b; |
168 | } | 175 | } |
169 | bool IncidenceBase::calEnabled() const | 176 | bool IncidenceBase::calEnabled() const |
170 | { | 177 | { |
171 | return mCalEnabled; | 178 | return mCalEnabled; |
172 | } | 179 | } |
173 | 180 | ||
174 | void IncidenceBase::setAlarmEnabled( bool b ) | 181 | void IncidenceBase::setAlarmEnabled( bool b ) |
175 | { | 182 | { |
176 | mAlarmEnabled = b; | 183 | mAlarmEnabled = b; |
177 | } | 184 | } |
178 | bool IncidenceBase::alarmEnabled() const | 185 | bool IncidenceBase::alarmEnabled() const |
179 | { | 186 | { |
180 | return mAlarmEnabled; | 187 | return mAlarmEnabled; |
181 | } | 188 | } |
182 | 189 | ||
183 | 190 | ||
184 | void IncidenceBase::setUid(const QString &uid) | 191 | void IncidenceBase::setUid(const QString &uid) |
185 | { | 192 | { |
186 | mUid = uid; | 193 | mUid = uid; |