summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-29 11:41:57 (UTC)
committer zautrix <zautrix>2004-10-29 11:41:57 (UTC)
commit8c55eb6afe84ef69bb284d384a0c9f1ef1484ad8 (patch) (side-by-side diff)
treeeda3f48b2a157146d936afef45d0a72f864fedcd
parent443116d2682cd221c25201926e35d825170bdbbd (diff)
downloadkdepimpi-8c55eb6afe84ef69bb284d384a0c9f1ef1484ad8.zip
kdepimpi-8c55eb6afe84ef69bb284d384a0c9f1ef1484ad8.tar.gz
kdepimpi-8c55eb6afe84ef69bb284d384a0c9f1ef1484ad8.tar.bz2
fix of excluding last sync addreessees in search
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp4
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp4
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp6
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
@@ -283,6 +283,8 @@ void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field )
KABC::Addressee::List::Iterator it;
if ( field ) {
for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+ if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
+ continue;
#if QT_VERSION >= 300
if (re.search(field->value( *it ).lower()) != -1)
#else
@@ -296,6 +298,8 @@ void KAddressBookCardView::doSearch( const QString& s,KABC::Field *field )
KABC::Field::List fieldList = fields();
KABC::Field::List::ConstIterator fieldIt;
for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+ if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
+ continue;
for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
#if QT_VERSION >= 300
if (re.search((*fieldIt)->value( *it ).lower()) != -1)
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
@@ -270,6 +270,8 @@ void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field )
KABC::Addressee::List::Iterator it;
if ( field ) {
for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+ if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
+ continue;
#if QT_VERSION >= 300
if (re.search(field->value( *it ).lower()) != -1)
#else
@@ -283,6 +285,8 @@ void KAddressBookIconView::doSearch( const QString& s ,KABC::Field *field )
KABC::Field::List fieldList = fields();
KABC::Field::List::ConstIterator fieldIt;
for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+ if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
+ continue;
for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
#if QT_VERSION >= 300
if (re.search((*fieldIt)->value( *it ).lower()) != -1)
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
@@ -151,7 +151,9 @@ void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field )
KABC::Addressee::List addresseeList = addressees();
KABC::Addressee::List::Iterator it;
if ( field ) {
- for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+ for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+ if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
+ continue;
#if QT_VERSION >= 300
if (re.search(field->value( *it ).lower()) != -1)
#else
@@ -164,6 +166,8 @@ void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field )
KABC::Field::List fieldList = fields();
KABC::Field::List::ConstIterator fieldIt;
for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
+ if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
+ continue;
for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
#if QT_VERSION >= 300
if (re.search((*fieldIt)->value( *it ).lower()) != -1)