Rename KABC namespace

8 files changed, 32 insertions, 32 deletions

diff --git a/kmobile/Makefile.am b/kmobile/Makefile.am
index 9b73cf67d..268cd6ab6 100644
--- a/kmobile/Makefile.am
+++ b/kmobile/Makefile.am
@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la
 INCLUDES         = $(all_includes)
 
 kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kmobile_LDADD   = $(LIB_TDEFILE) $(LIB_KABC) libkmobiledevice.la
+kmobile_LDADD   = $(LIB_TDEFILE) $(LIB_TDEABC) libkmobiledevice.la
 kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
 			pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
 			systemtray.cpp
@@ -21,7 +21,7 @@ noinst_HEADERS = kmobile.h kmobileview.h kmobileitem.h pref.h
 # the low-level devices driver library
 libkmobiledevice_la_SOURCES = kmobiledevice.cpp
 libkmobiledevice_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
-libkmobiledevice_la_LIBADD = $(LIB_KABC) $(LIB_LOCKDEV) ../libkcal/libkcal.la
+libkmobiledevice_la_LIBADD = $(LIB_TDEABC) $(LIB_LOCKDEV) ../libkcal/libkcal.la
 
 # the KDE application's client library to KMobile
 libkmobileclient_la_SOURCES = kmobileclient.cpp
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index e5629f872..ceadf2416 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -357,12 +357,12 @@ static int gn_error2tdeio_error( gn_error err )
   }
 }
 
-static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memtype, KABC::Addressee *a )
+static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memtype, TDEABC::Addressee *a )
 {
   gn_phonebook_entry entry;
   TQStringList addrlist;
   TQString s, country;
-  KABC::Address *addr;
+  TDEABC::Address *addr;
   gn_error error;
 
 //  if (index > (memstat.used + memstat.free))
@@ -411,7 +411,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
   a->setRevision(datetime);
 
   if (!entry.subentries_count)
-	a->insertPhoneNumber(KABC::PhoneNumber(entry.number, KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref));
+	a->insertPhoneNumber(TDEABC::PhoneNumber(entry.number, TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Pref));
 
   /* scan sub-entries */
   if (entry.subentries_count)
@@ -431,7 +431,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
 				break;
 		   case GN_PHONEBOOK_ENTRY_Postal:
 				addrlist = TQStringList::split(',', s, true);
-				addr = new KABC::Address(KABC::Address::Work);
+				addr = new TDEABC::Address(TDEABC::Address::Work);
 				switch (addrlist.count()) {
 				 case 4:	addr->setStreet(addrlist[0].simplifyWhiteSpace());
 						addr->setLocality(addrlist[1].simplifyWhiteSpace());
@@ -457,18 +457,18 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt
 				a->setNote(a->note()+s);
 				break;
 		   case GN_PHONEBOOK_ENTRY_Number:
-				enum KABC::PhoneNumber::Types phonetype;
+				enum TDEABC::PhoneNumber::Types phonetype;
 				switch (entry.subentries[n].number_type) {
-				 case GN_PHONEBOOK_NUMBER_Mobile: phonetype = KABC::PhoneNumber::Cell; break;
-				 case GN_PHONEBOOK_NUMBER_Fax:    phonetype = KABC::PhoneNumber::Fax;  break;
+				 case GN_PHONEBOOK_NUMBER_Mobile: phonetype = TDEABC::PhoneNumber::Cell; break;
+				 case GN_PHONEBOOK_NUMBER_Fax:    phonetype = TDEABC::PhoneNumber::Fax;  break;
 				 case GN_PHONEBOOK_NUMBER_General:
-				 case GN_PHONEBOOK_NUMBER_Work:   phonetype = KABC::PhoneNumber::Work; break;
+				 case GN_PHONEBOOK_NUMBER_Work:   phonetype = TDEABC::PhoneNumber::Work; break;
 				 default:
-				 case GN_PHONEBOOK_NUMBER_Home:   phonetype = KABC::PhoneNumber::Home; break;
+				 case GN_PHONEBOOK_NUMBER_Home:   phonetype = TDEABC::PhoneNumber::Home; break;
 				}
 				//if (s == entry.number)
-				//  type = (KABC::PhoneNumber::Types) (phonetype | KABC::PhoneNumber::Pref);
-				a->insertPhoneNumber(KABC::PhoneNumber(s, phonetype));
+				//  type = (TDEABC::PhoneNumber::Types) (phonetype | TDEABC::PhoneNumber::Pref);
+				a->insertPhoneNumber(TDEABC::PhoneNumber(s, phonetype));
 				break;
 		   case GN_PHONEBOOK_ENTRY_URL:
 				a->setUrl(s);
@@ -577,7 +577,7 @@ int KMobileGnokii::numAddresses()
   if (m_numAddresses>0) {
 	// initialize the addrList array
 	m_addrList.clear();
-	KABC::Addressee addr;
+	TDEABC::Addressee addr;
 	for (int i=0; i<=m_numAddresses; i++)
 		m_addrList.append(addr);
   }
@@ -585,7 +585,7 @@ int KMobileGnokii::numAddresses()
   return m_numAddresses;
 }  
 
-int KMobileGnokii::readAddress( int index, KABC::Addressee &addr )
+int KMobileGnokii::readAddress( int index, TDEABC::Addressee &addr )
 {
   PRINT_DEBUG << TQString("############   GET ADDRESS #%1\n").arg(index);
   // index is zero-based, but in gnokii the first address starts at 1
@@ -607,7 +607,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr )
   return gn_error2tdeio_error(err);
 }
 
-int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool )
+int KMobileGnokii::storeAddress( int, const TDEABC::Addressee &, bool )
 {
   /* XXX: this is a read-only device */
   return TDEIO::ERR_WRITE_ACCESS_DENIED;
diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h
index 5ace3e0b9..cc55911c1 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.h
+++ b/kmobile/devices/gnokii/gnokii_mobile.h
@@ -55,8 +55,8 @@ public:
      * Addressbook / Phonebook support
      */
     int numAddresses();
-    int readAddress( int index, KABC::Addressee &adr );
-    int storeAddress( int index, const KABC::Addressee &adr, bool append = false );
+    int readAddress( int index, TDEABC::Addressee &adr );
+    int storeAddress( int index, const TDEABC::Addressee &adr, bool append = false );
 
     /*
      * Calendar support
@@ -88,7 +88,7 @@ private:
     TQString m_modelnr, m_connection, m_port, m_baud;
 
     int m_numAddresses;
-    KABC::Addressee::List m_addrList;
+    TDEABC::Addressee::List m_addrList;
 };
 
 #endif
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index 3593c7f8e..1b70016f7 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -105,7 +105,7 @@ int KMobileSkeleton::numAddresses()
   return 10; /* number of addresses we simulate */
 }
 
-int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr )
+int KMobileSkeleton::readAddress( int index, TDEABC::Addressee &addr )
 {
   // index is zero-based
   if (index<0 || index>=numAddresses())
@@ -122,7 +122,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr )
   addr.setNote("the best RDE developer ever");
   addr.setUrl(KURL("www.trinitydesktop.org"));
   addr.insertEmail("peterm@tde.org");
-  addr.insertPhoneNumber(KABC::PhoneNumber("+49 6110 12345"));
+  addr.insertPhoneNumber(TDEABC::PhoneNumber("+49 6110 12345"));
 
   // the Revision might be important for syncronisations
   addr.setRevision(TQDateTime(TQDate(2003,1,1)));
@@ -130,7 +130,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr )
   return 0;
 }
 
-int KMobileSkeleton::storeAddress( int, const KABC::Addressee &, bool )
+int KMobileSkeleton::storeAddress( int, const TDEABC::Addressee &, bool )
 {
   /* this is a read-only device */
   return TDEIO::ERR_WRITE_ACCESS_DENIED;
diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h
index 922565b7e..abd1e8bce 100644
--- a/kmobile/devices/skeleton/skeleton.h
+++ b/kmobile/devices/skeleton/skeleton.h
@@ -55,8 +55,8 @@ public:
      * Addressbook / Phonebook support
      */
     int numAddresses();
-    int readAddress( int index, KABC::Addressee &adr );
-    int storeAddress( int index, const KABC::Addressee &adr, bool append = false );
+    int readAddress( int index, TDEABC::Addressee &adr );
+    int storeAddress( int index, const TDEABC::Addressee &adr, bool append = false );
 
     /*
      * Notes support
diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp
index e92bbd04e..c408d72d0 100644
--- a/kmobile/kmobiledevice.cpp
+++ b/kmobile/kmobiledevice.cpp
@@ -191,12 +191,12 @@ int KMobileDevice::numAddresses()
   return 0;
 }
 
-int KMobileDevice::readAddress( int, KABC::Addressee & )
+int KMobileDevice::readAddress( int, TDEABC::Addressee & )
 {
   return TDEIO::ERR_UNSUPPORTED_ACTION;
 }
 
-int KMobileDevice::storeAddress( int, const KABC::Addressee &, bool )
+int KMobileDevice::storeAddress( int, const TDEABC::Addressee &, bool )
 {
   return TDEIO::ERR_UNSUPPORTED_ACTION;
 }
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index aad9287c5..d4469d358 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -179,8 +179,8 @@ public:
      * Addressbook / Phonebook support
      */
     virtual int numAddresses();
-    virtual int readAddress( int index, KABC::Addressee &adr );
-    virtual int storeAddress( int index, const KABC::Addressee &adr, bool append = false );
+    virtual int readAddress( int index, TDEABC::Addressee &adr );
+    virtual int storeAddress( int index, const TDEABC::Addressee &adr, bool append = false );
 
     /*
      * Calendar support
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index 14f7c0a39..87f691d93 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -291,14 +291,14 @@ TQString KMobileView::readAddress( TQString deviceName, int index )
 	return TQString();
 
    int err;
-   KABC::Addressee adr;
+   TDEABC::Addressee adr;
    MUTEX_LOCK(dev->m_dev);
    err = dev->m_dev->readAddress(index, adr);
    MUTEX_UNLOCK(dev->m_dev);
    if (err)
 	return TQString();
 
-   KABC::VCardConverter converter;
+   TDEABC::VCardConverter converter;
    TQString str = converter.createVCard(adr);
    if (str.isEmpty())
         return TQString();
@@ -315,8 +315,8 @@ bool KMobileView::storeAddress( TQString deviceName, int index, TQString vcard,
    if (!dev || !dev->driverAvailable())
 	return false;
 
-   KABC::VCardConverter converter;
-   KABC::Addressee adr = converter.parseVCard(vcard);
+   TDEABC::VCardConverter converter;
+   TDEABC::Addressee adr = converter.parseVCard(vcard);
    if (adr.isEmpty())
         return false;