author | zautrix <zautrix> | 2004-10-29 11:41:57 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-29 11:41:57 (UTC) |
commit | 8c55eb6afe84ef69bb284d384a0c9f1ef1484ad8 (patch) (unidiff) | |
tree | eda3f48b2a157146d936afef45d0a72f864fedcd /kaddressbook/views | |
parent | 443116d2682cd221c25201926e35d825170bdbbd (diff) | |
download | kdepimpi-8c55eb6afe84ef69bb284d384a0c9f1ef1484ad8.zip kdepimpi-8c55eb6afe84ef69bb284d384a0c9f1ef1484ad8.tar.gz kdepimpi-8c55eb6afe84ef69bb284d384a0c9f1ef1484ad8.tar.bz2 |
fix of excluding last sync addreessees in search
-rw-r--r-- | kaddressbook/views/kaddressbookcardview.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbookiconview.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 15f154e..2c9b162 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp | |||
@@ -284,4 +284,6 @@ void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field ) | |||
284 | if ( field ) { | 284 | if ( field ) { |
285 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 285 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
286 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | ||
287 | continue; | ||
286 | #if QT_VERSION >= 300 | 288 | #if QT_VERSION >= 300 |
287 | if (re.search(field->value( *it ).lower()) != -1) | 289 | if (re.search(field->value( *it ).lower()) != -1) |
@@ -297,4 +299,6 @@ void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field ) | |||
297 | KABC::Field::List::ConstIterator fieldIt; | 299 | KABC::Field::List::ConstIterator fieldIt; |
298 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 300 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
301 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | ||
302 | continue; | ||
299 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | 303 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { |
300 | #if QT_VERSION >= 300 | 304 | #if QT_VERSION >= 300 |
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 41c3cb2..0ce56c8 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp | |||
@@ -271,4 +271,6 @@ void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field ) | |||
271 | if ( field ) { | 271 | if ( field ) { |
272 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 272 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
273 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | ||
274 | continue; | ||
273 | #if QT_VERSION >= 300 | 275 | #if QT_VERSION >= 300 |
274 | if (re.search(field->value( *it ).lower()) != -1) | 276 | if (re.search(field->value( *it ).lower()) != -1) |
@@ -284,4 +286,6 @@ void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field ) | |||
284 | KABC::Field::List::ConstIterator fieldIt; | 286 | KABC::Field::List::ConstIterator fieldIt; |
285 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 287 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
288 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | ||
289 | continue; | ||
286 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | 290 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { |
287 | #if QT_VERSION >= 300 | 291 | #if QT_VERSION >= 300 |
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 6f20e05..89053c2 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp | |||
@@ -152,5 +152,7 @@ void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) | |||
152 | KABC::Addressee::List::Iterator it; | 152 | KABC::Addressee::List::Iterator it; |
153 | if ( field ) { | 153 | if ( field ) { |
154 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 154 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
155 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | ||
156 | continue; | ||
155 | #if QT_VERSION >= 300 | 157 | #if QT_VERSION >= 300 |
156 | if (re.search(field->value( *it ).lower()) != -1) | 158 | if (re.search(field->value( *it ).lower()) != -1) |
@@ -165,4 +167,6 @@ void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) | |||
165 | KABC::Field::List::ConstIterator fieldIt; | 167 | KABC::Field::List::ConstIterator fieldIt; |
166 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { | 168 | for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { |
169 | if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) | ||
170 | continue; | ||
167 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { | 171 | for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { |
168 | #if QT_VERSION >= 300 | 172 | #if QT_VERSION >= 300 |