Diffstat (limited to 'libopie2/opiepim/core/opimnotifymanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiepim/core/opimnotifymanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libopie2/opiepim/core/opimnotifymanager.cpp b/libopie2/opiepim/core/opimnotifymanager.cpp index a54d597..573340a 100644 --- a/libopie2/opiepim/core/opimnotifymanager.cpp +++ b/libopie2/opiepim/core/opimnotifymanager.cpp | |||
@@ -21,25 +21,25 @@ | |||
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "opimnotifymanager.h" | 30 | #include "opimnotifymanager.h" |
31 | 31 | ||
32 | /* OPIE */ | 32 | /* OPIE */ |
33 | #include <opie2/oconversion.h> | 33 | #include <opie2/opimdateconversion.h> |
34 | 34 | ||
35 | /* QT */ | 35 | /* QT */ |
36 | #include <qstringlist.h> | 36 | #include <qstringlist.h> |
37 | 37 | ||
38 | namespace Opie | 38 | namespace Opie |
39 | { | 39 | { |
40 | 40 | ||
41 | OPimNotifyManager::OPimNotifyManager( const Reminders& rem, const Alarms& al ) | 41 | OPimNotifyManager::OPimNotifyManager( const Reminders& rem, const Alarms& al ) |
42 | : m_rem( rem ), m_al( al ) | 42 | : m_rem( rem ), m_al( al ) |
43 | {} | 43 | {} |
44 | 44 | ||
45 | 45 | ||
@@ -175,25 +175,25 @@ QString OPimNotifyManager::alarmsToString() const | |||
175 | QString str; | 175 | QString str; |
176 | 176 | ||
177 | OPimNotifyManager::Alarms alarms = m_al; | 177 | OPimNotifyManager::Alarms alarms = m_al; |
178 | if ( !alarms.isEmpty() ) | 178 | if ( !alarms.isEmpty() ) |
179 | { | 179 | { |
180 | QStringList als; | 180 | QStringList als; |
181 | OPimNotifyManager::Alarms::Iterator it = alarms.begin(); | 181 | OPimNotifyManager::Alarms::Iterator it = alarms.begin(); |
182 | for ( ; it != alarms.end(); ++it ) | 182 | for ( ; it != alarms.end(); ++it ) |
183 | { | 183 | { |
184 | /* only if time is valid */ | 184 | /* only if time is valid */ |
185 | if ( ( *it ).dateTime().isValid() ) | 185 | if ( ( *it ).dateTime().isValid() ) |
186 | { | 186 | { |
187 | als << OConversion::dateTimeToString( ( *it ).dateTime() ) | 187 | als << OPimDateConversion::dateTimeToString( ( *it ).dateTime() ) |
188 | + ":" + QString::number( ( *it ).duration() ) | 188 | + ":" + QString::number( ( *it ).duration() ) |
189 | + ":" + QString::number( ( *it ).sound() ) | 189 | + ":" + QString::number( ( *it ).sound() ) |
190 | + ":"; | 190 | + ":"; |
191 | } | 191 | } |
192 | } | 192 | } |
193 | // now write the list | 193 | // now write the list |
194 | qWarning( "als: %s", als.join( "____________" ).latin1() ); | 194 | qWarning( "als: %s", als.join( "____________" ).latin1() ); |
195 | str = als.join( ";" ); | 195 | str = als.join( ";" ); |
196 | } | 196 | } |
197 | 197 | ||
198 | return str; | 198 | return str; |
199 | } | 199 | } |
@@ -218,26 +218,26 @@ QString OPimNotifyManager::remindersToString() const | |||
218 | return str; | 218 | return str; |
219 | } | 219 | } |
220 | 220 | ||
221 | 221 | ||
222 | void OPimNotifyManager::alarmsFromString( const QString& str ) | 222 | void OPimNotifyManager::alarmsFromString( const QString& str ) |
223 | { | 223 | { |
224 | QStringList als = QStringList::split( ";", str ); | 224 | QStringList als = QStringList::split( ";", str ); |
225 | for ( QStringList::Iterator it = als.begin(); it != als.end(); ++it ) | 225 | for ( QStringList::Iterator it = als.begin(); it != als.end(); ++it ) |
226 | { | 226 | { |
227 | QStringList alarm = QStringList::split( ":", ( *it ), TRUE ); // allow empty | 227 | QStringList alarm = QStringList::split( ":", ( *it ), TRUE ); // allow empty |
228 | qWarning( "alarm: %s", alarm.join( "___" ).latin1() ); | 228 | qWarning( "alarm: %s", alarm.join( "___" ).latin1() ); |
229 | qWarning( "alarm[0]: %s %s", alarm[ 0 ].latin1(), | 229 | qWarning( "alarm[0]: %s %s", alarm[ 0 ].latin1(), |
230 | OConversion::dateTimeFromString( alarm[ 0 ] ).toString().latin1() ); | 230 | OPimDateConversion::dateTimeFromString( alarm[ 0 ] ).toString().latin1() ); |
231 | OPimAlarm al( alarm[ 2 ].toInt(), OConversion::dateTimeFromString( alarm[ 0 ] ), | 231 | OPimAlarm al( alarm[ 2 ].toInt(), OPimDateConversion::dateTimeFromString( alarm[ 0 ] ), |
232 | alarm[ 1 ].toInt() ); | 232 | alarm[ 1 ].toInt() ); |
233 | add( al ); | 233 | add( al ); |
234 | } | 234 | } |
235 | } | 235 | } |
236 | 236 | ||
237 | 237 | ||
238 | void OPimNotifyManager::remindersFromString( const QString& str ) | 238 | void OPimNotifyManager::remindersFromString( const QString& str ) |
239 | { | 239 | { |
240 | 240 | ||
241 | QStringList rems = QStringList::split( ";", str ); | 241 | QStringList rems = QStringList::split( ";", str ); |
242 | for ( QStringList::Iterator it = rems.begin(); it != rems.end(); ++it ) | 242 | for ( QStringList::Iterator it = rems.begin(); it != rems.end(); ++it ) |
243 | { | 243 | { |