Rename KABC namespace

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2013-02-20 16:26:45 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2013-02-20 16:26:45 -0600
commit: 45f3927b0ffec2599bc0e1ce361c5386474a85f4 (patch)
tree: 29e1842fe4d93f4e99481385a771e8bef061158b /tdeabc
parent: 04105ef07304a9358e87eff0cb1a6d6f2a725192 (diff)
download: tdelibs-45f3927b0ffec2599bc0e1ce361c5386474a85f4.tar.gz
tdelibs-45f3927b0ffec2599bc0e1ce361c5386474a85f4.zip
140 files changed, 330 insertions, 330 deletions
diff --git a/tdeabc/HOWTO b/tdeabc/HOWTO
index 3941b2033..5187f2580 100644
--- a/tdeabc/HOWTO
+++ b/tdeabc/HOWTO
@@ -18,11 +18,11 @@ Management Layer *
 ******************
 
      .-------------------.
-     | KABC::AddressBook |
+     | TDEABC::AddressBook |
     .--------------------------------.
-    | KABC::Addressee                |  => Iterators
-    | KABC::Addressee                |
-    | KABC::Addressee                |  => Search functions
+    | TDEABC::Addressee                |  => Iterators
+    | TDEABC::Addressee                |
+    | TDEABC::Addressee                |  => Search functions
     | ...                            |
     `--------------------------------'
                        |
@@ -44,8 +44,8 @@ Storage Layer *        |
 
 The Management Layer
 ---------------------
-The Management Layer consists of the two classes KABC::AddressBook and
-KABC::Addressee. KABC::AddressBook is a container for KABC::Addressee objects
+The Management Layer consists of the two classes TDEABC::AddressBook and
+TDEABC::Addressee. TDEABC::AddressBook is a container for TDEABC::Addressee objects
 and provides 2 kinds of access methods.
 1) Iterators
     With iterators you can iterate over each of the contacts of the
@@ -55,13 +55,13 @@ and provides 2 kinds of access methods.
     With search functions you can search for contacts with special attributes
     such as "all contacts with the name 'Harald'"
 
-The class KABC::Addressee represents a single contact and contains all data
+The class TDEABC::Addressee represents a single contact and contains all data
 a vCard could store (as specified in RFC 2426).
 
 The Storage Layer
 ------------------
-The Storage Layer consists of the class KABC::Resource and its derived classes.
-These classes are used by KABC::AddressBook to load and store the contacts to
+The Storage Layer consists of the class TDEABC::Resource and its derived classes.
+These classes are used by TDEABC::AddressBook to load and store the contacts to
 the single backends.
 At the moment libkabc provides 4 types of resources:
 1) ResourceFile
@@ -79,7 +79,7 @@ At the moment libkabc provides 4 types of resources:
     FTP, Fish, WebDAV, POP3, IMAP or whatever the KIO frame work supports
 
 In general the developer does not have to take how to save the single contacts.
-He just has to plug one of the above mentioned resources into KABC::AddressBook
+He just has to plug one of the above mentioned resources into TDEABC::AddressBook
 and perform a save action.
 
 Examples
@@ -88,27 +88,27 @@ Like a picture, C/C++ code is worth a 1000 words I'd like to give you a
 lot of examples now, how to use libkabc for several tasks:
 
 
-Using KABC::StdAddressBook and Iterators
+Using TDEABC::StdAddressBook and Iterators
 -----------------------------------------
 Normally you have to plugin the resources manually into the addressbook object
 and call the load() function before you can access the contacts, but there is
-a special class KABC::StdAddressBook, which loads all resources of the standard
+a special class TDEABC::StdAddressBook, which loads all resources of the standard
 address book of the user automatically. You can use it the following way:
 
 
      #include <tdeabc/stdaddressbook.h>
 
- 1:  KABC::AddressBook *ab = KABC::StdAddressBook::self();
- 2:  KABC::AddressBook::Iterator it;
+ 1:  TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self();
+ 2:  TDEABC::AddressBook::Iterator it;
  3:  for ( it = ab->begin(); it != ab->end(); ++it ) {
- 4:    KABC::Addressee addr = (*it);
+ 4:    TDEABC::Addressee addr = (*it);
  5:
  6:    kdDebug() << "Name = " << addr.formattedName() << endl;
  7:  }
 
 The above example prints out the names of all the contacts in the user's address
 book. In line 1 you retrieve a pointer to the user's standard address book
-(provided by KABC::StdAddressBook via a singleton design pattern).
+(provided by TDEABC::StdAddressBook via a singleton design pattern).
 In line 2 an iterator is defined, which is used in line 3 to iterate over the
 whole address book. The assignment in line 4 is intended only to show more
 clearly how iterators function.
@@ -117,21 +117,21 @@ of the current contact is printed out to stderr.
 As you can see that's all magic, and it's quite easy ;)
 
 
-Using KABC::AddressBook manually
+Using TDEABC::AddressBook manually
 ---------------------------------
 In some cases you don't want to load the user's standard address book, but,
 for example, just a single vCard. For this purpose you have to use the
-class KABC::AddressBook and handle the resource stuff manually.
+class TDEABC::AddressBook and handle the resource stuff manually.
 The following code will create a file resource and save a contact into it:
 
 
      #include <tdeabc/addressbook.h>
      #include <tdeabc/resourcefile.h>
 
- 1:  KABC::AddressBook ab;
+ 1:  TDEABC::AddressBook ab;
  2:
  3:  // create a file resource
- 4:  KABC::Resource *res = new KABC::ResourceFile( "/home/user/myvcard.vcf", "vcard" );
+ 4:  TDEABC::Resource *res = new TDEABC::ResourceFile( "/home/user/myvcard.vcf", "vcard" );
  5:
  6:  if ( !ab.addResource( res ) ) {
  7:    kdDebug() << "Unable to open resource" << endl;
@@ -143,18 +143,18 @@ The following code will create a file resource and save a contact into it:
 13:    return 2;
 14:  }
 15:
-16:  KABC::Addressee addr;
+16:  TDEABC::Addressee addr;
 17:  addr.setNameFromString( "Otto Harald Meyer" );
 18:  addr.setBirthday( QDate( 1982, 07, 19 ) );
 19:  addr.setNickName( "otto" );
 20:  addr.setMailer( "kmail" );
 21:
 22:  // TZ
-23:  KABC::TimeZone tz( 60 );  // takes time shift in minutes as argument
+23:  TDEABC::TimeZone tz( 60 );  // takes time shift in minutes as argument
 24:  addr.setTimeZone( tz );
 25:
 26:  // GEO
-27:  KABC::Geo geo( 52.5, 13.36 ); // takes latitude and longitude as argument
+27:  TDEABC::Geo geo( 52.5, 13.36 ); // takes latitude and longitude as argument
 28:  addr.setGeo( geo );
 29:
 30:  addr.setTitle( "dude, the" );
@@ -164,11 +164,11 @@ The following code will create a file resource and save a contact into it:
 34:  addr.setUrl( KURL( "http://kaddressbook.org" ) );
 35:
 36:  // CLASS
-37:  KABC::Secrecy secrecy( KABC::Secrecy::Confidential );
+37:  TDEABC::Secrecy secrecy( TDEABC::Secrecy::Confidential );
 38:  addr.setSecrecy( secrecy );
 39:
 40:  // PHOTO or LOGO
-41:  KABC::Picture photo;
+41:  TDEABC::Picture photo;
 42:  QImage img;
 43:  if ( img.load( "face.png", "PNG" ) ) {
 44:    photo.setData( img );
@@ -180,13 +180,13 @@ The following code will create a file resource and save a contact into it:
 50:  addr.insertEmail( "otti@yahoo.com", false );
 51:
 52:  // TEL
-53:  KABC::PhoneNumber phoneHome( "0351 5466738", KABC::PhoneNumber::Home );
-54:  KABC::PhoneNumber phoneWork( "0351 2335411", KABC::PhoneNumber::Work );
+53:  TDEABC::PhoneNumber phoneHome( "0351 5466738", TDEABC::PhoneNumber::Home );
+54:  TDEABC::PhoneNumber phoneWork( "0351 2335411", TDEABC::PhoneNumber::Work );
 55:  addr.insertPhoneNumber( phoneHome );
 56:  addr.insertPhoneNumber( phoneWork );
 57:
 58:  // ADR
-59:  KABC::Address homeAddr( KABC::Address::Home );
+59:  TDEABC::Address homeAddr( TDEABC::Address::Home );
 60:  homeAddr.setStreet( "Milliwaystreet 42" );
 61:  homeAddr.setLocality( "London" );
 62:  homeAddr.setRegion( "Saxony" );
@@ -201,7 +201,7 @@ The following code will create a file resource and save a contact into it:
 71:  ab.insertAddressee( addr ); // will be assigned to the standard resource
 72:                              // automatically
 73:
-74:  KABC::Ticket *ticket = ab.requestSaveTicket( res );
+74:  TDEABC::Ticket *ticket = ab.requestSaveTicket( res );
 75:  if ( !ticket ) {
 76:    kdError() << "Resource is locked by other application!" << endl;
 77:  } else {
@@ -214,8 +214,8 @@ The following code will create a file resource and save a contact into it:
 84:
 85:  return 0;
 
-In line 1 the KABC::AddressBook is created.  In line 4 you creat the
-KABC::ResourceFile (which will handle the loading/saving).
+In line 1 the TDEABC::AddressBook is created.  In line 4 you creat the
+TDEABC::ResourceFile (which will handle the loading/saving).
 The resource takes 2 arguments, the first is the file name and the
 second one the file format. At the moment libkabc supports two file formats:
 1) vCard, as specified in RFC 2426
@@ -229,8 +229,8 @@ as you want.
 In line 11 we try to load all contacts from the backends into the address book.
 As before, it returns whether opening was successful.
 
-In line 16 a KABC::Addressee is created, which we will fill now with data,
-before inserting it into the KABC::AddressBook.
+In line 16 a TDEABC::Addressee is created, which we will fill now with data,
+before inserting it into the TDEABC::AddressBook.
 The setNameFromString() function in the following line takes a string as
 argument and tries to parse it into the single name components such as: given
 name, family name, additional names, honoric prefix and honoric suffix.
@@ -240,34 +240,34 @@ and
   addr.setFamilyName( "Meyer" );
 etc. etc.
 
-In line 23 we use the class KABC::TimeZone to store the timezone. This class
+In line 23 we use the class TDEABC::TimeZone to store the timezone. This class
 takes the time shift in minutes.
 
-In line 27 the KABC::Geo class is used for storing the geographical
+In line 27 the TDEABC::Geo class is used for storing the geographical
 information. The arguments are the latitude and longitude as float values.
 
-KABC::Secrecy in line 37 represents the CLASS entity of a vCard and can take
-KABC::Secrecy::Public, KABC::Secrecy::Private or KABC::Secrecy::Confidential
+TDEABC::Secrecy in line 37 represents the CLASS entity of a vCard and can take
+TDEABC::Secrecy::Public, TDEABC::Secrecy::Private or TDEABC::Secrecy::Confidential
 as argument.
 
-In line 41 we make use of KABC::Picture class to store the photo of the
+In line 41 we make use of TDEABC::Picture class to store the photo of the
 contact. This class can contain either an URL or the raw image data in form
 of a QImage, in this example we use the latter.
 
 In line 43 we try to load the image "face.png" from the local directory and
-assign this QImage to the KABC::Picture class via the setData() function.
+assign this QImage to the TDEABC::Picture class via the setData() function.
 Additionally we set the type of the picture to "image/png".
 
 From 49 - 50 we insert 2 email addresses with the first one as preferred
 (second argument is true).
 
 In 53 and the following 3 lines we add two telephone numbers. For this purpose
-libkabc provides the KABC::PhoneNumber class, which takes the phone number in
+libkabc provides the TDEABC::PhoneNumber class, which takes the phone number in
 string representation as first argument and the type as second. The types can
-be combined, so 'KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax' would be
+be combined, so 'TDEABC::PhoneNumber::Home | TDEABC::PhoneNumber::Fax' would be
 the Home Fax.
 
-In line 59 we create a KABC::Address object and set the single parts in the
+In line 59 we create a TDEABC::Address object and set the single parts in the
 following lines.
 
 In line 67 we assign the contact to a special category.
@@ -279,25 +279,25 @@ The first argument of this function should be the name of the application, so
 the data for each other. The second argument contains the name of the
 custom entry and the third argument the value in string representation.
 
-In line 71 we finally insert the KABC::Addressee object into the
-KABC::AddressBook. Since we have only one resource loaded, the contact is
+In line 71 we finally insert the TDEABC::Addressee object into the
+TDEABC::AddressBook. Since we have only one resource loaded, the contact is
 automatically assigned to this resource. If you have several writeable
 resources loaded, you should ask the user which resource the contact shall
 belong to and assign the selected resource to the contact with
-  KABC::Addressee.setResource( KABC::Resource *resource );
+  TDEABC::Addressee.setResource( TDEABC::Resource *resource );
 before inserting it into the address book.
 
 To prevent multiple access to one resource and possible resulting data loss
 we have to lock the resource before saving our changes.
-For this purpose KABC::AddressBook provides the function
-  requestSaveTicket( KABC::Resource* )
+For this purpose TDEABC::AddressBook provides the function
+  requestSaveTicket( TDEABC::Resource* )
 which takes a pointer to the resource which shall be saved as argument and
 returns a so called 'Save Ticket' if locking succeeded or a null pointer
 if the resource is already locked by another application.
 
 So when we retrieved a valid ticket in line 74, we try to save our changes in
 line 78.
-The KABC::AddressBook::save() function takes the save ticket as argument and
+The TDEABC::AddressBook::save() function takes the save ticket as argument and
 returns whether saving succeeded.  It also releases the save ticket when successful.
 
 Important!
@@ -305,8 +305,8 @@ If the save() call fails, you have to release the save ticket manually, as is
 done in line 80, otherwise possible locks, created by the resources, won't be
 removed.
 
-You can see also, that manual use is quite easy for the KABC::AddressBook class
-and for the ResourceFile. For more information about the API of KABC::Addressee
+You can see also, that manual use is quite easy for the TDEABC::AddressBook class
+and for the ResourceFile. For more information about the API of TDEABC::Addressee
 please take a look at the official API documentation or the header files.
 
 
@@ -315,7 +315,7 @@ Distribution Lists
 libkabc provides so called distribution lists to group contacts. These lists
 just store the uid of contacts, so they can be used for every kind of contact
 grouping. There are 2 classes which handle the whole distribution list tasks,
-KABC::DistributionListManager and KABC::DistributionList. The first one keeps
+TDEABC::DistributionListManager and TDEABC::DistributionList. The first one keeps
 track of all available distribution lists and the latter one is the
 representation of one list.
 
@@ -323,7 +323,7 @@ representation of one list.
      #include <tdeabc/distributionlist.h>
      #include <tdeabc/stdaddressbook.h>
 
- 1:  KABC::DistributionListManager manager( KABC::StdAddressBook::self() );
+ 1:  TDEABC::DistributionListManager manager( TDEABC::StdAddressBook::self() );
  2:
  3:  // load the lists
  4:  manager.load();
@@ -331,7 +331,7 @@ representation of one list.
  6:  QStringList listNames = manager.listNames();
  7:  QStringList::Iterator it;
  8:  for ( it = listNames.begin(); it != listNames.end(); ++it ) {
- 9:    KABC::DistributionList *list = manager.list( *it );
+ 9:    TDEABC::DistributionList *list = manager.list( *it );
 10:    kdDebug() << list->name() << endl;
 11:
 12:    QStringList emails = list->emails();
@@ -340,14 +340,14 @@ representation of one list.
 15:      kdDebug() << QString( "\t%1" ).arg( (*eit).latin1() ) << endl;
 16:  }
 
-In the first line a KABC::DistributionListManager is created. The manager takes
-a pointer to a KABC::AddressBook, because he has to resolve the stored uids to
+In the first line a TDEABC::DistributionListManager is created. The manager takes
+a pointer to a TDEABC::AddressBook, because he has to resolve the stored uids to
 currently available email addresses.
 In line 4 the manager loads all distribution lists from the central config file
 $HOME/.trinity/share/apps/tdeabc/distlists.
 The next line queries the names of all available distribution lists, which are
 used in line 9 to retrieve a pointer to the specific list.
-Now that you have a KABC::DistributionList object, you can performe the
+Now that you have a TDEABC::DistributionList object, you can performe the
 following actions on it:
  - set / get the name
  - insert an entry
@@ -358,14 +358,14 @@ following actions on it:
 In line 12 we query all email addresses of every resource and print them out.
 
 <tdeabc/distributionlist.h> contains also the declaration for the class
-KABC::DistributionListWatcher. This class exists only once per application and
+TDEABC::DistributionListWatcher. This class exists only once per application and
 its only job is to emit a signal as soon as the distribution list file has
 changed. So to make your application aware of changes use the following code:
 
 
      #include <tdeabc/distributionlist.h>
 
- 1:  connect( KABC::DistributionListWatcher::self(), SIGNAL( changed() ),
+ 1:  connect( TDEABC::DistributionListWatcher::self(), SIGNAL( changed() ),
  2:           this, SLOT( slotDistributionListChanged() ) );
 
 You see, as usual, easy ;)
diff --git a/tdeabc/address.cpp b/tdeabc/address.cpp
index 112a70617..e5305f5a0 100644
--- a/tdeabc/address.cpp
+++ b/tdeabc/address.cpp
@@ -29,7 +29,7 @@
 
 #include <tqfile.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 TQMap<TQString, TQString> *Address::mISOMap = 0;
 static KStaticDeleter< TQMap<TQString, TQString> > isoMapDeleter;
@@ -572,7 +572,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
   return ISOname;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Address &addr )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Address &addr )
 {
     return s << addr.mId << addr.mType << addr.mPostOfficeBox <<
 	    addr.mExtended << addr.mStreet << addr.mLocality <<
@@ -580,7 +580,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Address &addr )
 	    addr.mLabel;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Address &addr )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Address &addr )
 {
     s >> addr.mId >> addr.mType >> addr.mPostOfficeBox >> addr.mExtended >>
 	    addr.mStreet >> addr.mLocality >> addr.mRegion >>
diff --git a/tdeabc/address.h b/tdeabc/address.h
index b4165a098..796be25a0 100644
--- a/tdeabc/address.h
+++ b/tdeabc/address.h
@@ -45,7 +45,7 @@
 #define KABC_FMTTAG_condwhite  TQString("%w")
 #define KABC_FMTTAG_purgeempty TQString("%0")
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Postal address information.
diff --git a/tdeabc/addressbook.cpp b/tdeabc/addressbook.cpp
index 50cd9c8a6..3a8a71f2b 100644
--- a/tdeabc/addressbook.cpp
+++ b/tdeabc/addressbook.cpp
@@ -35,7 +35,7 @@
 #include "addressbook.h"
 #include "addressbook.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 struct AddressBook::AddressBookData
 {
@@ -685,14 +685,14 @@ bool AddressBook::addCustomField( const TQString &label, int category,
   return true;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const AddressBook &ab )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const AddressBook &ab )
 {
   if (!ab.d) return s;
 
   return s;// << ab.d->mAddressees;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, AddressBook &ab )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, AddressBook &ab )
 {
   if (!ab.d) return s;
 
diff --git a/tdeabc/addressbook.h b/tdeabc/addressbook.h
index 8b87b6898..09d18d6bb 100644
--- a/tdeabc/addressbook.h
+++ b/tdeabc/addressbook.h
@@ -29,7 +29,7 @@
 #include "addressee.h"
 #include "field.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class ErrorHandler;
 class Resource;
diff --git a/tdeabc/addresseedialog.cpp b/tdeabc/addresseedialog.cpp
index 2b8bc91e6..028d178b0 100644
--- a/tdeabc/addresseedialog.cpp
+++ b/tdeabc/addresseedialog.cpp
@@ -31,7 +31,7 @@
 #include "addresseedialog.h"
 #include "addresseedialog.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 AddresseeItem::AddresseeItem( TQListView *parent, const Addressee &addressee ) :
   TQListViewItem( parent ),
diff --git a/tdeabc/addresseedialog.h b/tdeabc/addresseedialog.h
index 74470d1b4..718aa61da 100644
--- a/tdeabc/addresseedialog.h
+++ b/tdeabc/addresseedialog.h
@@ -29,7 +29,7 @@
 
 #include "addressbook.h"
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Special ListViewItem, that is used by the AddresseeDialog.
diff --git a/tdeabc/addresseehelper.cpp b/tdeabc/addresseehelper.cpp
index e8faeb897..f752788dd 100644
--- a/tdeabc/addresseehelper.cpp
+++ b/tdeabc/addresseehelper.cpp
@@ -24,7 +24,7 @@
 
 #include "addresseehelper.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 AddresseeHelper * AddresseeHelper::s_self;
 
@@ -39,11 +39,11 @@ AddresseeHelper *AddresseeHelper::self()
 
 AddresseeHelper::AddresseeHelper()
   : TQObject( tqApp ),
-    DCOPObject( "KABC::AddresseeHelper" )
+    DCOPObject( "TDEABC::AddresseeHelper" )
 {
   initSettings();
 
-  connectDCOPSignal( "kaddressbook", "KABC::AddressBookConfig",
+  connectDCOPSignal( "kaddressbook", "TDEABC::AddressBookConfig",
                      "changed()", "initSettings()", false );
 }
 
diff --git a/tdeabc/addresseehelper.h b/tdeabc/addresseehelper.h
index 5280e6b2d..30617b72b 100644
--- a/tdeabc/addresseehelper.h
+++ b/tdeabc/addresseehelper.h
@@ -31,7 +31,7 @@
   static data, shared by ALL addressee objects
 */
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT AddresseeHelper : public TQObject, public DCOPObject
 {
diff --git a/tdeabc/addresseelist.cpp b/tdeabc/addresseelist.cpp
index 47324001c..4787c65aa 100644
--- a/tdeabc/addresseelist.cpp
+++ b/tdeabc/addresseelist.cpp
@@ -26,7 +26,7 @@
 #include "field.h"
 #include "sortmode.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 //
 //
@@ -230,11 +230,11 @@ void AddresseeList::sortByField( Field *field )
   if ( count() == 0 )
     return;
 
-  KABC::FieldSortMode *mode = new KABC::FieldSortMode( sActiveField, !mReverseSorting );
+  TDEABC::FieldSortMode *mode = new TDEABC::FieldSortMode( sActiveField, !mReverseSorting );
 
-  KABC::Addressee::setSortMode( mode );
+  TDEABC::Addressee::setSortMode( mode );
   qHeapSort( *this );
-  KABC::Addressee::setSortMode( 0 );
+  TDEABC::Addressee::setSortMode( 0 );
 
   delete mode;
 }
@@ -244,9 +244,9 @@ void AddresseeList::sortByMode( SortMode *mode )
   if ( count() == 0 )
     return;
 
-  KABC::Addressee::setSortMode( mode );
+  TDEABC::Addressee::setSortMode( mode );
   qHeapSort( *this );
-  KABC::Addressee::setSortMode( 0 );
+  TDEABC::Addressee::setSortMode( 0 );
 }
 
 Field*
diff --git a/tdeabc/addresseelist.h b/tdeabc/addresseelist.h
index 7c9df0275..bebe0a460 100644
--- a/tdeabc/addresseelist.h
+++ b/tdeabc/addresseelist.h
@@ -26,7 +26,7 @@
 
 #include "addressee.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class Field;
 class SortField;
@@ -178,9 +178,9 @@ class KABC_EXPORT AddresseeList : public TQValueList<Addressee>
      * class MySortingTrait {
      *   public:
      *     // eq returns true if a1 and a2 are equal
-     *     static bool eq(KABC::Addressee a1, KABC::Addressee a2);
+     *     static bool eq(TDEABC::Addressee a1, TDEABC::Addressee a2);
      *     // lt returns true is a1 is "less than" a2
-     *     static bool lt(KABC::Addressee a1, KABC::Addressee a2);
+     *     static bool lt(TDEABC::Addressee a1, TDEABC::Addressee a2);
      * };
      * \endcode
      * You can then pass this class to the sortByTrait method like this:
diff --git a/tdeabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp
index dc7a889a1..8194f8ca3 100644
--- a/tdeabc/addresslineedit.cpp
+++ b/tdeabc/addresslineedit.cpp
@@ -53,7 +53,7 @@
 //=============================================================================
 
 
-using namespace KABC;
+using namespace TDEABC;
 
 TDECompletion * AddressLineEdit::s_completion = 0L;
 bool AddressLineEdit::s_addressesDirty = false;
@@ -559,8 +559,8 @@ TQStringList AddressLineEdit::addresses()
   TQString endQuote("\" ");
   TQString addr, email;
 
-  KABC::AddressBook *addressBook = KABC::StdAddressBook::self();
-  KABC::AddressBook::Iterator it;
+  TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self();
+  TDEABC::AddressBook::Iterator it;
   for( it = addressBook->begin(); it != addressBook->end(); ++it ) {
     TQStringList emails = (*it).emails();
     
@@ -598,7 +598,7 @@ TQStringList AddressLineEdit::addresses()
     }
   }
   
-  KABC::DistributionListManager manager( addressBook );
+  TDEABC::DistributionListManager manager( addressBook );
   manager.load();
   result += manager.listNames();
 
diff --git a/tdeabc/addresslineedit.h b/tdeabc/addresslineedit.h
index f81ffbfe4..ee10b5bbd 100644
--- a/tdeabc/addresslineedit.h
+++ b/tdeabc/addresslineedit.h
@@ -32,7 +32,7 @@
 
 class TDEConfig;
 
-namespace KABC {
+namespace TDEABC {
 
 class LdapSearch;
 
diff --git a/tdeabc/agent.cpp b/tdeabc/agent.cpp
index 571b7803e..2b2747697 100644
--- a/tdeabc/agent.cpp
+++ b/tdeabc/agent.cpp
@@ -22,7 +22,7 @@
 
 #include "agent.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Agent::Agent()
   : mAddressee( 0 ), mIntern( false )
@@ -122,7 +122,7 @@ TQString Agent::asString() const
     return mUrl;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Agent &agent )
 {
   TQ_UINT32 hasAddressee = ( agent.mAddressee != 0 );
 
@@ -133,7 +133,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Agent &agent )
   return s;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Agent &agent )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Agent &agent )
 {
   TQ_UINT32 hasAddressee;
 
diff --git a/tdeabc/agent.h b/tdeabc/agent.h
index dbe048f08..b982456c5 100644
--- a/tdeabc/agent.h
+++ b/tdeabc/agent.h
@@ -27,7 +27,7 @@ class TQDataStream;
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class Addressee;
 
diff --git a/tdeabc/distributionlist.cpp b/tdeabc/distributionlist.cpp
index ee058ecdf..e811c4d65 100644
--- a/tdeabc/distributionlist.cpp
+++ b/tdeabc/distributionlist.cpp
@@ -28,7 +28,7 @@
 
 #include "distributionlist.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 DistributionList::DistributionList( DistributionListManager *manager,
                                     const TQString &name ) :
diff --git a/tdeabc/distributionlist.h b/tdeabc/distributionlist.h
index 78d182467..0c2bdf0bd 100644
--- a/tdeabc/distributionlist.h
+++ b/tdeabc/distributionlist.h
@@ -25,7 +25,7 @@
 
 #include "addressbook.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class DistributionListManager;
 
@@ -180,7 +180,7 @@ class KABC_EXPORT DistributionListManager
   Exapmle:
 
   \code
-  KABC::DistributionListWatcher *watchdog = KABC::DistributionListWatcher::self()
+  TDEABC::DistributionListWatcher *watchdog = TDEABC::DistributionListWatcher::self()
 
   connect( watchdog, TQT_SIGNAL( changed() ), TQT_SLOT( doSomething() ) );
   \endcode
diff --git a/tdeabc/distributionlistdialog.cpp b/tdeabc/distributionlistdialog.cpp
index 8cd22e8fd..c440fcb4c 100644
--- a/tdeabc/distributionlistdialog.cpp
+++ b/tdeabc/distributionlistdialog.cpp
@@ -38,7 +38,7 @@
 #include "distributionlistdialog.h"
 #include "distributionlistdialog.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 DistributionListDialog::DistributionListDialog( AddressBook *addressBook, TQWidget *parent)
     : KDialogBase( parent, "", true, i18n("Configure Distribution Lists"), Ok, Ok, true)
diff --git a/tdeabc/distributionlistdialog.h b/tdeabc/distributionlistdialog.h
index 1bd6fc788..d4286a54b 100644
--- a/tdeabc/distributionlistdialog.h
+++ b/tdeabc/distributionlistdialog.h
@@ -29,7 +29,7 @@ class TQListView;
 class TQComboBox;
 class TQButtonGroup;
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class DistributionListEditorWidget;
@@ -46,8 +46,8 @@ class DistributionListManager;
   Example:
  
   \code
-  KABC::DistributionListDialog *dlg = new
-          KABC::DistributionListDialog( KABC::StdAddressBook::self(), this );
+  TDEABC::DistributionListDialog *dlg = new
+          TDEABC::DistributionListDialog( TDEABC::StdAddressBook::self(), this );
  
   dlg->exec();
   \endcode
diff --git a/tdeabc/distributionlisteditor.cpp b/tdeabc/distributionlisteditor.cpp
index 5c26c8121..76fd35568 100644
--- a/tdeabc/distributionlisteditor.cpp
+++ b/tdeabc/distributionlisteditor.cpp
@@ -36,7 +36,7 @@
 #include "distributionlisteditor.h"
 #include "distributionlisteditor.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString &current,
                                       TQWidget *parent ) :
diff --git a/tdeabc/distributionlisteditor.h b/tdeabc/distributionlisteditor.h
index faec280e6..6da6495f8 100644
--- a/tdeabc/distributionlisteditor.h
+++ b/tdeabc/distributionlisteditor.h
@@ -28,7 +28,7 @@ class TQListView;
 class TQComboBox;
 class TQButtonGroup;
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class DistributionListManager;
diff --git a/tdeabc/errorhandler.cpp b/tdeabc/errorhandler.cpp
index d2245e44f..3208b84c9 100644
--- a/tdeabc/errorhandler.cpp
+++ b/tdeabc/errorhandler.cpp
@@ -28,7 +28,7 @@
 
 #include "errorhandler.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 void ConsoleErrorHandler::error( const TQString &msg )
 {
diff --git a/tdeabc/errorhandler.h b/tdeabc/errorhandler.h
index 9a316541d..d3d3f253d 100644
--- a/tdeabc/errorhandler.h
+++ b/tdeabc/errorhandler.h
@@ -28,7 +28,7 @@
 
 class TQWidget;
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   Abstract class that provides displaying of error messages.
diff --git a/tdeabc/field.h b/tdeabc/field.h
index 118ce2d51..08322ecf5 100644
--- a/tdeabc/field.h
+++ b/tdeabc/field.h
@@ -28,7 +28,7 @@
 
 class TDEConfig;
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT Field
 {
@@ -78,18 +78,18 @@ public:
    * Addressee. Returns TQString::null, if it is not possible to convert the
    * value to a string.
    */
-  virtual TQString value( const KABC::Addressee & );
+  virtual TQString value( const TDEABC::Addressee & );
 
   /**
    * Sets the value of the field in the given Addressee. Returns true on success
    * or false, if the given string couldn't be converted to a valid value.
    */
-  virtual bool setValue( KABC::Addressee &, const TQString & );
+  virtual bool setValue( TDEABC::Addressee &, const TQString & );
 
   /**
    * Returns a string, that can be used for sorting.
    */
-  TQString sortKey( const KABC::Addressee & );
+  TQString sortKey( const TDEABC::Addressee & );
 
   /**
    * Returns, if the field is a user-defined field.
diff --git a/tdeabc/format.h b/tdeabc/format.h
index ed036673c..77c2edcc5 100644
--- a/tdeabc/format.h
+++ b/tdeabc/format.h
@@ -24,7 +24,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 
diff --git a/tdeabc/formatfactory.cpp b/tdeabc/formatfactory.cpp
index 0795957a2..4839acc4d 100644
--- a/tdeabc/formatfactory.cpp
+++ b/tdeabc/formatfactory.cpp
@@ -30,7 +30,7 @@
 
 #include "formatfactory.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 FormatFactory *FormatFactory::mSelf = 0;
 static KStaticDeleter<FormatFactory> factoryDeleter;
diff --git a/tdeabc/formatfactory.h b/tdeabc/formatfactory.h
index ff9da5504..0994fe109 100644
--- a/tdeabc/formatfactory.h
+++ b/tdeabc/formatfactory.h
@@ -29,7 +29,7 @@
 
 #include "formatplugin.h"
 
-namespace KABC {
+namespace TDEABC {
 
 struct FormatInfo
 {
@@ -44,12 +44,12 @@ struct FormatInfo
  * Example:
  *
  * \code
- * KABC::FormatFactory *factory = KABC::FormatFactory::self();
+ * TDEABC::FormatFactory *factory = TDEABC::FormatFactory::self();
  *
  * TQStringList list = factory->formats();
  * TQStringList::Iterator it;
  * for ( it = list.begin(); it != list.end(); ++it ) {
- *   KABC::FormatPlugin *format = factory->format( (*it) );
+ *   TDEABC::FormatPlugin *format = factory->format( (*it) );
  *   // do something with format
  * }
  * \endcode
diff --git a/tdeabc/formatplugin.h b/tdeabc/formatplugin.h
index 33f4beea0..c6fb59858 100644
--- a/tdeabc/formatplugin.h
+++ b/tdeabc/formatplugin.h
@@ -26,7 +26,7 @@
 #include "plugin.h"
 #include "resource.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class Addressee;
diff --git a/tdeabc/formats/Makefile.am b/tdeabc/formats/Makefile.am
index 7e425bb7d..e96ff8203 100644
--- a/tdeabc/formats/Makefile.am
+++ b/tdeabc/formats/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = tdeabcformat_binary.la
 tdeabcformat_binary_la_SOURCES = binaryformat.cpp
 tdeabcformat_binary_la_LDFLAGS =  -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                                 -no-undefined
-tdeabcformat_binary_la_LIBADD  = $(LIB_KABC) $(LIB_QT) $(LIB_TDECORE)
+tdeabcformat_binary_la_LIBADD  = $(LIB_TDEABC) $(LIB_QT) $(LIB_TDECORE)
 tdeabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 # these are the headers for your project
diff --git a/tdeabc/formats/binaryformat.cpp b/tdeabc/formats/binaryformat.cpp
index f37146e57..15dbec8a8 100644
--- a/tdeabc/formats/binaryformat.cpp
+++ b/tdeabc/formats/binaryformat.cpp
@@ -34,7 +34,7 @@
 
 #define BINARY_FORMAT_VERSION 1
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
diff --git a/tdeabc/formats/binaryformat.h b/tdeabc/formats/binaryformat.h
index 09efde41a..faf6c8e5a 100644
--- a/tdeabc/formats/binaryformat.h
+++ b/tdeabc/formats/binaryformat.h
@@ -22,7 +22,7 @@
 
 #include "formatplugin.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class Addressee;
diff --git a/tdeabc/geo.cpp b/tdeabc/geo.cpp
index 44f9851e4..9883595a4 100644
--- a/tdeabc/geo.cpp
+++ b/tdeabc/geo.cpp
@@ -22,7 +22,7 @@
 
 #include "geo.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Geo::Geo()
   : mLatitude( 91 ), mLongitude( 181 ), mValidLat( false ), mValidLong( false )
@@ -93,12 +93,12 @@ TQString Geo::asString() const
   return "(" + TQString::number(mLatitude) + "," + TQString::number(mLongitude) + ")";
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Geo &geo )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Geo &geo )
 {
     return s << (float)geo.mLatitude << (float)geo.mLongitude;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Geo &geo )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Geo &geo )
 {
     s >> geo.mLatitude >> geo.mLongitude;
 
diff --git a/tdeabc/geo.h b/tdeabc/geo.h
index cac6abaff..55cf18680 100644
--- a/tdeabc/geo.h
+++ b/tdeabc/geo.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Geographic position
diff --git a/tdeabc/key.cpp b/tdeabc/key.cpp
index 08d9c6872..d4456f516 100644
--- a/tdeabc/key.cpp
+++ b/tdeabc/key.cpp
@@ -23,7 +23,7 @@
 
 #include "key.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Key::Key( const TQString &text, int type )
   : mTextData( text ), mIsBinary( false ), mType( type )
@@ -138,13 +138,13 @@ TQString Key::typeLabel( int type )
   }
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Key &key )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Key &key )
 {
     return s << key.mId << key.mIsBinary << key.mTextData << key.mBinaryData <<
              key.mCustomTypeString << key.mType;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Key &key )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Key &key )
 {
     s >> key.mId >> key.mIsBinary >> key.mTextData >> key.mBinaryData >>
     key.mCustomTypeString >> key.mType;
diff --git a/tdeabc/key.h b/tdeabc/key.h
index 08df0264d..94d1a28b3 100644
--- a/tdeabc/key.h
+++ b/tdeabc/key.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
  * @short A class to store an encryption key.
diff --git a/tdeabc/ldapclient.cpp b/tdeabc/ldapclient.cpp
index 1c2b2d833..31256f46f 100644
--- a/tdeabc/ldapclient.cpp
+++ b/tdeabc/ldapclient.cpp
@@ -39,7 +39,7 @@
 #include "ldif.h"
 #include "ldapurl.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 class LdapClient::LdapClientPrivate{
 public:
@@ -285,8 +285,8 @@ LdapSearch::LdapSearch()
       attrs << "cn" << "mail" << "givenname" << "sn";
       ldapClient->setAttrs( attrs );
 
-      connect( ldapClient, TQT_SIGNAL( result( const KABC::LdapObject& ) ),
-               this, TQT_SLOT( slotLDAPResult( const KABC::LdapObject& ) ) );
+      connect( ldapClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
+               this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
       connect( ldapClient, TQT_SIGNAL( done() ),
                this, TQT_SLOT( slotLDAPDone() ) );
       connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ),
@@ -338,7 +338,7 @@ void LdapSearch::cancelSearch()
   mResults.clear();
 }
 
-void LdapSearch::slotLDAPResult( const KABC::LdapObject& obj )
+void LdapSearch::slotLDAPResult( const TDEABC::LdapObject& obj )
 {
   mResults.append( obj );
   if ( !mDataTimer.isActive() )
@@ -381,7 +381,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
 {
   TQString search_text_upper = mSearchText.upper();
 
-  TQValueList< KABC::LdapObject >::ConstIterator it1;
+  TQValueList< TDEABC::LdapObject >::ConstIterator it1;
   for ( it1 = mResults.begin(); it1 != mResults.end(); ++it1 ) {
     TQString name, mail, givenname, sn;
 
diff --git a/tdeabc/ldapclient.h b/tdeabc/ldapclient.h
index f43a644ce..a4a5747a6 100644
--- a/tdeabc/ldapclient.h
+++ b/tdeabc/ldapclient.h
@@ -33,7 +33,7 @@
 
 #include <tdeio/job.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class LdapClient;
 typedef TQValueList<TQByteArray> LdapAttrValue;
@@ -103,7 +103,7 @@ class KABC_EXPORT LdapClient : public TQObject
     /*! Emitted once for each object returned
      * from the query
      */
-    void result( const KABC::LdapObject& );
+    void result( const TDEABC::LdapObject& );
 
   public slots:
     /*!
@@ -221,11 +221,11 @@ class KABC_EXPORT LdapSearch : public TQObject
     void searchData( const TQStringList& );
     /// Another form for the results, with separate fields
     /// (This signal can be emitted many times)
-    void searchData( const KABC::LdapResultList& );
+    void searchData( const TDEABC::LdapResultList& );
     void searchDone();
 
   private slots:
-    void slotLDAPResult( const KABC::LdapObject& );
+    void slotLDAPResult( const TDEABC::LdapObject& );
     void slotLDAPError( const TQString& );
     void slotLDAPDone();
     void slotDataTimer();
diff --git a/tdeabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp
index fa092754e..6e339cb2c 100644
--- a/tdeabc/ldapconfigwidget.cpp
+++ b/tdeabc/ldapconfigwidget.cpp
@@ -42,7 +42,7 @@
 #include "ldapconfigwidget.h"
 #include "ldapconfigwidget.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 LdapConfigWidget::LdapConfigWidget( TQWidget* parent,
   const char* name, WFlags fl ) : TQWidget( parent, name, fl )
diff --git a/tdeabc/ldapconfigwidget.h b/tdeabc/ldapconfigwidget.h
index 7071bce10..662534fd6 100644
--- a/tdeabc/ldapconfigwidget.h
+++ b/tdeabc/ldapconfigwidget.h
@@ -38,7 +38,7 @@ class KComboBox;
 class KLineEdit;
 class KProgressDialog;
 
-namespace KABC {
+namespace TDEABC {
 
   /**
     @short LDAP Configuration widget
@@ -252,7 +252,7 @@ namespace KABC {
        * Returns a LDAP Url constructed from the settings given.
        * Extensions are filled for use in the LDAP ioslave
        */
-      KABC::LDAPUrl url() const;
+      TDEABC::LDAPUrl url() const;
 
     private slots:
       void setLDAPPort();
diff --git a/tdeabc/ldapurl.cpp b/tdeabc/ldapurl.cpp
index 9032c16d3..95363efaf 100644
--- a/tdeabc/ldapurl.cpp
+++ b/tdeabc/ldapurl.cpp
@@ -24,7 +24,7 @@
 
 #include "ldapurl.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 LDAPUrl::LDAPUrl()
 {
diff --git a/tdeabc/ldapurl.h b/tdeabc/ldapurl.h
index 0c2693758..f86c8a466 100644
--- a/tdeabc/ldapurl.h
+++ b/tdeabc/ldapurl.h
@@ -27,7 +27,7 @@
 
 #include <kurl.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
  * LDAPUrl
diff --git a/tdeabc/ldif.cpp b/tdeabc/ldif.cpp
index 408f5223f..a40f5a818 100644
--- a/tdeabc/ldif.cpp
+++ b/tdeabc/ldif.cpp
@@ -23,7 +23,7 @@
 
 #include "ldif.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 LDIF::LDIF()
 {
diff --git a/tdeabc/ldif.h b/tdeabc/ldif.h
index f4da5f4f3..6cbc536e8 100644
--- a/tdeabc/ldif.h
+++ b/tdeabc/ldif.h
@@ -27,7 +27,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
   /**
    * LDIF
diff --git a/tdeabc/ldifconverter.cpp b/tdeabc/ldifconverter.cpp
index dcab83a40..8338f5ba0 100644
--- a/tdeabc/ldifconverter.cpp
+++ b/tdeabc/ldifconverter.cpp
@@ -49,7 +49,7 @@
 #include "ldifconverter.h"
 #include "vcardconverter.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 /* generate LDIF stream */
 
diff --git a/tdeabc/ldifconverter.h b/tdeabc/ldifconverter.h
index a8052a65f..8788136b3 100644
--- a/tdeabc/ldifconverter.h
+++ b/tdeabc/ldifconverter.h
@@ -26,7 +26,7 @@
 #include "addressee.h"
 #include "addresseelist.h"
 
-namespace KABC {
+namespace TDEABC {
 
   /**
    * A set of functions to convert a string with LDIF information to addressees 
diff --git a/tdeabc/lock.cpp b/tdeabc/lock.cpp
index a78cb4c5b..782b60afa 100644
--- a/tdeabc/lock.cpp
+++ b/tdeabc/lock.cpp
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 Lock::Lock( const TQString &identifier )
   : mIdentifier( identifier )
diff --git a/tdeabc/lock.h b/tdeabc/lock.h
index addc2032f..0b4c2ffe0 100644
--- a/tdeabc/lock.h
+++ b/tdeabc/lock.h
@@ -26,7 +26,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   This class provides locking functionality for a file, directory or an
diff --git a/tdeabc/locknull.cpp b/tdeabc/locknull.cpp
index 5f3ee06c7..c38bda0ce 100644
--- a/tdeabc/locknull.cpp
+++ b/tdeabc/locknull.cpp
@@ -24,7 +24,7 @@
 #include <tdelocale.h>
 #include <kdebug.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 LockNull::LockNull( bool allowAccess )
   : Lock( TQString::null ), mAllowAccess( allowAccess )
diff --git a/tdeabc/locknull.h b/tdeabc/locknull.h
index dfefe122a..fdc6e9aab 100644
--- a/tdeabc/locknull.h
+++ b/tdeabc/locknull.h
@@ -25,7 +25,7 @@
 
 #include "lock.h"
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   This class provides a lock without actually locking. It can be constructed in
diff --git a/tdeabc/phonenumber.cpp b/tdeabc/phonenumber.cpp
index fd2468c73..f6022052c 100644
--- a/tdeabc/phonenumber.cpp
+++ b/tdeabc/phonenumber.cpp
@@ -23,7 +23,7 @@
 
 #include "phonenumber.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 PhoneNumber::PhoneNumber() :
   mType( Home )
@@ -200,12 +200,12 @@ TQString PhoneNumber::typeLabel( int type )
   }
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const PhoneNumber &phone )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const PhoneNumber &phone )
 {
     return s << phone.mId << phone.mType << phone.mNumber;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, PhoneNumber &phone )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, PhoneNumber &phone )
 {
     s >> phone.mId >> phone.mType >> phone.mNumber;
 
diff --git a/tdeabc/phonenumber.h b/tdeabc/phonenumber.h
index 3e6ae0941..737f57ff8 100644
--- a/tdeabc/phonenumber.h
+++ b/tdeabc/phonenumber.h
@@ -26,7 +26,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Phonenumber information.
diff --git a/tdeabc/picture.cpp b/tdeabc/picture.cpp
index 4ddd3f537..057be604c 100644
--- a/tdeabc/picture.cpp
+++ b/tdeabc/picture.cpp
@@ -20,7 +20,7 @@
 
 #include "picture.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Picture::Picture()
   : mIntern( false )
@@ -106,13 +106,13 @@ TQString Picture::asString() const
     return mUrl;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Picture &picture )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Picture &picture )
 {
   return s << picture.mIntern << picture.mUrl << picture.mType;
 //  return s << picture.mIntern << picture.mUrl << picture.mType << picture.mData;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Picture &picture )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Picture &picture )
 {
   s >> picture.mIntern >> picture.mUrl >> picture.mType;
 //  s >> picture.mIntern >> picture.mUrl >> picture.mType >> picture.mData;
diff --git a/tdeabc/picture.h b/tdeabc/picture.h
index e6ed690c2..ca8f086ed 100644
--- a/tdeabc/picture.h
+++ b/tdeabc/picture.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT Picture
 {
diff --git a/tdeabc/plugin.cpp b/tdeabc/plugin.cpp
index a53192559..9c1453bc5 100644
--- a/tdeabc/plugin.cpp
+++ b/tdeabc/plugin.cpp
@@ -20,7 +20,7 @@
 
 #include "plugin.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Plugin::Plugin()
 {
diff --git a/tdeabc/plugin.h b/tdeabc/plugin.h
index 0c8e3b338..b242e5a8c 100644
--- a/tdeabc/plugin.h
+++ b/tdeabc/plugin.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT Plugin
 {
diff --git a/tdeabc/plugins/dir/Makefile.am b/tdeabc/plugins/dir/Makefile.am
index 39e8a7af4..d054bbaf9 100644
--- a/tdeabc/plugins/dir/Makefile.am
+++ b/tdeabc/plugins/dir/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = resourcedirconfig.h
 lib_LTLIBRARIES = libtdeabc_dir.la
 libtdeabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
 libtdeabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
-libtdeabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
+libtdeabc_dir_la_LIBADD = $(LIB_TDEABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
 libtdeabc_dir_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 kde_module_LTLIBRARIES = tdeabc_dir.la
diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp
index 4d0ff54ef..eaf774066 100644
--- a/tdeabc/plugins/dir/resourcedir.cpp
+++ b/tdeabc/plugins/dir/resourcedir.cpp
@@ -45,7 +45,7 @@
 
 #include "resourcedir.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
diff --git a/tdeabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h
index dc3bdbd23..035b8a6ae 100644
--- a/tdeabc/plugins/dir/resourcedir.h
+++ b/tdeabc/plugins/dir/resourcedir.h
@@ -30,7 +30,7 @@
 
 class TQTimer;
 
-namespace KABC {
+namespace TDEABC {
 
 class FormatPlugin;
 class Lock;
@@ -82,7 +82,7 @@ class KABC_EXPORT ResourceDir : public Resource
   
     /**
       Remove a addressee from its source.
-      This method is mainly called by KABC::AddressBook.
+      This method is mainly called by TDEABC::AddressBook.
      */
     virtual void removeAddressee( const Addressee& addr );
 
diff --git a/tdeabc/plugins/dir/resourcedirconfig.cpp b/tdeabc/plugins/dir/resourcedirconfig.cpp
index 2807872f8..212ef6156 100644
--- a/tdeabc/plugins/dir/resourcedirconfig.cpp
+++ b/tdeabc/plugins/dir/resourcedirconfig.cpp
@@ -32,7 +32,7 @@
 
 #include "resourcedirconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceDirConfig::ResourceDirConfig( TQWidget* parent,  const char* name )
     : KRES::ConfigWidget( parent, name )
@@ -86,7 +86,7 @@ void ResourceDirConfig::loadSettings( KRES::Resource *res )
 
   mFileNameEdit->setURL( resource->path() );
   if ( mFileNameEdit->url().isEmpty() )
-    mFileNameEdit->setURL( KABC::StdAddressBook::directoryName() );
+    mFileNameEdit->setURL( TDEABC::StdAddressBook::directoryName() );
 }
 
 void ResourceDirConfig::saveSettings( KRES::Resource *res )
diff --git a/tdeabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h
index 9df1778d3..98efd76d0 100644
--- a/tdeabc/plugins/dir/resourcedirconfig.h
+++ b/tdeabc/plugins/dir/resourcedirconfig.h
@@ -26,7 +26,7 @@
 
 #include <tderesources/configwidget.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT ResourceDirConfig : public KRES::ConfigWidget
 { 
diff --git a/tdeabc/plugins/dir/resourcedirplugin.cpp b/tdeabc/plugins/dir/resourcedirplugin.cpp
index d789a93f4..5662a7062 100644
--- a/tdeabc/plugins/dir/resourcedirplugin.cpp
+++ b/tdeabc/plugins/dir/resourcedirplugin.cpp
@@ -21,7 +21,7 @@
 #include "resourcedir.h"
 #include "resourcedirconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
diff --git a/tdeabc/plugins/evolution/resourceevo.cpp b/tdeabc/plugins/evolution/resourceevo.cpp
index 75de2ea82..a5df5fe18 100644
--- a/tdeabc/plugins/evolution/resourceevo.cpp
+++ b/tdeabc/plugins/evolution/resourceevo.cpp
@@ -12,7 +12,7 @@
 #include "resourceevo.h"
 
 using namespace Evolution;
-using namespace KABC;
+using namespace TDEABC;
 
 class EvolutionFactory : public KRES::PluginFactoryBase
 {
diff --git a/tdeabc/plugins/evolution/resourceevo.h b/tdeabc/plugins/evolution/resourceevo.h
index 29e163e1c..82bcab5cb 100644
--- a/tdeabc/plugins/evolution/resourceevo.h
+++ b/tdeabc/plugins/evolution/resourceevo.h
@@ -4,7 +4,7 @@ namespace Evolution {
     class DBWrapper;
 }
 
-namespace KABC {
+namespace TDEABC {
     class ResourceEvolution : public Resource {
     public:
         ResourceEvolution( const TDEConfig* config );
diff --git a/tdeabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am
index 2df682794..475fcd4dc 100644
--- a/tdeabc/plugins/file/Makefile.am
+++ b/tdeabc/plugins/file/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS   = resourcefileconfig.h
 lib_LTLIBRARIES = libtdeabc_file.la
 libtdeabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
 libtdeabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libtdeabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI)
+libtdeabc_file_la_LIBADD = $(LIB_TDEABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI)
 libtdeabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 
diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp
index b29cf33c3..4df5db42c 100644
--- a/tdeabc/plugins/file/resourcefile.cpp
+++ b/tdeabc/plugins/file/resourcefile.cpp
@@ -44,7 +44,7 @@
 
 #include "resourcefile.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceFile::ResourceFile( const TDEConfig *config )
   : Resource( config ), mFormat( 0 ),
diff --git a/tdeabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h
index a77f55798..76652d179 100644
--- a/tdeabc/plugins/file/resourcefile.h
+++ b/tdeabc/plugins/file/resourcefile.h
@@ -28,7 +28,7 @@
 
 #include <tdeabc/resource.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class FormatPlugin;
 class ResourceConfigWidget;
@@ -122,7 +122,7 @@ class KABC_EXPORT ResourceFile : public Resource
 
     /**
       Remove a addressee from its source.
-      This method is mainly called by KABC::AddressBook.
+      This method is mainly called by TDEABC::AddressBook.
      */
     virtual void removeAddressee( const Addressee& addr );
 
diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp
index 7c3f4da15..516a33a61 100644
--- a/tdeabc/plugins/file/resourcefileconfig.cpp
+++ b/tdeabc/plugins/file/resourcefileconfig.cpp
@@ -34,7 +34,7 @@
 
 #include "resourcefileconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceFileConfig::ResourceFileConfig( TQWidget* parent,  const char* name )
     : ConfigWidget( parent, name )
@@ -90,7 +90,7 @@ void ResourceFileConfig::loadSettings( KRES::Resource *res  )
 
   mFileNameEdit->setURL( resource->fileName() );
   if ( mFileNameEdit->url().isEmpty() )
-    mFileNameEdit->setURL( KABC::StdAddressBook::fileName() );
+    mFileNameEdit->setURL( TDEABC::StdAddressBook::fileName() );
 }
 
 void ResourceFileConfig::saveSettings( KRES::Resource *res )
diff --git a/tdeabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h
index 18c217eda..e7b8ca9ea 100644
--- a/tdeabc/plugins/file/resourcefileconfig.h
+++ b/tdeabc/plugins/file/resourcefileconfig.h
@@ -26,7 +26,7 @@
 
 #include <tderesources/configwidget.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT ResourceFileConfig : public KRES::ConfigWidget
 { 
diff --git a/tdeabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp
index 7c5b3359d..5a44f76ca 100644
--- a/tdeabc/plugins/file/resourcefileplugin.cpp
+++ b/tdeabc/plugins/file/resourcefileplugin.cpp
@@ -21,7 +21,7 @@
 #include "resourcefile.h"
 #include "resourcefileconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
diff --git a/tdeabc/plugins/ldaptdeio/Makefile.am b/tdeabc/plugins/ldaptdeio/Makefile.am
index f1e8c57d1..205c412ce 100644
--- a/tdeabc/plugins/ldaptdeio/Makefile.am
+++ b/tdeabc/plugins/ldaptdeio/Makefile.am
@@ -6,7 +6,7 @@ noinst_HEADERS = resourceldaptdeioconfig.h
 lib_LTLIBRARIES = libtdeabc_ldaptdeio.la
 libtdeabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp
 libtdeabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libtdeabc_ldaptdeio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
+libtdeabc_ldaptdeio_la_LIBADD	= $(LIB_TDEABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
 libtdeabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 kde_module_LTLIBRARIES = tdeabc_ldaptdeio.la
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
index ea1a4294c..0e182755a 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
@@ -41,7 +41,7 @@
 #include "resourceldaptdeio.h"
 #include "resourceldaptdeioconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 // Hack from Netaccess
 void tqt_enter_modal( TQWidget *widget );
@@ -659,7 +659,7 @@ void ResourceLDAPTDEIO::data( TDEIO::Job *, const TQByteArray &data )
         } else if ( name == mAttributes[ "uid" ].lower() ) {
           d->mAddr.setUid( TQString::fromUtf8( value, value.size() ) );
         } else if ( name == mAttributes[ "jpegPhoto" ].lower() ) {
-          KABC::Picture photo;
+          TDEABC::Picture photo;
           TQImage img( value );
           if ( !img.isNull() ) {
             photo.setData( img );
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
index bf1b70ec0..051470960 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
@@ -28,7 +28,7 @@
 
 class TDEConfig;
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT ResourceLDAPTDEIO : public Resource
 {
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index a6af7d065..25099414c 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -43,7 +43,7 @@
 #include "resourceldaptdeioconfig.h"
 #include "resourceldaptdeioconfig.moc"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent,  const char* name )
   : KRES::ConfigWidget( parent, name )
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
index 121cf639e..0041946b7 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
@@ -40,7 +40,7 @@ class TQString;
 class KComboBox;
 class KLineEdit;
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget
 { 
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
index 2c4a7d4e0..dcb373b3c 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
@@ -24,7 +24,7 @@
 #include <tdeglobal.h>
 #include <tdelocale.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
diff --git a/tdeabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp
index 5a46890d8..390e84224 100644
--- a/tdeabc/plugins/net/resourcenet.cpp
+++ b/tdeabc/plugins/net/resourcenet.cpp
@@ -35,7 +35,7 @@
 
 #include "resourcenet.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 class ResourceNet::ResourceNetPrivate
 {
diff --git a/tdeabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h
index 49707081e..18a3b715b 100644
--- a/tdeabc/plugins/net/resourcenet.h
+++ b/tdeabc/plugins/net/resourcenet.h
@@ -35,7 +35,7 @@ namespace TDEIO {
 class Job;
 }
 
-namespace KABC {
+namespace TDEABC {
 
 class FormatPlugin;
 
diff --git a/tdeabc/plugins/net/resourcenetconfig.cpp b/tdeabc/plugins/net/resourcenetconfig.cpp
index 8d5903f8b..ab3cddf3e 100644
--- a/tdeabc/plugins/net/resourcenetconfig.cpp
+++ b/tdeabc/plugins/net/resourcenetconfig.cpp
@@ -31,7 +31,7 @@
 
 #include "resourcenetconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceNetConfig::ResourceNetConfig( TQWidget* parent, const char* name )
     : ConfigWidget( parent, name ), mInEditMode( false )
diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h
index 3c8986122..f2ba37800 100644
--- a/tdeabc/plugins/net/resourcenetconfig.h
+++ b/tdeabc/plugins/net/resourcenetconfig.h
@@ -26,7 +26,7 @@
 
 #include <tderesources/configwidget.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget
 { 
diff --git a/tdeabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp
index 51fa507cc..8db397152 100644
--- a/tdeabc/plugins/net/resourcenetplugin.cpp
+++ b/tdeabc/plugins/net/resourcenetplugin.cpp
@@ -21,7 +21,7 @@
 #include "resourcenet.h"
 #include "resourcenetconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
diff --git a/tdeabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp
index bab9b5c06..ed284cdc5 100644
--- a/tdeabc/plugins/sql/resourcesql.cpp
+++ b/tdeabc/plugins/sql/resourcesql.cpp
@@ -29,7 +29,7 @@
 #include "resourcesql.h"
 #include "resourcesqlconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C"
 {
diff --git a/tdeabc/plugins/sql/resourcesql.h b/tdeabc/plugins/sql/resourcesql.h
index 770e5b73b..b7c82e6b0 100644
--- a/tdeabc/plugins/sql/resourcesql.h
+++ b/tdeabc/plugins/sql/resourcesql.h
@@ -28,7 +28,7 @@
 
 class TQSqlDatabase;
 
-namespace KABC {
+namespace TDEABC {
 
 class ResourceSql : public Resource
 {
diff --git a/tdeabc/plugins/sql/resourcesqlconfig.cpp b/tdeabc/plugins/sql/resourcesqlconfig.cpp
index 2f5b9d5b7..34a678aca 100644
--- a/tdeabc/plugins/sql/resourcesqlconfig.cpp
+++ b/tdeabc/plugins/sql/resourcesqlconfig.cpp
@@ -29,7 +29,7 @@
 #include "resource.h"
 #include "resourcesqlconfig.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent,  const char* name )
     : ResourceConfigWidget( parent, name )
@@ -77,7 +77,7 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent,  const char* name )
 void ResourceSqlConfig::loadSettings( TDEConfig *config )
 {
   mUser->setText( config->readEntry( "SqlUser" ) );
-  mPassword->setText( KABC::Resource::cryptStr( config->readEntry( "SqlPassword" ) ) );
+  mPassword->setText( TDEABC::Resource::cryptStr( config->readEntry( "SqlPassword" ) ) );
   mDbName->setText( config->readEntry( "SqlName" ) );
   mHost->setText( config->readEntry( "SqlHost" ) );
   mPort->setValue( config->readNumEntry( "SqlPort" ) );
@@ -86,7 +86,7 @@ void ResourceSqlConfig::loadSettings( TDEConfig *config )
 void ResourceSqlConfig::saveSettings( TDEConfig *config )
 {
   config->writeEntry( "SqlUser", mUser->text() );
-  config->writeEntry( "SqlPassword", KABC::Resource::cryptStr( mPassword->text() ) );
+  config->writeEntry( "SqlPassword", TDEABC::Resource::cryptStr( mPassword->text() ) );
   config->writeEntry( "SqlName", mDbName->text() );
   config->writeEntry( "SqlHost", mHost->text() );
   config->writeEntry( "SqlPort", mPort->value() );
diff --git a/tdeabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h
index ae2de7d6d..f9b2c0a61 100644
--- a/tdeabc/plugins/sql/resourcesqlconfig.h
+++ b/tdeabc/plugins/sql/resourcesqlconfig.h
@@ -26,7 +26,7 @@
 class KLineEdit;
 class TQSpinBox;
 
-namespace KABC {
+namespace TDEABC {
 
 class ResourceSqlConfig : public ResourceConfigWidget
 { 
diff --git a/tdeabc/resource.cpp b/tdeabc/resource.cpp
index 9613d90b5..4128db82c 100644
--- a/tdeabc/resource.cpp
+++ b/tdeabc/resource.cpp
@@ -23,7 +23,7 @@
 
 #include "resource.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Ticket::Ticket( Resource *resource )
   : mResource( resource )
diff --git a/tdeabc/resource.h b/tdeabc/resource.h
index 0f5167e7b..620d9ec47 100644
--- a/tdeabc/resource.h
+++ b/tdeabc/resource.h
@@ -26,7 +26,7 @@
 #include "addressbook.h"
 #include "plugin.h"
 
-namespace KABC {
+namespace TDEABC {
 
 /**
  * @short Helper class for handling coordinated save of address books.
diff --git a/tdeabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp
index 92f770ed4..1b9d1a40d 100644
--- a/tdeabc/resourceselectdialog.cpp
+++ b/tdeabc/resourceselectdialog.cpp
@@ -31,7 +31,7 @@
 
 #include "resourceselectdialog.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, const char *name )
     : KDialog( parent, name, true )
diff --git a/tdeabc/resourceselectdialog.h b/tdeabc/resourceselectdialog.h
index f5f2d6984..5065a3c82 100644
--- a/tdeabc/resourceselectdialog.h
+++ b/tdeabc/resourceselectdialog.h
@@ -28,7 +28,7 @@
 
 class TDEListBox;
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class Resource;
diff --git a/tdeabc/scripts/addressee.src.cpp b/tdeabc/scripts/addressee.src.cpp
index 7514b4a1d..c090f7e4e 100644
--- a/tdeabc/scripts/addressee.src.cpp
+++ b/tdeabc/scripts/addressee.src.cpp
@@ -34,7 +34,7 @@
 
 #include "addressee.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 static bool matchBinaryPattern( int value, int pattern );
 
@@ -42,7 +42,7 @@ template <class L>
 static bool listEquals( const TQValueList<L>&, const TQValueList<L>& );
 static bool emailsEquals( const TQStringList&, const TQStringList& );
 
-KABC::SortMode *Addressee::mSortMode = 0;
+TDEABC::SortMode *Addressee::mSortMode = 0;
 
 struct Addressee::AddresseeData : public TDEShared
 {
@@ -1032,7 +1032,7 @@ bool Addressee::changed() const
   return mData->changed;
 }
 
-void Addressee::setSortMode( KABC::SortMode *mode )
+void Addressee::setSortMode( TDEABC::SortMode *mode )
 {
   mSortMode = mode;
 }
@@ -1045,7 +1045,7 @@ bool Addressee::operator< ( const Addressee &addr )
     return mSortMode->lesser( *this, addr );
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Addressee &a )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Addressee &a )
 {
   if (!a.mData) return s;
 
@@ -1061,7 +1061,7 @@ TQDataStream &KABC::operator<<( TQDataStream &s, const Addressee &a )
   return s;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Addressee &a )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Addressee &a )
 {
   if (!a.mData)
     return s;
diff --git a/tdeabc/scripts/addressee.src.h b/tdeabc/scripts/addressee.src.h
index 9cadfd41e..aa449112e 100644
--- a/tdeabc/scripts/addressee.src.h
+++ b/tdeabc/scripts/addressee.src.h
@@ -39,7 +39,7 @@
 #include "sound.h"
 #include "timezone.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class Resource;
 class Field;
@@ -383,7 +383,7 @@ class KABC_EXPORT Addressee
      */
     bool changed() const;
 
-    static void setSortMode( KABC::SortMode *mode );
+    static void setSortMode( TDEABC::SortMode *mode );
 
     bool operator< ( const Addressee &addr );
 
@@ -396,7 +396,7 @@ class KABC_EXPORT Addressee
   private:
     static AddresseeData* shared_null;
     static AddresseeData* makeSharedNull();
-    static KABC::SortMode *mSortMode;
+    static TDEABC::SortMode *mSortMode;
 };
 
 KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const Addressee & );
diff --git a/tdeabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp
index bec318880..a87d00679 100644
--- a/tdeabc/scripts/field.src.cpp
+++ b/tdeabc/scripts/field.src.cpp
@@ -25,7 +25,7 @@
 #include "field.h"
 #include "address.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 class Field::FieldImpl
 {
@@ -113,7 +113,7 @@ TQString Field::categoryLabel( int category )
   }
 }
 
-TQString Field::value( const KABC::Addressee &a )
+TQString Field::value( const TDEABC::Addressee &a )
 {
   switch ( mImpl->fieldId() ) {
     --CASEVALUE--
@@ -213,7 +213,7 @@ TQString Field::value( const KABC::Addressee &a )
   }
 }
 
-bool Field::setValue( KABC::Addressee &a, const TQString &value )
+bool Field::setValue( TDEABC::Addressee &a, const TQString &value )
 {
   switch ( mImpl->fieldId() ) {
     --CASESETVALUE--
@@ -261,84 +261,84 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value )
       }
     case FieldImpl::HomeAddressStreet:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setStreet( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::HomeAddressLocality:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setLocality( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::HomeAddressRegion:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setRegion( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::HomeAddressPostalCode:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setPostalCode( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::HomeAddressCountry:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setCountry( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::HomeAddressLabel:
       {
-        KABC::Address address = a.address( Address::Home );
+        TDEABC::Address address = a.address( Address::Home );
         address.setLabel( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressStreet:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setStreet( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressLocality:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setLocality( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressRegion:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setRegion( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressPostalCode:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setPostalCode( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressCountry:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setCountry( value );
         a.insertAddress( address );
         return true;
       }
     case FieldImpl::BusinessAddressLabel:
       {
-        KABC::Address address = a.address( Address::Work );
+        TDEABC::Address address = a.address( Address::Work );
         address.setLabel( value );
         a.insertAddress( address );
         return true;
@@ -354,7 +354,7 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value )
   }
 }
 
-TQString Field::sortKey( const KABC::Addressee &a )
+TQString Field::sortKey( const TDEABC::Addressee &a )
 {
   switch ( mImpl->fieldId() ) {
     --CASEVALUE--
diff --git a/tdeabc/secrecy.cpp b/tdeabc/secrecy.cpp
index 2725612bc..3fe33f17d 100644
--- a/tdeabc/secrecy.cpp
+++ b/tdeabc/secrecy.cpp
@@ -22,7 +22,7 @@
 
 #include "secrecy.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 Secrecy::Secrecy( int type )
   : mType( type )
@@ -87,12 +87,12 @@ TQString Secrecy::asString() const
   return typeLabel( mType );
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Secrecy &secrecy )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Secrecy &secrecy )
 {
     return s << secrecy.mType;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Secrecy &secrecy )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Secrecy &secrecy )
 {
     s >> secrecy.mType;
 
diff --git a/tdeabc/secrecy.h b/tdeabc/secrecy.h
index 5cc60b11d..596d1b675 100644
--- a/tdeabc/secrecy.h
+++ b/tdeabc/secrecy.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class KABC_EXPORT Secrecy
 {
diff --git a/tdeabc/sortmode.cpp b/tdeabc/sortmode.cpp
index efb4a3919..1fef420eb 100644
--- a/tdeabc/sortmode.cpp
+++ b/tdeabc/sortmode.cpp
@@ -22,7 +22,7 @@
 
 #include "sortmode.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 NameSortMode::NameSortMode()
  : mNameType( FormattedName ), mAscendingOrder( true ), d( 0 )
@@ -35,7 +35,7 @@ NameSortMode::NameSortMode( NameType type, bool ascending )
 {
 }
 
-bool NameSortMode::lesser( const KABC::Addressee &first, const KABC::Addressee &second ) const
+bool NameSortMode::lesser( const TDEABC::Addressee &first, const TDEABC::Addressee &second ) const
 {
   bool lesser = false;
 
@@ -60,12 +60,12 @@ bool NameSortMode::lesser( const KABC::Addressee &first, const KABC::Addressee &
   return lesser;
 }
 
-FieldSortMode::FieldSortMode( KABC::Field *field, bool ascending )
+FieldSortMode::FieldSortMode( TDEABC::Field *field, bool ascending )
   : mField( field ), mAscendingOrder( ascending ), d( 0 )
 {
 }
 
-bool FieldSortMode::lesser( const KABC::Addressee &first, const KABC::Addressee &second ) const
+bool FieldSortMode::lesser( const TDEABC::Addressee &first, const TDEABC::Addressee &second ) const
 {
   if ( !mField )
     return false;
diff --git a/tdeabc/sortmode.h b/tdeabc/sortmode.h
index f02662b7d..49f3490ba 100644
--- a/tdeabc/sortmode.h
+++ b/tdeabc/sortmode.h
@@ -25,13 +25,13 @@
 
 #include <tdeabc/addressee.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Sort method for sorting an addressee list.
 
   This interface should be reimplemented by classes which shall act as
-  SortModes for KABC::AddresseeList.
+  SortModes for TDEABC::AddresseeList.
 */
 class KABC_EXPORT SortMode
 {
@@ -40,7 +40,7 @@ class KABC_EXPORT SortMode
       Reimplement this method and return whether the first contact is 'smaller'
       than the second.
      */
-    virtual bool lesser( const KABC::Addressee &first, const KABC::Addressee &second ) const = 0;
+    virtual bool lesser( const TDEABC::Addressee &first, const TDEABC::Addressee &second ) const = 0;
 };
 
 class KABC_EXPORT NameSortMode : public SortMode
@@ -73,7 +73,7 @@ class KABC_EXPORT NameSortMode : public SortMode
     /**
       Returns whether the first contact is 'smaller' then the second.
      */
-    virtual bool lesser( const KABC::Addressee&, const KABC::Addressee& ) const;
+    virtual bool lesser( const TDEABC::Addressee&, const TDEABC::Addressee& ) const;
 
   private:
     NameType mNameType;
@@ -94,15 +94,15 @@ class KABC_EXPORT FieldSortMode : public SortMode
       @param field The field.
       @param ascending true for ascending sort, false for descending.
      */
-    FieldSortMode( KABC::Field *field, bool ascending = true );
+    FieldSortMode( TDEABC::Field *field, bool ascending = true );
 
     /**
       Returns whether the first contact is 'smaller' then the second.
      */
-    virtual bool lesser( const KABC::Addressee&, const KABC::Addressee& ) const;
+    virtual bool lesser( const TDEABC::Addressee&, const TDEABC::Addressee& ) const;
 
   private:
-    KABC::Field *mField;
+    TDEABC::Field *mField;
     bool mAscendingOrder;
 
     class FieldSortModePrivate;
diff --git a/tdeabc/sound.cpp b/tdeabc/sound.cpp
index cf645be83..fbdadd2d2 100644
--- a/tdeabc/sound.cpp
+++ b/tdeabc/sound.cpp
@@ -22,7 +22,7 @@
 
 #include <tqdatastream.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 Sound::Sound()
   : mIntern( false )
@@ -104,13 +104,13 @@ TQString Sound::asString() const
     return mUrl;
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const Sound &sound )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const Sound &sound )
 {
   return s << sound.mIntern << sound.mUrl;
 //  return s << sound.mIntern << sound.mUrl << sound.mData;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, Sound &sound )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, Sound &sound )
 {
   s >> sound.mIntern >> sound.mUrl;
 //  s >> sound.mIntern >> sound.mUrl >> sound.mData;
diff --git a/tdeabc/sound.h b/tdeabc/sound.h
index 98dcf320b..4602c9ed6 100644
--- a/tdeabc/sound.h
+++ b/tdeabc/sound.h
@@ -26,7 +26,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /** @short Class that holds a Sound clip for a contact.
  *
diff --git a/tdeabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp
index 3e64645ea..c0789f215 100644
--- a/tdeabc/stdaddressbook.cpp
+++ b/tdeabc/stdaddressbook.cpp
@@ -33,7 +33,7 @@
 
 #include "stdaddressbook.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 StdAddressBook *StdAddressBook::mSelf = 0;
 bool StdAddressBook::mAutomaticSave = true;
diff --git a/tdeabc/stdaddressbook.h b/tdeabc/stdaddressbook.h
index 935b2bad1..86804a91e 100644
--- a/tdeabc/stdaddressbook.h
+++ b/tdeabc/stdaddressbook.h
@@ -23,7 +23,7 @@
 
 #include "addressbook.h"
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   Standard KDE address book
@@ -37,19 +37,19 @@ namespace KABC {
   Example:
 
   \code
-  KABC::AddressBook *ab = KABC::StdAddressBook::self();
+  TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self();
 
   AddressBook::Ticket *ticket = ab->requestSaveTicket();
 
   if ( ticket ) {
-    KABC::AddressBook::Iterator it;
+    TDEABC::AddressBook::Iterator it;
     for ( it = ab->begin(); it != ab->end(); ++it ) {
       kdDebug() << "UID=" << (*it).uid() << endl;
 
       // do some other stuff
     }
 
-    KABC::StdAddressBook::save( ticket );
+    TDEABC::StdAddressBook::save( ticket );
   }
   \endcode
 */
diff --git a/tdeabc/tdeab2tdeabc.cpp b/tdeabc/tdeab2tdeabc.cpp
index 13b433abc..20aef735c 100644
--- a/tdeabc/tdeab2tdeabc.cpp
+++ b/tdeabc/tdeab2tdeabc.cpp
@@ -35,7 +35,7 @@
 #include "addressbook.h"
 #include "stdaddressbook.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 static const TDECmdLineOptions options[] =
 {
@@ -46,7 +46,7 @@ static const TDECmdLineOptions options[] =
   TDECmdLineLastOption
 };
 
-void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
+void readKMailEntry( const TQString &kmailEntry, TDEABC::AddressBook *ab )
 {
   kdDebug() << "KMAILENTRY: " << kmailEntry << endl;
 
@@ -105,9 +105,9 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   kdDebug() << "  NAME    : " << name    << endl;
   kdDebug() << "  COMMENT : " << comment << endl;
 
-  KABC::Addressee::List al = ab->findByEmail( email );
+  TDEABC::Addressee::List al = ab->findByEmail( email );
   if ( al.isEmpty() ) {
-    KABC::Addressee a;
+    TDEABC::Addressee a;
     a.setNameFromString( name );
     a.insertEmail( email );
     a.setNote( comment );
@@ -118,7 +118,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
   }
 }
 
-void importKMailAddressBook( KABC::AddressBook *ab )
+void importKMailAddressBook( TDEABC::AddressBook *ab )
 {
   TQString fileName = locateLocal( "data", "kmail/addressbook" );
   TQString kmailConfigName = locate( "config", "kmailrc" );
@@ -278,7 +278,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a )
   if ( !otherAddress.isEmpty() ) a.insertAddress( otherAddress );
 }
 
-void importKab( KABC::AddressBook *ab, bool override, bool quiet )
+void importKab( TDEABC::AddressBook *ab, bool override, bool quiet )
 {
   TQString fileName = TDEGlobal::dirs()->saveLocation( "data", "kab/" );
   fileName += "addressbook.kab";
@@ -463,7 +463,7 @@ int main( int argc, char **argv )
     config->writeEntry( "EnableAutostart", false );
   }
 
-  KABC::AddressBook *kabcBook = StdAddressBook::self();
+  TDEABC::AddressBook *kabcBook = StdAddressBook::self();
 
   importKMailAddressBook( kabcBook );
 
diff --git a/tdeabc/tests/bigread.cpp b/tdeabc/tests/bigread.cpp
index a5022367c..a2c9da070 100644
--- a/tdeabc/tests/bigread.cpp
+++ b/tdeabc/tests/bigread.cpp
@@ -13,7 +13,7 @@
 #include "resourcesql.h"
 #endif
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main(int argc,char **argv)
 {
diff --git a/tdeabc/tests/bigwrite.cpp b/tdeabc/tests/bigwrite.cpp
index 4b9fa7bc3..ab7fec7cf 100644
--- a/tdeabc/tests/bigwrite.cpp
+++ b/tdeabc/tests/bigwrite.cpp
@@ -10,7 +10,7 @@
 #include "vcardformat.h"
 #include "plugins/file/resourcefile.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main(int argc,char **argv)
 {
diff --git a/tdeabc/tests/kabcargl.cpp b/tdeabc/tests/kabcargl.cpp
index e38a8a22e..d3a71890e 100644
--- a/tdeabc/tests/kabcargl.cpp
+++ b/tdeabc/tests/kabcargl.cpp
@@ -31,7 +31,7 @@
 
 #include "stdaddressbook.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main(int argc,char **argv)
 {
diff --git a/tdeabc/tests/testaddressee.cpp b/tdeabc/tests/testaddressee.cpp
index ef55ae403..96989a06d 100644
--- a/tdeabc/tests/testaddressee.cpp
+++ b/tdeabc/tests/testaddressee.cpp
@@ -11,7 +11,7 @@
 #include "vcardformat.h"
 #include "phonenumber.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 static const TDECmdLineOptions options[] =
 {
diff --git a/tdeabc/tests/testaddresseelist.cpp b/tdeabc/tests/testaddresseelist.cpp
index f247f1744..12964a687 100644
--- a/tdeabc/tests/testaddresseelist.cpp
+++ b/tdeabc/tests/testaddresseelist.cpp
@@ -8,7 +8,7 @@
 #include "addressbook.h"
 #include "addresseelist.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 static const TDECmdLineOptions options[] =
 {
diff --git a/tdeabc/tests/testaddressfmt.cpp b/tdeabc/tests/testaddressfmt.cpp
index 2eb438335..79545f6f9 100644
--- a/tdeabc/tests/testaddressfmt.cpp
+++ b/tdeabc/tests/testaddressfmt.cpp
@@ -8,7 +8,7 @@
 #include "addressbook.h"
 #include "address.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 static const TDECmdLineOptions options[] =
 {
diff --git a/tdeabc/tests/testaddresslineedit.cpp b/tdeabc/tests/testaddresslineedit.cpp
index 74446f482..80bd311da 100644
--- a/tdeabc/tests/testaddresslineedit.cpp
+++ b/tdeabc/tests/testaddresslineedit.cpp
@@ -6,7 +6,7 @@
 
 #include "addresslineedit.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main( int argc,char **argv )
 {
diff --git a/tdeabc/tests/testdb.cpp b/tdeabc/tests/testdb.cpp
index f7ec1d17c..c6b02c14a 100644
--- a/tdeabc/tests/testdb.cpp
+++ b/tdeabc/tests/testdb.cpp
@@ -8,7 +8,7 @@
 #include "vcardformat.h"
 #include "resourcesql.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main(int argc,char **argv)
 {
diff --git a/tdeabc/tests/testdistlist.cpp b/tdeabc/tests/testdistlist.cpp
index 69a309ff9..833dca84e 100644
--- a/tdeabc/tests/testdistlist.cpp
+++ b/tdeabc/tests/testdistlist.cpp
@@ -11,7 +11,7 @@
 #include "distributionlisteditor.h"
 #include "distributionlist.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 static const TDECmdLineOptions options[] =
 {
diff --git a/tdeabc/tests/testkabc.cpp b/tdeabc/tests/testkabc.cpp
index 427262cab..2cc7effb4 100644
--- a/tdeabc/tests/testkabc.cpp
+++ b/tdeabc/tests/testkabc.cpp
@@ -16,7 +16,7 @@
 #include "agent.h"
 #include "vcardconverter.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 int main(int argc,char **argv)
 {
diff --git a/tdeabc/tests/testkabcdlg.cpp b/tdeabc/tests/testkabcdlg.cpp
index aef203d28..7b4b18e3e 100644
--- a/tdeabc/tests/testkabcdlg.cpp
+++ b/tdeabc/tests/testkabcdlg.cpp
@@ -8,7 +8,7 @@
 
 #include "addresseedialog.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 static const TDECmdLineOptions options[] =
 {
diff --git a/tdeabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp
index df9fd6226..71a34ee5e 100644
--- a/tdeabc/tests/testldapclient.cpp
+++ b/tdeabc/tests/testldapclient.cpp
@@ -97,8 +97,8 @@ void TestLDAPClient::testIntevation()
   // But this certainly looks fishy, it might break on non-utf8 systems.
   TQString filter = "&(|(objectclass=person)(objectclass=groupofnames)(mail=*))(|(cn=*�gypten MDK*)(sn=*�gypten MDK*))";
 
-  connect( mClient, TQT_SIGNAL( result( const KABC::LdapObject& ) ),
-           this, TQT_SLOT( slotLDAPResult( const KABC::LdapObject& ) ) );
+  connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
+           this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
   connect( mClient, TQT_SIGNAL( done() ),
            this, TQT_SLOT( slotLDAPDone() ) );
   connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
@@ -123,11 +123,11 @@ static TQString asUtf8( const TQByteArray &val )
     return TQString::fromUtf8( data, val.size() );
 }
 
-static TQString join( const KABC::LdapAttrValue& lst, const TQString& sep )
+static TQString join( const TDEABC::LdapAttrValue& lst, const TQString& sep )
 {
   TQString res;
   bool already = false;
-  for ( KABC::LdapAttrValue::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+  for ( TDEABC::LdapAttrValue::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
     if ( already )
       res += sep;
     already = TRUE;
@@ -136,7 +136,7 @@ static TQString join( const KABC::LdapAttrValue& lst, const TQString& sep )
   return res;
 }
 
-void TestLDAPClient::slotLDAPResult( const KABC::LdapObject& obj )
+void TestLDAPClient::slotLDAPResult( const TDEABC::LdapObject& obj )
 {
   TQString cn = join( obj.attrs[ "cn" ], ", " );
   kdDebug() << " cn:" << cn << endl;
diff --git a/tdeabc/tests/testldapclient.h b/tdeabc/tests/testldapclient.h
index 1995914c3..502115b07 100644
--- a/tdeabc/tests/testldapclient.h
+++ b/tdeabc/tests/testldapclient.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 
 #include "../ldapclient.h"
-typedef KABC::LdapClient LdapClient;
+typedef TDEABC::LdapClient LdapClient;
 
 class TestLDAPClient : public TQObject
 {
@@ -38,7 +38,7 @@ public:
     void testIntevation();
 
 private slots:
-    void slotLDAPResult( const KABC::LdapObject& );
+    void slotLDAPResult( const TDEABC::LdapObject& );
     void slotLDAPError( const TQString& );
     void slotLDAPDone();
 
diff --git a/tdeabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp
index 3ebd724bb..7f3cf634b 100644
--- a/tdeabc/tests/testlock.cpp
+++ b/tdeabc/tests/testlock.cpp
@@ -45,7 +45,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 LockWidget::LockWidget( const TQString &identifier )
 {
diff --git a/tdeabc/tests/testlock.h b/tdeabc/tests/testlock.h
index a94d4e8c6..01d07fc47 100644
--- a/tdeabc/tests/testlock.h
+++ b/tdeabc/tests/testlock.h
@@ -42,7 +42,7 @@ class KABC_EXPORT LockWidget : public TQWidget
     void updateLockView();
     
   private:
-    KABC::Lock *mLock;
+    TDEABC::Lock *mLock;
 
     TQLabel *mStatus;
     TQListView *mLockView;
diff --git a/tdeabc/timezone.cpp b/tdeabc/timezone.cpp
index 59a184c6d..7b773db63 100644
--- a/tdeabc/timezone.cpp
+++ b/tdeabc/timezone.cpp
@@ -22,7 +22,7 @@
 
 #include "timezone.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 TimeZone::TimeZone() :
   mOffset( 0 ), mValid( false )
@@ -71,12 +71,12 @@ TQString TimeZone::asString() const
   return TQString::number( mOffset );
 }
 
-TQDataStream &KABC::operator<<( TQDataStream &s, const TimeZone &zone )
+TQDataStream &TDEABC::operator<<( TQDataStream &s, const TimeZone &zone )
 {
     return s << zone.mOffset;
 }
 
-TQDataStream &KABC::operator>>( TQDataStream &s, TimeZone &zone )
+TQDataStream &TDEABC::operator>>( TQDataStream &s, TimeZone &zone )
 {
     s >> zone.mOffset;
     zone.mValid = true;
diff --git a/tdeabc/timezone.h b/tdeabc/timezone.h
index 8705797fb..b53df7728 100644
--- a/tdeabc/timezone.h
+++ b/tdeabc/timezone.h
@@ -25,7 +25,7 @@
 
 #include <tdelibs_export.h>
 
-namespace KABC {
+namespace TDEABC {
 
 /**
  * @short Time zone information.
diff --git a/tdeabc/vcard21parser.cpp b/tdeabc/vcard21parser.cpp
index 8a3bfcaea..46581b411 100644
--- a/tdeabc/vcard21parser.cpp
+++ b/tdeabc/vcard21parser.cpp
@@ -25,7 +25,7 @@
 #include "vcard21parser.h"
 #include "vcardconverter.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 bool VCardLineX::isValid() const
 {
@@ -199,15 +199,15 @@ VCard21Parser::~VCard21Parser()
 {
 }
 
-void VCard21Parser::readFromString(KABC::AddressBook *addressbook, const TQString &data)
+void VCard21Parser::readFromString(TDEABC::AddressBook *addressbook, const TQString &data)
 {
-  KABC::Addressee mAddressee = readFromString(data);
+  TDEABC::Addressee mAddressee = readFromString(data);
   addressbook->insertAddressee(mAddressee);
 }
 
-KABC::Addressee VCard21Parser::readFromString( const TQString &data)
+TDEABC::Addressee VCard21Parser::readFromString( const TQString &data)
 {
-  KABC::Addressee addressee;
+  TDEABC::Addressee addressee;
   VCard21ParserImpl *vCard = VCard21ParserImpl::parseVCard(data);
   TQString tmpStr;
 
@@ -369,9 +369,9 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
 
 
 
-KABC::Address VCard21Parser::readAddressFromQStringList ( const TQStringList &data, const int type )
+TDEABC::Address VCard21Parser::readAddressFromQStringList ( const TQStringList &data, const int type )
 {
-  KABC::Address mAddress;
+  TDEABC::Address mAddress;
   mAddress.setType( type );
 
   if ( data.count() > 0 )
diff --git a/tdeabc/vcard21parser.h b/tdeabc/vcard21parser.h
index 0eb66fa93..a743e65f3 100644
--- a/tdeabc/vcard21parser.h
+++ b/tdeabc/vcard21parser.h
@@ -132,7 +132,7 @@
 #define VC_ERR_INVALID_NAME        5
 #define VC_ERR_MISSING_MANDATORY   6
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 
@@ -160,17 +160,17 @@ public:
    * @param ab  The address book.
    * @param str The vcard string.
    */
-  void readFromString( KABC::AddressBook *ab, const TQString &str );
+  void readFromString( TDEABC::AddressBook *ab, const TQString &str );
 
   /**
    * FIXME: we need a writeToString method
-   * TQString writeToString (KABC::AddressBook *);
+   * TQString writeToString (TDEABC::AddressBook *);
    */
 
   /**
    * Parses a string in vcard2.1 format and returns the inherent addressee.
    */
-  KABC::Addressee readFromString( const TQString &data);
+  TDEABC::Addressee readFromString( const TQString &data);
 
   /**
    * Helper method to store a address.
@@ -178,7 +178,7 @@ public:
    * @param data  A string list, that is filled with 'street', 'house number' ...
    * @param type  The type of the returned address.
    */
-  static KABC::Address readAddressFromQStringList (const TQStringList &data, const int type);
+  static TDEABC::Address readAddressFromQStringList (const TQStringList &data, const int type);
 };
 
 }
diff --git a/tdeabc/vcardconverter.cpp b/tdeabc/vcardconverter.cpp
index d575b019c..2dff56aa2 100644
--- a/tdeabc/vcardconverter.cpp
+++ b/tdeabc/vcardconverter.cpp
@@ -24,7 +24,7 @@
 
 #include "vcardconverter.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 struct VCardConverter::VCardConverterData
 {
@@ -101,17 +101,17 @@ bool VCardConverter::addresseeToVCard( const Addressee &addr, TQString &str, Ver
 
 /* Helper functions */
 
-TQString KABC::dateToVCardString( const TQDateTime &dateTime )
+TQString TDEABC::dateToVCardString( const TQDateTime &dateTime )
 {
   return dateTime.toString("yyyyMMddThhmmssZ");
 }
 
-TQString KABC::dateToVCardString( const TQDate &date )
+TQString TDEABC::dateToVCardString( const TQDate &date )
 {
   return date.toString("yyyyMMdd");
 }
 
-TQDateTime KABC::VCardStringToDate( const TQString &dateString )
+TQDateTime TDEABC::VCardStringToDate( const TQString &dateString )
 {
   TQDate date;
   TQTime time;
diff --git a/tdeabc/vcardconverter.h b/tdeabc/vcardconverter.h
index ab09279f2..982c704d4 100644
--- a/tdeabc/vcardconverter.h
+++ b/tdeabc/vcardconverter.h
@@ -25,7 +25,7 @@
 
 #include "addressee.h"
 
-namespace KABC {
+namespace TDEABC {
 
 /**
   @short Class to converting contact objects into vCard format and vice versa.
diff --git a/tdeabc/vcardformat.cpp b/tdeabc/vcardformat.cpp
index 147aa4259..b8bfaa6b6 100644
--- a/tdeabc/vcardformat.cpp
+++ b/tdeabc/vcardformat.cpp
@@ -22,7 +22,7 @@
 
 #include "vcardformat.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 VCardFormat::VCardFormat()
 {
diff --git a/tdeabc/vcardformat.h b/tdeabc/vcardformat.h
index 8194056cb..b5d6ff133 100644
--- a/tdeabc/vcardformat.h
+++ b/tdeabc/vcardformat.h
@@ -24,7 +24,7 @@
 
 #include "format.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class VCardFormatImpl;
diff --git a/tdeabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp
index c0d39bb95..e88ab3078 100644
--- a/tdeabc/vcardformatimpl.cpp
+++ b/tdeabc/vcardformatimpl.cpp
@@ -30,7 +30,7 @@
 #include "addressbook.h"
 #include "vcardformatimpl.h"
 
-using namespace KABC;
+using namespace TDEABC;
 using namespace VCARD;
 
 bool VCardFormatImpl::load( Addressee &addressee, TQFile *file )
diff --git a/tdeabc/vcardformatimpl.h b/tdeabc/vcardformatimpl.h
index 78c466a86..ddcd6fc07 100644
--- a/tdeabc/vcardformatimpl.h
+++ b/tdeabc/vcardformatimpl.h
@@ -33,7 +33,7 @@
 #include <VCard.h>
 #endif 
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 
diff --git a/tdeabc/vcardformatplugin.cpp b/tdeabc/vcardformatplugin.cpp
index 6194cd0fe..83c4a8a7b 100644
--- a/tdeabc/vcardformatplugin.cpp
+++ b/tdeabc/vcardformatplugin.cpp
@@ -26,7 +26,7 @@
 
 #include "vcardformatplugin.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 VCardFormatPlugin::VCardFormatPlugin()
 {
diff --git a/tdeabc/vcardformatplugin.h b/tdeabc/vcardformatplugin.h
index 5ac7e49c2..c9cc4f351 100644
--- a/tdeabc/vcardformatplugin.h
+++ b/tdeabc/vcardformatplugin.h
@@ -23,7 +23,7 @@
 
 #include "formatplugin.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class AddressBook;
 class Addressee;
diff --git a/tdeabc/vcardparser/testread.cpp b/tdeabc/vcardparser/testread.cpp
index fd3524b56..284526abd 100644
--- a/tdeabc/vcardparser/testread.cpp
+++ b/tdeabc/vcardparser/testread.cpp
@@ -74,11 +74,11 @@ int main( int argc, char **argv )
   text = s.read();
   file.close();
 
-  KABC::VCardConverter converter;
-  KABC::Addressee::List list = converter.parseVCards( text );
+  TDEABC::VCardConverter converter;
+  TDEABC::Addressee::List list = converter.parseVCards( text );
 
   if ( args->isSet( "vcard21" ) ) {
-    text = converter.createVCards( list, KABC::VCardConverter::v2_1 ); // uses version 2.1
+    text = converter.createVCards( list, TDEABC::VCardConverter::v2_1 ); // uses version 2.1
   } else {
     text = converter.createVCards( list ); // uses version 3.0
   }
diff --git a/tdeabc/vcardparser/testread2.cpp b/tdeabc/vcardparser/testread2.cpp
index ea278602c..bd0922670 100644
--- a/tdeabc/vcardparser/testread2.cpp
+++ b/tdeabc/vcardparser/testread2.cpp
@@ -3,7 +3,7 @@
 #include <vcardconverter.h>
 #include <kdebug.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 int
 main()
diff --git a/tdeabc/vcardparser/testutils.cpp b/tdeabc/vcardparser/testutils.cpp
index 62d1b4121..6547445e5 100644
--- a/tdeabc/vcardparser/testutils.cpp
+++ b/tdeabc/vcardparser/testutils.cpp
@@ -2,7 +2,7 @@
 #include <tdeabc/addressee.h>
 #include <tqfile.h>
 
-using namespace KABC;
+using namespace TDEABC;
 
 Addressee
 vcard1()
diff --git a/tdeabc/vcardparser/testutils.h b/tdeabc/vcardparser/testutils.h
index c8218b7ba..830f94332 100644
--- a/tdeabc/vcardparser/testutils.h
+++ b/tdeabc/vcardparser/testutils.h
@@ -4,10 +4,10 @@
 #include <tdeabc/addressee.h>
 #include <tqstring.h>
 
-KABC::Addressee vcard1();
-KABC::Addressee vcard2();
-KABC::Addressee vcard3();
-KABC::Addressee::List vCardsAsAddresseeList();
+TDEABC::Addressee vcard1();
+TDEABC::Addressee vcard2();
+TDEABC::Addressee vcard3();
+TDEABC::Addressee::List vCardsAsAddresseeList();
 TQString   vCardAsText( const TQString& location );
 TQString   vCardsAsText();
 
diff --git a/tdeabc/vcardparser/testwrite.cpp b/tdeabc/vcardparser/testwrite.cpp
index e40ffe4d0..c7df6df08 100644
--- a/tdeabc/vcardparser/testwrite.cpp
+++ b/tdeabc/vcardparser/testwrite.cpp
@@ -42,15 +42,15 @@ int main( int argc, char **argv )
   TDEApplication app( false, false );
   
 
-  KABC::Addressee addressee;
+  TDEABC::Addressee addressee;
 
   addressee.setNameFromString( "Mr. Tobias Koenig Jr." );
   addressee.setNickName( "tokoe" );
   addressee.setBirthday( TQDate( 1982, 7, 19 ) );
   addressee.setMailer( "mutt1.2" );
-  addressee.setTimeZone( KABC::TimeZone( +2 ) );
+  addressee.setTimeZone( TDEABC::TimeZone( +2 ) );
 
-  KABC::Geo geo;
+  TDEABC::Geo geo;
   geo.setLatitude( 30 );
   geo.setLongitude( 51 );
   addressee.setGeo( geo );
@@ -63,17 +63,17 @@ int main( int argc, char **argv )
   addressee.setRevision( TQDateTime::currentDateTime() );
   addressee.setSortString( "koenig" );
   addressee.setUrl( KURL( "http://wgess16.dyndns.org") );
-  addressee.setSecrecy(  KABC::Secrecy( KABC::Secrecy::Confidential ) );
+  addressee.setSecrecy(  TDEABC::Secrecy( TDEABC::Secrecy::Confidential ) );
 /*
   TQImage img;
   img.load( "testimg.png", "PNG" );
-  KABC::Picture photo;
+  TDEABC::Picture photo;
   photo.setData( img );
   addressee.setPhoto( photo );
 
   TQImage img2;
   img2.load( "testimg.png", "PNG" );
-  KABC::Picture logo;
+  TDEABC::Picture logo;
   logo.setData( img2 );
   addressee.setLogo( logo );
 
@@ -81,26 +81,26 @@ int main( int argc, char **argv )
   soundFile.open( IO_ReadOnly );
   TQByteArray data = soundFile.readAll();
   soundFile.close();
-  KABC::Sound sound;
+  TDEABC::Sound sound;
   sound.setData( data );
   addressee.setSound( sound );
 */
   addressee.insertEmail( "tokoe@kde.org", true );
   addressee.insertEmail( "tokoe82@yahoo.de", true );
 
-  KABC::PhoneNumber phone1( "3541523475", KABC::PhoneNumber::Pref | KABC::PhoneNumber::Home );
-  KABC::PhoneNumber phone2( "+46745673475", KABC::PhoneNumber::Work );
+  TDEABC::PhoneNumber phone1( "3541523475", TDEABC::PhoneNumber::Pref | TDEABC::PhoneNumber::Home );
+  TDEABC::PhoneNumber phone2( "+46745673475", TDEABC::PhoneNumber::Work );
   addressee.insertPhoneNumber( phone1 );
   addressee.insertPhoneNumber( phone2 );
 
-  KABC::Key key( "secret key", KABC::Key::X509 );
+  TDEABC::Key key( "secret key", TDEABC::Key::X509 );
   addressee.insertKey( key );
 
   TQStringList categories;
   categories << "Friends" << "School" << "KDE";
   addressee.setCategories( categories );
 
-  KABC::Address a( KABC::Address::Work | KABC::Address::Postal | KABC::Address::Parcel );
+  TDEABC::Address a( TDEABC::Address::Work | TDEABC::Address::Postal | TDEABC::Address::Parcel );
   a.setStreet( "6544 Battleford Drive" );
   a.setLocality( "Raleigh" );
   a.setRegion( "NC" );
@@ -112,14 +112,14 @@ int main( int argc, char **argv )
   addressee.insertCustom( "2hsdf", "ertuer", "iurt" );
   addressee.insertCustom( "3hsdf", "ertuer", "iurt" );
 
-  KABC::Addressee::List list;
+  TDEABC::Addressee::List list;
   for ( int i = 0; i < 1000; ++i ) {
-    KABC::Addressee addr = addressee;
+    TDEABC::Addressee addr = addressee;
     addr.setUid( TQString::number( i ) );
     list.append( addr );
   }
 
-  KABC::VCardConverter converter;
+  TDEABC::VCardConverter converter;
   TQString txt = converter.createVCards( list );
 
   TQFile file( "out.vcf" );
diff --git a/tdeabc/vcardparser/vcard.cpp b/tdeabc/vcardparser/vcard.cpp
index 30a8e1c49..f6841cbd9 100644
--- a/tdeabc/vcardparser/vcard.cpp
+++ b/tdeabc/vcardparser/vcard.cpp
@@ -20,7 +20,7 @@
 
 #include "vcard.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 VCard::VCard()
 {
diff --git a/tdeabc/vcardparser/vcard.h b/tdeabc/vcardparser/vcard.h
index 6afeeda26..ad50b8657 100644
--- a/tdeabc/vcardparser/vcard.h
+++ b/tdeabc/vcardparser/vcard.h
@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class VCard
 {
diff --git a/tdeabc/vcardparser/vcardline.cpp b/tdeabc/vcardparser/vcardline.cpp
index 6680cf7d0..22d7f7e52 100644
--- a/tdeabc/vcardparser/vcardline.cpp
+++ b/tdeabc/vcardparser/vcardline.cpp
@@ -20,7 +20,7 @@
 
 #include "vcardline.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 class VCardLine::VCardLinePrivate
 {
diff --git a/tdeabc/vcardparser/vcardline.h b/tdeabc/vcardparser/vcardline.h
index 92fe743f6..78ce2a411 100644
--- a/tdeabc/vcardparser/vcardline.h
+++ b/tdeabc/vcardparser/vcardline.h
@@ -27,7 +27,7 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-namespace KABC {
+namespace TDEABC {
 
 class VCardLine
 {
diff --git a/tdeabc/vcardparser/vcardparser.cpp b/tdeabc/vcardparser/vcardparser.cpp
index aed9ebd39..3cc38f5c8 100644
--- a/tdeabc/vcardparser/vcardparser.cpp
+++ b/tdeabc/vcardparser/vcardparser.cpp
@@ -27,7 +27,7 @@
 
 #define FOLD_WIDTH 75
 
-using namespace KABC;
+using namespace TDEABC;
 
 static TQString backslash( "\\\\" );
 static TQString comma( "\\," );
diff --git a/tdeabc/vcardparser/vcardparser.h b/tdeabc/vcardparser/vcardparser.h
index da5fdd46e..fc17d116b 100644
--- a/tdeabc/vcardparser/vcardparser.h
+++ b/tdeabc/vcardparser/vcardparser.h
@@ -23,7 +23,7 @@
 
 #include "vcard.h"
 
-namespace KABC {
+namespace TDEABC {
 
 class VCardParser
 {
diff --git a/tdeabc/vcardtool.cpp b/tdeabc/vcardtool.cpp
index 295360a03..2dd9752ac 100644
--- a/tdeabc/vcardtool.cpp
+++ b/tdeabc/vcardtool.cpp
@@ -30,7 +30,7 @@
 
 #include "vcardtool.h"
 
-using namespace KABC;
+using namespace TDEABC;
 
 static bool needsEncoding( const TQString &value )
 {
@@ -459,8 +459,8 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
             type += mAddressTypeMap[ (*it).lower() ];
 
           bool available = false;
-          KABC::Address::List addressList = addr.addresses();
-          KABC::Address::List::Iterator it;
+          TDEABC::Address::List addressList = addr.addresses();
+          TDEABC::Address::List::Iterator it;
           for ( it = addressList.begin(); it != addressList.end(); ++it ) {
             if ( (*it).type() == type ) {
               (*it).setLabel( (*lineIt).value().asString() );
@@ -471,7 +471,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
           }
 
           if ( !available ) { // a standalone LABEL tag
-            KABC::Address address( type );
+            TDEABC::Address address( type );
             address.setLabel( (*lineIt).value().asString() );
             addr.insertAddress( address );
           }
diff --git a/tdeabc/vcardtool.h b/tdeabc/vcardtool.h
index fbf959613..0d67605d6 100644
--- a/tdeabc/vcardtool.h
+++ b/tdeabc/vcardtool.h
@@ -26,7 +26,7 @@
 
 class TQDateTime;
 
-namespace KABC {
+namespace TDEABC {
 
 class Agent;
 class Key;
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2013-02-20 16:26:45 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2013-02-20 16:26:45 -0600
commit	45f3927b0ffec2599bc0e1ce361c5386474a85f4 (patch)
tree	29e1842fe4d93f4e99481385a771e8bef061158b /tdeabc
parent	04105ef07304a9358e87eff0cb1a6d6f2a725192 (diff)
download	tdelibs-45f3927b0ffec2599bc0e1ce361c5386474a85f4.tar.gz tdelibs-45f3927b0ffec2599bc0e1ce361c5386474a85f4.zip