search fixes

5 files changed, 9 insertions, 7 deletions

diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 8062354..424d52a 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -127,8 +127,12 @@ void KAddressBookView::initGUI()
 KABC::Field::List KAddressBookView::fields() const
 {
   return mFieldList;
 }
+KABC::Field::List KAddressBookView::allFields() const
+{
+  return KABC::Field::allFields(); 
+}
 
 void KAddressBookView::setFilter( const Filter &filter )
 {
   mFilter = filter;
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 2e91cbc..8646136 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -121,8 +121,10 @@ class KAddressBookView : public QWidget
       this method whenever a readConfig() is called in order to get the newest
       list of fields.
      */
     KABC::Field::List fields() const;
+
+    KABC::Field::List allFields() const; 
     
     /**
       Sets the active filter. This filter will be used for filtering
       the list of addressees to display. The view will <b>not</b>
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 2c9b162..2d7ed08 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -294,9 +294,9 @@ void KAddressBookCardView::doSearch( const QString&  s,KABC::Field *field  )
                                               addressBook(), *it, mCardView);
 
         }
     } else {
-        KABC::Field::List fieldList = fields();
+        KABC::Field::List fieldList = allFields();
         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;
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 0ce56c8..faeda06 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -281,9 +281,9 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
                  
 
         }
     } else {
-        KABC::Field::List fieldList = fields();
+        KABC::Field::List fieldList = allFields();
         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;
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 89053c2..61703ee 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -162,9 +162,9 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
                     ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
 
         }
     } else {
-        KABC::Field::List fieldList = fields();
+        KABC::Field::List fieldList = allFields();
         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;
@@ -257,12 +257,8 @@ void KAddressBookTableView::readConfig(KConfig *config)
     //US    mListView->setHeaderFont( f );
     mListView->header()->setFont( f );
   }  
 
-
-
-
-
   // Set the list view options
   mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground",
                                                                  true));
   mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false));