1 files changed, 27 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
@@ -8,192 +8,219 @@
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 //US added kglobal.h
 #include <kglobal.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
 #include <qfile.h>
 
 #include "address.h"
 
 using namespace KABC;
 
 QMap<QString, QString> Address::mISOMap;
 
 Address::Address() :
   mEmpty( true ), mType( 0 )
 {
   mId = KApplication::randomString( 10 );
 }
 
 Address::Address( int type ) :
   mEmpty( true ), mType( type )
 {
   mId = KApplication::randomString( 10 );
 }
 
 bool Address::operator==( const Address &a ) const
 {
   if ( mPostOfficeBox != a.mPostOfficeBox ) return false;
   if ( mExtended != a.mExtended ) return false;
   if ( mStreet != a.mStreet ) return false;
   if ( mLocality != a.mLocality ) return false;
   if ( mRegion != a.mRegion ) return false;
   if ( mPostalCode != a.mPostalCode ) return false;
   if ( mCountry != a.mCountry ) return false;
   if ( mLabel != a.mLabel ) return false;
   
   return true;
 }
 
 bool Address::operator!=( const Address &a ) const
 {
   return !( a == *this );
 }
 
 bool Address::isEmpty() const
 {
   if ( mPostOfficeBox.isEmpty() &&
        mExtended.isEmpty() &&
        mStreet.isEmpty() &&
        mLocality.isEmpty() &&
        mRegion.isEmpty() &&
        mPostalCode.isEmpty() &&
        mCountry.isEmpty() &&
        mLabel.isEmpty() ) {
     return true;
   }
   return false;
 }
 
 QStringList Address::asList()
 {
     QStringList result;
     if ( ! mPostOfficeBox.isEmpty() )result.append(mPostOfficeBox);
     if ( ! mExtended.isEmpty())result.append(mExtended);
     if ( ! mStreet.isEmpty())result.append(mStreet);
     if ( ! mLocality.isEmpty() )result.append(mLocality);
     if ( ! mRegion.isEmpty())result.append(mRegion);
     if ( ! mPostalCode.isEmpty())result.append(mPostalCode);
     if ( ! mCountry.isEmpty())result.append(mCountry);
     if ( ! mLabel.isEmpty() )result.append(mLabel);
     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()
 {
   *this = Address();
 }
 
 void Address::setId( const QString &id )
 {
   mEmpty = false;
 
   mId = id;
 }
 
 QString Address::id() const
 {
   return mId;
 }
 
 void Address::setType( int type )
 {
   mEmpty = false;
 
   mType = type;
 }
 
 int Address::type() const
 {
   return mType;
 }
 
 QString Address::typeLabel() const
 {
   QString label;
   bool first = true;
 
   TypeList list = typeList();
 
   TypeList::Iterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
     if ( ( type() & (*it) ) && ( (*it) != Pref ) ) {
       label.append( ( first ? "" : "/" ) + typeLabel( *it ) );
       if ( first )
         first = false;
     }
   }
 
   return label;
 }
 
 void Address::setPostOfficeBox( const QString &s )
 {
   mEmpty = false;
 
   mPostOfficeBox = s;
 }
 
 QString Address::postOfficeBox() const
 {
   return mPostOfficeBox;
 }
 
 QString Address::postOfficeBoxLabel()
 {
   return i18n("Post Office Box");
 }
 
 
 void Address::setExtended( const QString &s )
 {
   mEmpty = false;
 
   mExtended = s;
 }
 
 QString Address::extended() const
 {
   return mExtended;
 }
 
 QString Address::extendedLabel()
 {
   return i18n("Extended Address Information");
 }
 
 
 void Address::setStreet( const QString &s )
 {
   mEmpty = false;
 
   mStreet = s;
 }
 
 QString Address::street() const
 {
   return mStreet;
 }