summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/holiday/birthday/birthday.cpp19
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
@@ -23,11 +23,26 @@ 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) {