4 files changed, 58 insertions, 0 deletions

diff --git a/kabc/address.cpp b/kabc/address.cpp
index 5ffe511..6151f9e 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -102,4 +102,31 @@ QStringList Address::asList()
     return result;
 }
+
+bool Address::matchAddress( QRegExp* re ) const
+{
+
+#if QT_VERSION >= 0x030000
+    if (re->search( mPostOfficeBox ) == 0) return true;
+    if (re->search( mExtended     ) == 0) return true;
+    if (re->search( mStreet     ) == 0) return true;
+    if (re->search( mLocality      ) == 0) return true;
+    if (re->search( mRegion      ) == 0) return true;
+    if (re->search( mPostalCode     ) == 0) return true;
+    if (re->search( mCountry     ) == 0) return true;
+    if (re->search( mLabel     ) == 0) return true;
+#else
+        if (re->match( mPostOfficeBox    ) == 0) return true;
+        if (re->match( mExtended     ) == 0) return true;
+        if (re->match( mStreet     ) == 0) return true;
+        if (re->match( mLocality     ) == 0) return true;
+        if (re->match( mRegion     ) == 0) return true;
+        if (re->match( mPostalCode     ) == 0) return true;
+        if (re->match( mCountry     ) == 0) return true;
+        if (re->match( mLabel    ) == 0) return true;
+#endif   
+
+    return false;
+}
+
 void Address::clear()
 {
diff --git a/kabc/address.h b/kabc/address.h
index 37dd851..38ad20b 100644
--- a/kabc/address.h
+++ b/kabc/address.h
@@ -31,4 +31,5 @@ $Id$
 #include <qmap.h>
 #include <qstring.h>
+#include <qregexp.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
@@ -96,4 +97,5 @@ class Address
     */
     Address( int );
+    bool matchAddress( QRegExp* searchExp ) const;
 
     bool operator==( const Address & ) const;
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 155ce24..7e1e414 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -307,5 +307,30 @@ void Addressee::computeCsum(const QString &dev)
     setCsum( dev, QString::number (cs ));
 }
+bool Addressee::matchAddress( QRegExp* re ) const
+{
+    KABC::Address::List::Iterator addressIter;
+    for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
+          ++addressIter ) {
+        if ( (*addressIter).matchAddress( re ) )
+            return true;
+    }
+   return false;
+}
+bool Addressee::matchPhoneNumber( QRegExp* re ) const
+{
+   KABC::PhoneNumber::List::Iterator phoneIter;
+
+   for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); ++phoneIter ) {
+#if QT_VERSION >= 0x030000
+                if (re->search( (*phoneIter).number() ) == 0)
+#else
+                    if (re->match( (*phoneIter).number() ) == 0)
+#endif   
+                        return true;
 
+   }
+   return false;
+
+}
 void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
 {
diff --git a/kabc/addressee.h b/kabc/addressee.h
index a2fbcf5..d1c07cb 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -32,4 +32,5 @@ $Id$
 #include <qdatetime.h>
 #include <qstring.h>
+#include <qregexp.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
@@ -651,4 +652,7 @@ class Addressee
     PhoneNumber phoneNumber( int type ) const;
 
+    bool matchPhoneNumber( QRegExp* searchExp ) const;
+    bool matchAddress( QRegExp* searchExp ) const;
+
     /**
       Return list of all phone numbers.