1 files changed, 16 insertions, 16 deletions

diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index aebb108cd..29cbf1c2b 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -129,7 +129,7 @@ AddresseeView::~AddresseeView()
   mKIMProxy = 0;
 }
 
-void AddresseeView::setAddressee( const KABC::Addressee& addr )
+void AddresseeView::setAddressee( const TDEABC::Addressee& addr )
 {
   mAddressee = addr;
 
@@ -148,7 +148,7 @@ void AddresseeView::enableLinks( int linkMask )
   mLinkMask = linkMask;
 }
 
-TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask,
+TQString AddresseeView::vCardAsHTML( const TDEABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask,
                                     bool internalLoading, FieldMask fieldMask )
 {
   TQString image = TQString( "contact_%1_image" ).arg( addr.uid() );
@@ -201,7 +201,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
 
   if ( !internalLoading ) {
-    KABC::Picture pic = addr.photo();
+    TDEABC::Picture pic = addr.photo();
     if ( pic.isIntern() && !pic.data().isNull() ) {
       image = pixmapAsDataUrl( pic.data() );
     } else if ( !pic.url().isEmpty() ) {
@@ -216,25 +216,25 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
     if ( date.isValid() )
       dynamicPart += rowFmtStr
-        .arg( KABC::Addressee::birthdayLabel() )
+        .arg( TDEABC::Addressee::birthdayLabel() )
         .arg( TDEGlobal::locale()->formatDate( date, true ) );
   }
 
   if ( fieldMask & PhoneFields ) {
-    KABC::PhoneNumber::List phones = addr.phoneNumbers();
-    KABC::PhoneNumber::List::ConstIterator phoneIt;
+    TDEABC::PhoneNumber::List phones = addr.phoneNumbers();
+    TDEABC::PhoneNumber::List::ConstIterator phoneIt;
     for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
       TQString number = TQStyleSheet::escape( (*phoneIt).number() );
 
       TQString url;
-      if ( (*phoneIt).type() & KABC::PhoneNumber::Fax )
+      if ( (*phoneIt).type() & TDEABC::PhoneNumber::Fax )
         url = TQString::fromLatin1( "fax:" ) + number;
       else
         url = TQString::fromLatin1( "phone:" ) + number;
 
       if ( linkMask & PhoneLinks ) {
         TQString smsURL;
-        if ( (*phoneIt).type() & KABC::PhoneNumber::Cell )
+        if ( (*phoneIt).type() & TDEABC::PhoneNumber::Cell )
           smsURL = TQString(" (<a href=\"sms:%1\">%2</a>)" ).arg( number ).arg( i18n( "SMS") );
 
         dynamicPart += rowFmtStr
@@ -289,8 +289,8 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
   }
 
   if ( fieldMask & AddressFields ) {
-    KABC::Address::List addresses = addr.addresses();
-    KABC::Address::List::ConstIterator addrIt;
+    TDEABC::Address::List addresses = addr.addresses();
+    TDEABC::Address::List::ConstIterator addrIt;
     for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) {
       if ( (*addrIt).label().isEmpty() ) {
         TQString formattedAddress;
@@ -303,11 +303,11 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
         if ( linkMask & AddressLinks ) {
           dynamicPart += rowFmtStr
-            .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
+            .arg( TDEABC::Address::typeLabel( (*addrIt).type() ) )
             .arg( link );
         } else {
           dynamicPart += rowFmtStr
-            .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
+            .arg( TDEABC::Address::typeLabel( (*addrIt).type() ) )
             .arg( formattedAddress );
         }
       } else {
@@ -316,11 +316,11 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr
 
         if ( linkMask & AddressLinks ) {
           dynamicPart += rowFmtStr
-            .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
+            .arg( TDEABC::Address::typeLabel( (*addrIt).type() ) )
             .arg( link );
         } else {
           dynamicPart += rowFmtStr
-            .arg( KABC::Address::typeLabel( (*addrIt).type() ) )
+            .arg( TDEABC::Address::typeLabel( (*addrIt).type() ) )
             .arg( (*addrIt).label().replace( '\n', "<br>" ) );
         }
       }
@@ -538,7 +538,7 @@ void AddresseeView::updateView()
 
   TQString imageURL = TQString( "contact_%1_image" ).arg( mAddressee.uid() );
 
-  KABC::Picture picture = mAddressee.photo();
+  TDEABC::Picture picture = mAddressee.photo();
   if ( picture.isIntern() && !picture.data().isNull() )
     TQMimeSourceFactory::defaultFactory()->setImage( imageURL, picture.data() );
   else {
@@ -562,7 +562,7 @@ void AddresseeView::updateView()
   setText( strAddr );
 }
 
-KABC::Addressee AddresseeView::addressee() const
+TDEABC::Addressee AddresseeView::addressee() const
 {
   return mAddressee;
 }