Rename KABC namespace

kicker/kicker/Makefile.am

@@ -10,7 +10,7 @@ tdeinit_LTLIBRARIES = kicker.la
 CLEANFILES = dummy.cpp
 
 kicker_la_LIBADD = core/libkicker_core.la  buttons/libkicker_buttons.la \
-	ui/libkicker_ui.la ../libkicker/libkickermain.la $(LIB_KIO) $(LIB_KUTILS) $(LIB_KABC)
+	ui/libkicker_ui.la ../libkicker/libkickermain.la $(LIB_KIO) $(LIB_KUTILS) $(LIB_TDEABC)
 
 kicker_la_SOURCES = dummy.cpp
 kicker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)

kicker/kicker/ui/Makefile.am

@@ -17,7 +17,7 @@ libkicker_ui_la_SOURCES = addbutton_mnu.cpp appletitem.ui appletview.ui addapple
         media_watcher.cpp media_watcher.skel mykickoffsearchinterface.cpp query.cpp
 
 libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/tdmlib/libdmctl.la \
-		$(LIB_KABC) ../interfaces/libkickoffsearch_interfaces.la
+		$(LIB_TDEABC) ../interfaces/libkickoffsearch_interfaces.la
 
 libkicker_ui_la_METASOURCES = AUTO
 

kicker/kicker/ui/k_new_mnu.cpp

@@ -2114,7 +2114,7 @@ void KMenu::searchBookmarks(KBookmarkGroup group)
 void KMenu::initSearch()
 {
     if (!m_addressBook && KickerSettings::kickoffSearchAddressBook())
-       m_addressBook = KABC::StdAddressBook::self( false );
+       m_addressBook = TDEABC::StdAddressBook::self( false );
 
     if (!bookmarkManager)
       bookmarkManager = KBookmarkManager::userBookmarksManager();
@@ -2139,9 +2139,9 @@ void KMenu::searchAddressbook()
       return;
 
     if (!m_addressBook)
-      m_addressBook = KABC::StdAddressBook::self( false );
+      m_addressBook = TDEABC::StdAddressBook::self( false );
 
-    KABC::AddressBook::ConstIterator it = m_addressBook->begin();
+    TDEABC::AddressBook::ConstIterator it = m_addressBook->begin();
     while (it!=m_addressBook->end()) {
         if (!current_query.matches((*it).assembledName()+' '+(*it).fullEmail())) {
             it++;

kicker/kicker/ui/k_new_mnu.h

@@ -276,7 +276,7 @@ private:
     TQRegExp emailRegExp,uriRegExp,uri2RegExp,authRegExp;
 
     KBookmarkManager *bookmarkManager;
-    KABC::AddressBook* m_addressBook;
+    TDEABC::AddressBook* m_addressBook;
 
     enum ContextMenuEntry { AddItemToPanel, EditItem, AddMenuToPanel, EditMenu,
                             AddItemToDesktop, AddMenuToDesktop, PutIntoRunDialog,

tdeioslave/ldap/Makefile.am

@@ -10,7 +10,7 @@ LDADD      = $(LIB_KIO) $(LDAP_LIBS)
 kde_module_LTLIBRARIES = tdeio_ldap.la
 
 tdeio_ldap_la_SOURCES = tdeio_ldap.cpp
-tdeio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_KABC)
+tdeio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_TDEABC)
 tdeio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = tdeio_ldap.h

tdeioslave/ldap/tdeio_ldap.cpp

@@ -25,7 +25,7 @@
 #include "tdeio_ldap.h"
 
 using namespace TDEIO;
-using namespace KABC;
+using namespace TDEABC;
 
 extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); }
 

tdeioslave/ldap/tdeio_ldap.h

@@ -52,12 +52,12 @@ class LDAPProtocol : public TDEIO::SlaveBase
     void addModOp( LDAPMod ***pmods, int mod_type, 
       const TQString &attr, const TQByteArray &value );
     void LDAPEntry2UDSEntry( const TQString &dn, TDEIO::UDSEntry &entry, 
-      const KABC::LDAPUrl &usrc, bool dir=false );
+      const TDEABC::LDAPUrl &usrc, bool dir=false );
-    int asyncSearch( KABC::LDAPUrl &usrc );
+    int asyncSearch( TDEABC::LDAPUrl &usrc );
     
     TQCString LDAPEntryAsLDIF( LDAPMessage *msg );
     void LDAPErr( const KURL &url, int err = LDAP_SUCCESS );
-    void changeCheck( KABC::LDAPUrl &url );
+    void changeCheck( TDEABC::LDAPUrl &url );
 
     void fillAuthInfo( TDEIO::AuthInfo &info );
 };

tdeprint/tdeprintfax/faxab.cpp

@@ -66,7 +66,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)
 	resize( conf->readSizeEntry( "ABSize", &defsize ) );
 
 	initialize();
-	connect(KABC::StdAddressBook::self(), TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(slotAbChanged(AddressBook*)));
+	connect(TDEABC::StdAddressBook::self(), TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(slotAbChanged(AddressBook*)));
 }
 
 FaxAB::~FaxAB()
@@ -81,19 +81,19 @@ void FaxAB::initialize()
 	m_entries.clear();
 	m_list->clear();
 
-	KABC::AddressBook	*bk = KABC::StdAddressBook::self();
+	TDEABC::AddressBook	*bk = TDEABC::StdAddressBook::self();
-	for (KABC::AddressBook::Iterator it=bk->begin(); it!=bk->end(); ++it)
+	for (TDEABC::AddressBook::Iterator it=bk->begin(); it!=bk->end(); ++it)
 	{
-		KABC::PhoneNumber::List	numbers = (*it).phoneNumbers();
+		TDEABC::PhoneNumber::List	numbers = (*it).phoneNumbers();
-		KABC::PhoneNumber::List faxNumbers;
+		TDEABC::PhoneNumber::List faxNumbers;
-		for (TQValueList<KABC::PhoneNumber>::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit)
+		for (TQValueList<TDEABC::PhoneNumber>::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit)
 		{
-			if (((*nit).type() & KABC::PhoneNumber::Fax) && !(*nit).number().isEmpty())
+			if (((*nit).type() & TDEABC::PhoneNumber::Fax) && !(*nit).number().isEmpty())
 				faxNumbers << ( *nit );
 		}
 		if (faxNumbers.count() > 0)
 		{
-			for ( KABC::PhoneNumber::List::ConstIterator nit = faxNumbers.begin(); nit != faxNumbers.end(); ++nit )
+			for ( TDEABC::PhoneNumber::List::ConstIterator nit = faxNumbers.begin(); nit != faxNumbers.end(); ++nit )
 			{
 				FaxABEntry entry;
 				entry.m_number = ( *nit );
@@ -176,14 +176,14 @@ bool FaxAB::getEntry(TQStringList& number, TQStringList& name, TQStringList& ent
 
 bool FaxAB::getEntryByNumber(const TQString& number, TQString& name, TQString& enterprise)
 {
-	KABC::AddressBook *bk = KABC::StdAddressBook::self();
+	TDEABC::AddressBook *bk = TDEABC::StdAddressBook::self();
-	for (KABC::AddressBook::Iterator it=bk->begin(); it!=bk->end(); ++it)
+	for (TDEABC::AddressBook::Iterator it=bk->begin(); it!=bk->end(); ++it)
 	{
-		KABC::PhoneNumber::List	numbers = (*it).phoneNumbers();
+		TDEABC::PhoneNumber::List	numbers = (*it).phoneNumbers();
 		TQStringList	filteredNumbers;
-		for (TQValueList<KABC::PhoneNumber>::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit)
+		for (TQValueList<TDEABC::PhoneNumber>::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit)
 		{
-			if (((*nit).type() & KABC::PhoneNumber::Fax) )
+			if (((*nit).type() & TDEABC::PhoneNumber::Fax) )
 			{
 				TQString strippedNumber;
 				for (uint i = 0; i < (*nit).number().length(); ++i)

tdeprint/tdeprintfax/faxab.h

@@ -52,7 +52,7 @@ private:
 	struct FaxABEntry
 	{
 		TQString           m_name;
-		KABC::PhoneNumber m_number;
+		TDEABC::PhoneNumber m_number;
 		TQString           m_enterprise;
 	};