Rename KABC namespace

1 files changed, 25 insertions, 25 deletions

diff --git a/libtdepim/addresseediffalgo.cpp b/libtdepim/addresseediffalgo.cpp
index d36b7ac94..ab1f2eeb0 100644
--- a/libtdepim/addresseediffalgo.cpp
+++ b/libtdepim/addresseediffalgo.cpp
@@ -31,8 +31,8 @@ static bool compareString( const TQString &left, const TQString &right )
     return left == right;
 }
 
-AddresseeDiffAlgo::AddresseeDiffAlgo( const KABC::Addressee &leftAddressee,
-                              const KABC::Addressee &rightAddressee )
+AddresseeDiffAlgo::AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee,
+                              const TDEABC::Addressee &rightAddressee )
   : mLeftAddressee( leftAddressee ), mRightAddressee( rightAddressee )
 {
 }
@@ -42,68 +42,68 @@ void AddresseeDiffAlgo::run()
   begin();
 
   if ( !compareString( mLeftAddressee.uid(), mRightAddressee.uid() ) )
-    conflictField( KABC::Addressee::uidLabel(), mLeftAddressee.uid(), mRightAddressee.uid() );
+    conflictField( TDEABC::Addressee::uidLabel(), mLeftAddressee.uid(), mRightAddressee.uid() );
 
   if ( !compareString( mLeftAddressee.name(), mRightAddressee.name() ) )
-    conflictField( KABC::Addressee::nameLabel(), mLeftAddressee.name(), mRightAddressee.name() );
+    conflictField( TDEABC::Addressee::nameLabel(), mLeftAddressee.name(), mRightAddressee.name() );
 
   if ( !compareString( mLeftAddressee.formattedName(), mRightAddressee.formattedName() ) )
-    conflictField( KABC::Addressee::formattedNameLabel(), mLeftAddressee.formattedName(), mRightAddressee.formattedName() );
+    conflictField( TDEABC::Addressee::formattedNameLabel(), mLeftAddressee.formattedName(), mRightAddressee.formattedName() );
 
   if ( !compareString( mLeftAddressee.familyName(), mRightAddressee.familyName() ) )
-    conflictField( KABC::Addressee::familyNameLabel(), mLeftAddressee.familyName(), mRightAddressee.familyName() );
+    conflictField( TDEABC::Addressee::familyNameLabel(), mLeftAddressee.familyName(), mRightAddressee.familyName() );
 
   if ( !compareString( mLeftAddressee.givenName(), mRightAddressee.givenName() ) )
-    conflictField( KABC::Addressee::givenNameLabel(), mLeftAddressee.givenName(), mRightAddressee.givenName() );
+    conflictField( TDEABC::Addressee::givenNameLabel(), mLeftAddressee.givenName(), mRightAddressee.givenName() );
 
   if ( !compareString( mLeftAddressee.additionalName(), mRightAddressee.additionalName() ) )
-    conflictField( KABC::Addressee::additionalNameLabel(), mLeftAddressee.additionalName(), mRightAddressee.additionalName() );
+    conflictField( TDEABC::Addressee::additionalNameLabel(), mLeftAddressee.additionalName(), mRightAddressee.additionalName() );
 
   if ( !compareString( mLeftAddressee.prefix(), mRightAddressee.prefix() ) )
-    conflictField( KABC::Addressee::prefixLabel(), mLeftAddressee.prefix(), mRightAddressee.prefix() );
+    conflictField( TDEABC::Addressee::prefixLabel(), mLeftAddressee.prefix(), mRightAddressee.prefix() );
 
   if ( !compareString( mLeftAddressee.suffix(), mRightAddressee.suffix() ) )
-    conflictField( KABC::Addressee::suffixLabel(), mLeftAddressee.suffix(), mRightAddressee.suffix() );
+    conflictField( TDEABC::Addressee::suffixLabel(), mLeftAddressee.suffix(), mRightAddressee.suffix() );
 
   if ( !compareString( mLeftAddressee.nickName(), mRightAddressee.nickName() ) )
-    conflictField( KABC::Addressee::nickNameLabel(), mLeftAddressee.nickName(), mRightAddressee.nickName() );
+    conflictField( TDEABC::Addressee::nickNameLabel(), mLeftAddressee.nickName(), mRightAddressee.nickName() );
 
   if ( mLeftAddressee.birthday() != mRightAddressee.birthday() )
-    conflictField( KABC::Addressee::birthdayLabel(), mLeftAddressee.birthday().toString(),
+    conflictField( TDEABC::Addressee::birthdayLabel(), mLeftAddressee.birthday().toString(),
                    mRightAddressee.birthday().toString() );
 
   if ( !compareString( mLeftAddressee.mailer(), mRightAddressee.mailer() ) )
-    conflictField( KABC::Addressee::mailerLabel(), mLeftAddressee.mailer(), mRightAddressee.mailer() );
+    conflictField( TDEABC::Addressee::mailerLabel(), mLeftAddressee.mailer(), mRightAddressee.mailer() );
 
   if ( mLeftAddressee.timeZone() != mRightAddressee.timeZone() )
-    conflictField( KABC::Addressee::timeZoneLabel(), mLeftAddressee.timeZone().asString(), mRightAddressee.timeZone().asString() );
+    conflictField( TDEABC::Addressee::timeZoneLabel(), mLeftAddressee.timeZone().asString(), mRightAddressee.timeZone().asString() );
 
   if ( mLeftAddressee.geo() != mRightAddressee.geo() )
-    conflictField( KABC::Addressee::geoLabel(), mLeftAddressee.geo().asString(), mRightAddressee.geo().asString() );
+    conflictField( TDEABC::Addressee::geoLabel(), mLeftAddressee.geo().asString(), mRightAddressee.geo().asString() );
 
   if ( !compareString( mLeftAddressee.title(), mRightAddressee.title() ) )
-    conflictField( KABC::Addressee::titleLabel(), mLeftAddressee.title(), mRightAddressee.title() );
+    conflictField( TDEABC::Addressee::titleLabel(), mLeftAddressee.title(), mRightAddressee.title() );
 
   if ( !compareString( mLeftAddressee.role(), mRightAddressee.role() ) )
-    conflictField( KABC::Addressee::roleLabel(), mLeftAddressee.role(), mRightAddressee.role() );
+    conflictField( TDEABC::Addressee::roleLabel(), mLeftAddressee.role(), mRightAddressee.role() );
 
   if ( !compareString( mLeftAddressee.organization(), mRightAddressee.organization() ) )
-    conflictField( KABC::Addressee::organizationLabel(), mLeftAddressee.organization(), mRightAddressee.organization() );
+    conflictField( TDEABC::Addressee::organizationLabel(), mLeftAddressee.organization(), mRightAddressee.organization() );
 
   if ( !compareString( mLeftAddressee.note(), mRightAddressee.note() ) )
-    conflictField( KABC::Addressee::noteLabel(), mLeftAddressee.note(), mRightAddressee.note() );
+    conflictField( TDEABC::Addressee::noteLabel(), mLeftAddressee.note(), mRightAddressee.note() );
 
   if ( !compareString( mLeftAddressee.productId(), mRightAddressee.productId() ) )
-    conflictField( KABC::Addressee::productIdLabel(), mLeftAddressee.productId(), mRightAddressee.productId() );
+    conflictField( TDEABC::Addressee::productIdLabel(), mLeftAddressee.productId(), mRightAddressee.productId() );
 
   if ( !compareString( mLeftAddressee.sortString(), mRightAddressee.sortString() ) )
-    conflictField( KABC::Addressee::sortStringLabel(), mLeftAddressee.sortString(), mRightAddressee.sortString() );
+    conflictField( TDEABC::Addressee::sortStringLabel(), mLeftAddressee.sortString(), mRightAddressee.sortString() );
 
   if ( mLeftAddressee.secrecy() != mRightAddressee.secrecy() ) {
-    conflictField( KABC::Addressee::secrecyLabel(), mLeftAddressee.secrecy().asString(), mRightAddressee.secrecy().asString() );
+    conflictField( TDEABC::Addressee::secrecyLabel(), mLeftAddressee.secrecy().asString(), mRightAddressee.secrecy().asString() );
   }
   if ( mLeftAddressee.url()!= mRightAddressee.url() )
-    conflictField( KABC::Addressee::urlLabel(), mLeftAddressee.url().prettyURL(),
+    conflictField( TDEABC::Addressee::urlLabel(), mLeftAddressee.url().prettyURL(),
       mRightAddressee.url().prettyURL() );
     
   if ( mLeftAddressee.logo() != mRightAddressee.logo() ) {
@@ -120,12 +120,12 @@ void AddresseeDiffAlgo::run()
   end();
 }
 
-TQString AddresseeDiffAlgo::toString( const KABC::PhoneNumber &number )
+TQString AddresseeDiffAlgo::toString( const TDEABC::PhoneNumber &number )
 {
   return number.number();
 }
 
-TQString AddresseeDiffAlgo::toString( const KABC::Address &addr )
+TQString AddresseeDiffAlgo::toString( const TDEABC::Address &addr )
 {
   return addr.formattedAddress();
 }