author | alwin <alwin> | 2005-03-17 01:36:32 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-17 01:36:32 (UTC) |
commit | e9865193fc0acdb84e0317f1188a70ca6f546ade (patch) (unidiff) | |
tree | 20f488006b89946512e6d064661687e21e456f5e /core/pim/datebook/holiday/birthday/birthday.cpp | |
parent | 7a8d4feb0bb9009b0cd50e80f1d6f1d14ca966dc (diff) | |
download | opie-e9865193fc0acdb84e0317f1188a70ca6f546ade.zip opie-e9865193fc0acdb84e0317f1188a70ca6f546ade.tar.gz opie-e9865193fc0acdb84e0317f1188a70ca6f546ade.tar.bz2 |
check anniversaries, too.
Diffstat (limited to 'core/pim/datebook/holiday/birthday/birthday.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/holiday/birthday/birthday.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/core/pim/datebook/holiday/birthday/birthday.cpp b/core/pim/datebook/holiday/birthday/birthday.cpp index a32e0ea..98e2d40 100644 --- a/core/pim/datebook/holiday/birthday/birthday.cpp +++ b/core/pim/datebook/holiday/birthday/birthday.cpp | |||
@@ -14,29 +14,44 @@ Birthday::Birthday() | |||
14 | */ | 14 | */ |
15 | } | 15 | } |
16 | 16 | ||
17 | QString Birthday::description() | 17 | QString Birthday::description() |
18 | { | 18 | { |
19 | return QObject::tr("Birthdays","holidays"); | 19 | return QObject::tr("Birthdays","holidays"); |
20 | } | 20 | } |
21 | 21 | ||
22 | QStringList Birthday::entries(const QDate&aDate) | 22 | QStringList Birthday::entries(const QDate&aDate) |
23 | { | 23 | { |
24 | QStringList ret; | 24 | QStringList ret; |
25 | if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDay ) ){ | 25 | if ( m_contactdb->hasQuerySettings( Opie::OPimContactAccess::DateDay ) ){ |
26 | Opie::OPimContact querybirthdays; | 26 | Opie::OPimContact querybirthdays,queryanniversary; |
27 | QString pre; | ||
27 | querybirthdays.setBirthday(aDate); | 28 | querybirthdays.setBirthday(aDate); |
29 | queryanniversary.setAnniversary(aDate); | ||
28 | m_list = m_contactdb->queryByExample( querybirthdays,Opie::OPimContactAccess::DateDay| Opie::OPimContactAccess::DateMonth); | 30 | m_list = m_contactdb->queryByExample( querybirthdays,Opie::OPimContactAccess::DateDay| Opie::OPimContactAccess::DateMonth); |
29 | if ( m_list.count() > 0 ){ | 31 | if ( m_list.count() > 0 ){ |
30 | QString pre = QObject::tr("Birthday","holidays")+" "; | 32 | pre = QObject::tr("Birthday","holidays")+" "; |
33 | int z = 0; | ||
34 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { | ||
35 | if (z) { | ||
36 | pre+=", "; | ||
37 | } | ||
38 | pre+=((*m_it).fullName()); | ||
39 | ++z; | ||
40 | } | ||
41 | ret.append(pre); | ||
42 | } | ||
43 | m_list = m_contactdb->queryByExample( queryanniversary,Opie::OPimContactAccess::DateDay| Opie::OPimContactAccess::DateMonth); | ||
44 | if ( m_list.count() > 0 ){ | ||
45 | pre = QObject::tr("Anniversary","holidays")+" "; | ||
31 | int z = 0; | 46 | int z = 0; |
32 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { | 47 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { |
33 | if (z) { | 48 | if (z) { |
34 | pre+=", "; | 49 | pre+=", "; |
35 | } | 50 | } |
36 | pre+=((*m_it).fullName()); | 51 | pre+=((*m_it).fullName()); |
37 | ++z; | 52 | ++z; |
38 | } | 53 | } |
39 | ret.append(pre); | 54 | ret.append(pre); |
40 | } | 55 | } |
41 | } | 56 | } |
42 | return ret; | 57 | return ret; |