Rename KABC namespace

5 files changed, 43 insertions, 43 deletions

diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am
index e04755d44..08e458c91 100644
--- a/kitchensync/src/Makefile.am
+++ b/kitchensync/src/Makefile.am
@@ -33,7 +33,7 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
                             configguisunbird.cpp
 libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
-                           $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \
+                           $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \
                            $(LIB_QT)
 
 # KPart
@@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = libkitchensyncpart.la
 
 libkitchensyncpart_la_SOURCES = part.cpp
 libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_KABC) $(LIB_TDECORE) $(LIB_TDEUI)
+libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI)
 
 # Resources
 kitchensyncdatadir = $(kde_datadir)/kitchensync
diff --git a/kitchensync/src/addresseediffalgo.cpp b/kitchensync/src/addresseediffalgo.cpp
index f91873bb6..e9847284c 100644
--- a/kitchensync/src/addresseediffalgo.cpp
+++ b/kitchensync/src/addresseediffalgo.cpp
@@ -33,8 +33,8 @@ static bool compareString( const TQString &left, const TQString &right )
     return left == right;
 }
 
-AddresseeDiffAlgo::AddresseeDiffAlgo( const KABC::Addressee &leftAddressee,
-                                      const KABC::Addressee &rightAddressee )
+AddresseeDiffAlgo::AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee,
+                                      const TDEABC::Addressee &rightAddressee )
   : mLeftAddressee( leftAddressee ), mRightAddressee( rightAddressee )
 {
 }
@@ -42,7 +42,7 @@ AddresseeDiffAlgo::AddresseeDiffAlgo( const KABC::Addressee &leftAddressee,
 AddresseeDiffAlgo::AddresseeDiffAlgo( const TQString &leftAddressee,
                                       const TQString &rightAddressee )
 {
-  KABC::VCardConverter converter;
+  TDEABC::VCardConverter converter;
 
   mLeftAddressee = converter.parseVCard( leftAddressee );
   mRightAddressee = converter.parseVCard( rightAddressee );
@@ -53,68 +53,68 @@ void AddresseeDiffAlgo::run()
   begin();
 
   if ( !compareString( mLeftAddressee.uid(), mRightAddressee.uid() ) )
-    conflictField( KABC::Addressee::uidLabel(), mLeftAddressee.uid(), mRightAddressee.uid() );
+    conflictField( TDEABC::Addressee::uidLabel(), mLeftAddressee.uid(), mRightAddressee.uid() );
 
   if ( !compareString( mLeftAddressee.name(), mRightAddressee.name() ) )
-    conflictField( KABC::Addressee::nameLabel(), mLeftAddressee.name(), mRightAddressee.name() );
+    conflictField( TDEABC::Addressee::nameLabel(), mLeftAddressee.name(), mRightAddressee.name() );
 
   if ( !compareString( mLeftAddressee.formattedName(), mRightAddressee.formattedName() ) )
-    conflictField( KABC::Addressee::formattedNameLabel(), mLeftAddressee.formattedName(), mRightAddressee.formattedName() );
+    conflictField( TDEABC::Addressee::formattedNameLabel(), mLeftAddressee.formattedName(), mRightAddressee.formattedName() );
 
   if ( !compareString( mLeftAddressee.familyName(), mRightAddressee.familyName() ) )
-    conflictField( KABC::Addressee::familyNameLabel(), mLeftAddressee.familyName(), mRightAddressee.familyName() );
+    conflictField( TDEABC::Addressee::familyNameLabel(), mLeftAddressee.familyName(), mRightAddressee.familyName() );
 
   if ( !compareString( mLeftAddressee.givenName(), mRightAddressee.givenName() ) )
-    conflictField( KABC::Addressee::givenNameLabel(), mLeftAddressee.givenName(), mRightAddressee.givenName() );
+    conflictField( TDEABC::Addressee::givenNameLabel(), mLeftAddressee.givenName(), mRightAddressee.givenName() );
 
   if ( !compareString( mLeftAddressee.additionalName(), mRightAddressee.additionalName() ) )
-    conflictField( KABC::Addressee::additionalNameLabel(), mLeftAddressee.additionalName(), mRightAddressee.additionalName() );
+    conflictField( TDEABC::Addressee::additionalNameLabel(), mLeftAddressee.additionalName(), mRightAddressee.additionalName() );
 
   if ( !compareString( mLeftAddressee.prefix(), mRightAddressee.prefix() ) )
-    conflictField( KABC::Addressee::prefixLabel(), mLeftAddressee.prefix(), mRightAddressee.prefix() );
+    conflictField( TDEABC::Addressee::prefixLabel(), mLeftAddressee.prefix(), mRightAddressee.prefix() );
 
   if ( !compareString( mLeftAddressee.suffix(), mRightAddressee.suffix() ) )
-    conflictField( KABC::Addressee::suffixLabel(), mLeftAddressee.suffix(), mRightAddressee.suffix() );
+    conflictField( TDEABC::Addressee::suffixLabel(), mLeftAddressee.suffix(), mRightAddressee.suffix() );
 
   if ( !compareString( mLeftAddressee.nickName(), mRightAddressee.nickName() ) )
-    conflictField( KABC::Addressee::nickNameLabel(), mLeftAddressee.nickName(), mRightAddressee.nickName() );
+    conflictField( TDEABC::Addressee::nickNameLabel(), mLeftAddressee.nickName(), mRightAddressee.nickName() );
 
   if ( mLeftAddressee.birthday() != mRightAddressee.birthday() )
-    conflictField( KABC::Addressee::birthdayLabel(), mLeftAddressee.birthday().toString(),
+    conflictField( TDEABC::Addressee::birthdayLabel(), mLeftAddressee.birthday().toString(),
                    mRightAddressee.birthday().toString() );
 
   if ( !compareString( mLeftAddressee.mailer(), mRightAddressee.mailer() ) )
-    conflictField( KABC::Addressee::mailerLabel(), mLeftAddressee.mailer(), mRightAddressee.mailer() );
+    conflictField( TDEABC::Addressee::mailerLabel(), mLeftAddressee.mailer(), mRightAddressee.mailer() );
 
   if ( mLeftAddressee.timeZone() != mRightAddressee.timeZone() )
-    conflictField( KABC::Addressee::timeZoneLabel(), mLeftAddressee.timeZone().asString(), mRightAddressee.timeZone().asString() );
+    conflictField( TDEABC::Addressee::timeZoneLabel(), mLeftAddressee.timeZone().asString(), mRightAddressee.timeZone().asString() );
 
   if ( mLeftAddressee.geo() != mRightAddressee.geo() )
-    conflictField( KABC::Addressee::geoLabel(), mLeftAddressee.geo().asString(), mRightAddressee.geo().asString() );
+    conflictField( TDEABC::Addressee::geoLabel(), mLeftAddressee.geo().asString(), mRightAddressee.geo().asString() );
 
   if ( !compareString( mLeftAddressee.title(), mRightAddressee.title() ) )
-    conflictField( KABC::Addressee::titleLabel(), mLeftAddressee.title(), mRightAddressee.title() );
+    conflictField( TDEABC::Addressee::titleLabel(), mLeftAddressee.title(), mRightAddressee.title() );
 
   if ( !compareString( mLeftAddressee.role(), mRightAddressee.role() ) )
-    conflictField( KABC::Addressee::roleLabel(), mLeftAddressee.role(), mRightAddressee.role() );
+    conflictField( TDEABC::Addressee::roleLabel(), mLeftAddressee.role(), mRightAddressee.role() );
 
   if ( !compareString( mLeftAddressee.organization(), mRightAddressee.organization() ) )
-    conflictField( KABC::Addressee::organizationLabel(), mLeftAddressee.organization(), mRightAddressee.organization() );
+    conflictField( TDEABC::Addressee::organizationLabel(), mLeftAddressee.organization(), mRightAddressee.organization() );
 
   if ( !compareString( mLeftAddressee.note(), mRightAddressee.note() ) )
-    conflictField( KABC::Addressee::noteLabel(), mLeftAddressee.note(), mRightAddressee.note() );
+    conflictField( TDEABC::Addressee::noteLabel(), mLeftAddressee.note(), mRightAddressee.note() );
 
   if ( !compareString( mLeftAddressee.productId(), mRightAddressee.productId() ) )
-    conflictField( KABC::Addressee::productIdLabel(), mLeftAddressee.productId(), mRightAddressee.productId() );
+    conflictField( TDEABC::Addressee::productIdLabel(), mLeftAddressee.productId(), mRightAddressee.productId() );
 
   if ( !compareString( mLeftAddressee.sortString(), mRightAddressee.sortString() ) )
-    conflictField( KABC::Addressee::sortStringLabel(), mLeftAddressee.sortString(), mRightAddressee.sortString() );
+    conflictField( TDEABC::Addressee::sortStringLabel(), mLeftAddressee.sortString(), mRightAddressee.sortString() );
 
   if ( mLeftAddressee.secrecy() != mRightAddressee.secrecy() ) {
-    conflictField( KABC::Addressee::secrecyLabel(), mLeftAddressee.secrecy().asString(), mRightAddressee.secrecy().asString() );
+    conflictField( TDEABC::Addressee::secrecyLabel(), mLeftAddressee.secrecy().asString(), mRightAddressee.secrecy().asString() );
   }
   if ( mLeftAddressee.url()!= mRightAddressee.url() )
-    conflictField( KABC::Addressee::urlLabel(), mLeftAddressee.url().prettyURL(),
+    conflictField( TDEABC::Addressee::urlLabel(), mLeftAddressee.url().prettyURL(),
       mRightAddressee.url().prettyURL() );
     
   if ( mLeftAddressee.logo() != mRightAddressee.logo() ) {
@@ -131,12 +131,12 @@ void AddresseeDiffAlgo::run()
   end();
 }
 
-TQString AddresseeDiffAlgo::toString( const KABC::PhoneNumber &number )
+TQString AddresseeDiffAlgo::toString( const TDEABC::PhoneNumber &number )
 {
   return number.number();
 }
 
-TQString AddresseeDiffAlgo::toString( const KABC::Address &addr )
+TQString AddresseeDiffAlgo::toString( const TDEABC::Address &addr )
 {
   return addr.formattedAddress();
 }
diff --git a/kitchensync/src/addresseediffalgo.h b/kitchensync/src/addresseediffalgo.h
index 30154d1b0..2cf33eea8 100644
--- a/kitchensync/src/addresseediffalgo.h
+++ b/kitchensync/src/addresseediffalgo.h
@@ -32,7 +32,7 @@ namespace KSync {
 class AddresseeDiffAlgo : public DiffAlgo
 {
   public:
-    AddresseeDiffAlgo( const KABC::Addressee &leftAddressee, const KABC::Addressee &rightAddressee );
+    AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee, const TDEABC::Addressee &rightAddressee );
     AddresseeDiffAlgo( const TQString &leftAddressee, const TQString &rightAddressee );
 
     void run();
@@ -41,11 +41,11 @@ class AddresseeDiffAlgo : public DiffAlgo
     template <class L>
     void diffList( const TQString &id, const TQValueList<L> &left, const TQValueList<L> &right );
 
-    TQString toString( const KABC::PhoneNumber &number );
-    TQString toString( const KABC::Address &address );
+    TQString toString( const TDEABC::PhoneNumber &number );
+    TQString toString( const TDEABC::Address &address );
 
-    KABC::Addressee mLeftAddressee;
-    KABC::Addressee mRightAddressee;
+    TDEABC::Addressee mLeftAddressee;
+    TDEABC::Addressee mRightAddressee;
 };
 
 }
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index f54bb8cf9..1b1c3622c 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -124,14 +124,14 @@ void ConfigGuiLdap::initGUI()
   TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() );
   layout->setMargin( KDialog::marginHint() );
 
-  mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST |
-                                            KABC::LdapConfigWidget::W_PORT |
-                                            KABC::LdapConfigWidget::W_USER |
-                                            KABC::LdapConfigWidget::W_PASS |
-                                            KABC::LdapConfigWidget::W_BINDDN |
-                                            KABC::LdapConfigWidget::W_DN |
-                                            KABC::LdapConfigWidget::W_FILTER |
-                                            KABC::LdapConfigWidget::W_AUTHBOX, this );
+  mLdapWidget = new TDEABC::LdapConfigWidget( TDEABC::LdapConfigWidget::W_HOST |
+                                            TDEABC::LdapConfigWidget::W_PORT |
+                                            TDEABC::LdapConfigWidget::W_USER |
+                                            TDEABC::LdapConfigWidget::W_PASS |
+                                            TDEABC::LdapConfigWidget::W_BINDDN |
+                                            TDEABC::LdapConfigWidget::W_DN |
+                                            TDEABC::LdapConfigWidget::W_FILTER |
+                                            TDEABC::LdapConfigWidget::W_AUTHBOX, this );
 
   mKeyAttribute = new KLineEdit( this );
   mSearchScope = new KComboBox( this );
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
index a5a76b784..15741c134 100644
--- a/kitchensync/src/configguildap.h
+++ b/kitchensync/src/configguildap.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 class TQLabel;
 class TQSpinBox;
 
-class KABC::LdapConfigWidget;
+class TDEABC::LdapConfigWidget;
 class KComboBox;
 class KLineEdit;
 
@@ -47,7 +47,7 @@ class ConfigGuiLdap : public ConfigGui
   private:
     void initGUI();
 
-    KABC::LdapConfigWidget *mLdapWidget;
+    TDEABC::LdapConfigWidget *mLdapWidget;
     KLineEdit *mKeyAttribute;
     KComboBox *mSearchScope;
     TQCheckBox *mEncryption;