author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (unidiff) | |
tree | 05af57bcebb8a124c2561336e4ff3dfdd52aeccb /core/pim/today/plugins/addressbook/addresspluginwidget.cpp | |
parent | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (diff) | |
download | opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.zip opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.gz opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.bz2 |
resolved merge conflict
Diffstat (limited to 'core/pim/today/plugins/addressbook/addresspluginwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/today/plugins/addressbook/addresspluginwidget.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp index dad09db..d47bc0b 100644 --- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp +++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp | |||
@@ -102,20 +102,24 @@ void AddressBookPluginWidget::getAddress() { | |||
102 | QString output; | 102 | QString output; |
103 | 103 | ||
104 | // Check whether the database provide the search option.. | 104 | // Check whether the database provide the search option.. |
105 | if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ | 105 | if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ |
106 | // Libopie seems to be old.. | 106 | // Libopie seems to be old.. |
107 | output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" ); | 107 | output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" ); |
108 | addressLabel->setText( output ); | 108 | addressLabel->setText( output ); |
109 | return; | 109 | return; |
110 | } | 110 | } |
111 | 111 | ||
112 | // Define the query for birthdays and start search.. | 112 | // Define the query for birthdays and start search.. |
113 | QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead ); | 113 | QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead ); |
114 | int ammount = 0; | 114 | int ammount = 0; |
115 | if ( m_showBirthdays ){ | 115 | if ( m_showBirthdays ){ |
116 | qWarning("Searching from now (%s) until %s ! ", | 116 | qWarning("Searching from now (%s) until %s ! ", |
117 | QDate::currentDate().toString().latin1(), | 117 | QDate::currentDate().toString().latin1(), |
118 | lookAheadDate.toString().latin1() ); | 118 | lookAheadDate.toString().latin1() ); |
119 | } | ||
120 | |||
121 | if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){ | ||
122 | |||
119 | 123 | ||
120 | OContact querybirthdays; | 124 | OContact querybirthdays; |
121 | querybirthdays.setBirthday( lookAheadDate ); | 125 | querybirthdays.setBirthday( lookAheadDate ); |