From 5942d965c8fb73b53495797b81286c182f7e6328 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 20 Feb 2013 16:25:21 -0600 Subject: [PATCH] Rename KABC namespace --- kicker/kicker/Makefile.am | 2 +- kicker/kicker/ui/Makefile.am | 2 +- kicker/kicker/ui/k_new_mnu.cpp | 6 +++--- kicker/kicker/ui/k_new_mnu.h | 2 +- tdeioslave/ldap/Makefile.am | 2 +- tdeioslave/ldap/tdeio_ldap.cpp | 2 +- tdeioslave/ldap/tdeio_ldap.h | 6 +++--- tdeprint/tdeprintfax/faxab.cpp | 26 +++++++++++++------------- tdeprint/tdeprintfax/faxab.h | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am index c97d61f60..7f3d0b275 100644 --- a/kicker/kicker/Makefile.am +++ b/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) diff --git a/kicker/kicker/ui/Makefile.am b/kicker/kicker/ui/Makefile.am index 04b951d31..f624e35ec 100644 --- a/kicker/kicker/ui/Makefile.am +++ b/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 diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index dfee118ed..f1781d8b5 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/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++; diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index 95545324a..6dff75feb 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/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, diff --git a/tdeioslave/ldap/Makefile.am b/tdeioslave/ldap/Makefile.am index 3f71b669b..f21902229 100644 --- a/tdeioslave/ldap/Makefile.am +++ b/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 diff --git a/tdeioslave/ldap/tdeio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp index 29fc24905..b61c2af74 100644 --- a/tdeioslave/ldap/tdeio_ldap.cpp +++ b/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); } diff --git a/tdeioslave/ldap/tdeio_ldap.h b/tdeioslave/ldap/tdeio_ldap.h index dfab32a71..e39090481 100644 --- a/tdeioslave/ldap/tdeio_ldap.h +++ b/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 ); - int asyncSearch( KABC::LDAPUrl &usrc ); + const TDEABC::LDAPUrl &usrc, bool dir=false ); + 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 ); }; diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp index 14b87a447..1b3eb6131 100644 --- a/tdeprint/tdeprintfax/faxab.cpp +++ b/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(); - for (KABC::AddressBook::Iterator it=bk->begin(); it!=bk->end(); ++it) + TDEABC::AddressBook *bk = TDEABC::StdAddressBook::self(); + for (TDEABC::AddressBook::Iterator it=bk->begin(); it!=bk->end(); ++it) { - KABC::PhoneNumber::List numbers = (*it).phoneNumbers(); - KABC::PhoneNumber::List faxNumbers; - for (TQValueList::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit) + TDEABC::PhoneNumber::List numbers = (*it).phoneNumbers(); + TDEABC::PhoneNumber::List faxNumbers; + for (TQValueList::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(); - for (KABC::AddressBook::Iterator it=bk->begin(); it!=bk->end(); ++it) + TDEABC::AddressBook *bk = TDEABC::StdAddressBook::self(); + 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::Iterator nit=numbers.begin(); nit!=numbers.end(); ++nit) + for (TQValueList::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) diff --git a/tdeprint/tdeprintfax/faxab.h b/tdeprint/tdeprintfax/faxab.h index 8491fb96a..da38fb9d8 100644 --- a/tdeprint/tdeprintfax/faxab.h +++ b/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; };