From 94273bcb909fac42ef9427e3d8a614cab8c29c66 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 20 Feb 2013 16:27:27 -0600
Subject: Rename KABC namespace

---
 plugins/kmail/bodypartformatter/Makefile.am    |  4 ++--
 plugins/kmail/bodypartformatter/text_vcard.cpp | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'plugins/kmail/bodypartformatter')

diff --git a/plugins/kmail/bodypartformatter/Makefile.am b/plugins/kmail/bodypartformatter/Makefile.am
index b768cb56c..5c546eff6 100644
--- a/plugins/kmail/bodypartformatter/Makefile.am
+++ b/plugins/kmail/bodypartformatter/Makefile.am
@@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = libkmail_bodypartformatter_text_vcard.la \
 
 libkmail_bodypartformatter_text_vcard_la_SOURCES = text_vcard.cpp
 libkmail_bodypartformatter_text_vcard_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-libkmail_bodypartformatter_text_vcard_la_LIBADD  = $(LIB_QT) $(LIB_KABC) \
+libkmail_bodypartformatter_text_vcard_la_LIBADD  = $(LIB_QT) $(LIB_TDEABC) \
                                                    ../../../libtdepim/libtdepim.la \
                                                    ../../../libkmime/libkmime.la \
                                                    ../../../libemailfunctions/libemailfunctions.la
@@ -30,7 +30,7 @@ libkmail_bodypartformatter_text_calendar_la_SOURCES = \
 	kcalendariface.stub
 libkmail_bodypartformatter_text_calendar_la_LDFLAGS = \
   $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-libkmail_bodypartformatter_text_calendar_la_LIBADD  = $(LIB_QT) $(LIB_KABC) \
+libkmail_bodypartformatter_text_calendar_la_LIBADD  = $(LIB_QT) $(LIB_TDEABC) \
   $(top_builddir)/libkcal/libkcal.la $(top_builddir)/kmail/libkmailprivate.la
 
 kcalendariface_DIR = $(top_srcdir)/korganizer
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 61a254c4b..3f0f9014f 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -57,8 +57,8 @@ using KMail::Interface::BodyPart;
 
 #include <tdeabc/vcardconverter.h>
 #include <tdeabc/addressee.h>
-using KABC::VCardConverter;
-using KABC::Addressee;
+using TDEABC::VCardConverter;
+using TDEABC::Addressee;
 
 #include "addresseeview.h"
 using KPIM::AddresseeView;
@@ -94,10 +94,10 @@ namespace {
              "</h2></div>"
                 );
 
-       TQValueListIterator<KABC::Addressee> it = al.begin();
+       TQValueListIterator<TDEABC::Addressee> it = al.begin();
        int count = 0;
        for ( ; it != al.end(); ++it ) {
-          KABC::Addressee a = (*it);
+          TDEABC::Addressee a = (*it);
           if ( a.isEmpty() ) return AsIcon;
 
           TQString contact = AddresseeView::vCardAsHTML( a, 0L, AddresseeView::NoLinks, false, AddresseeView::DefaultFields );
@@ -135,13 +135,13 @@ namespace {
 #endif
       int index = path.right( path.length() - path.findRev( ":" ) - 1 ).toInt();
       if ( index == -1 ) return true;
-      KABC::Addressee a = al[index];
+      TDEABC::Addressee a = al[index];
       if ( a.isEmpty() ) return true;
       KAddrBookExternal::addVCard( a, 0 );
       return true;
     }
 
-    static KABC::Addressee findAddressee( BodyPart *part, const TQString &path )
+    static TDEABC::Addressee findAddressee( BodyPart *part, const TQString &path )
     {
       const TQString vCard = part->asText();
       if ( !vCard.isEmpty() ) {
@@ -156,7 +156,7 @@ namespace {
           return al[index];
         }
       }
-      return KABC::Addressee();
+      return TDEABC::Addressee();
     }
 
     bool handleContextMenuRequest( KMail::Interface::BodyPart *part,
@@ -167,7 +167,7 @@ namespace {
       if ( vCard.isEmpty() ) {
         return true;
       }
-      KABC::Addressee a = findAddressee( part, path );
+      TDEABC::Addressee a = findAddressee( part, path );
       if ( a.isEmpty() ) {
         return true;
       }
@@ -191,7 +191,7 @@ namespace {
 
     TQString statusBarMessage( BodyPart *part, const TQString &path ) const
     {
-      KABC::Addressee a = findAddressee( part, path );
+      TDEABC::Addressee a = findAddressee( part, path );
       if ( a.realName().isEmpty() ) {
         return i18n( "Add this contact to the address book." );
       } else {
@@ -199,7 +199,7 @@ namespace {
       }
     }
 
-    bool openVCard( const KABC::Addressee &a, const TQString &vCard ) const
+    bool openVCard( const TDEABC::Addressee &a, const TQString &vCard ) const
     {
       Q_UNUSED( vCard );
       AddresseeView *view = new AddresseeView( 0 );
@@ -214,7 +214,7 @@ namespace {
       return true;
     }
 
-    bool saveAsVCard( const KABC::Addressee &a, const TQString &vCard ) const
+    bool saveAsVCard( const TDEABC::Addressee &a, const TQString &vCard ) const
     {
       TQString fileName = a.givenName() + '_' + a.familyName() + ".vcf";
 
-- 
cgit v1.2.1