diff --git a/acinclude.m4 b/acinclude.m4 index 7b75198..5d6febb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2074,7 +2074,7 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KABC, "-ltdeabc") + AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") diff --git a/kerry/src/Makefile.am b/kerry/src/Makefile.am index 78b3fb8..9dc38b3 100644 --- a/kerry/src/Makefile.am +++ b/kerry/src/Makefile.am @@ -28,7 +28,7 @@ kerry_la_SOURCES = main.cpp beaglesearch.cpp kerryapp.cpp searchdlg.cpp searchdl dcopinterface.skel dcopinterface.stub kerrylabel.cpp query.cpp kerry_la_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(GLIB_LDFLAGS) $(LIBBEAGLE_LDFLAGS) $(LIB_QT) -kerry_la_LIBADD = -ltdeio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_KABC) -lDCOP $(LIB_QT) $(LIB_TDECORE) +kerry_la_LIBADD = -ltdeio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_TDEABC) -lDCOP $(LIB_QT) $(LIB_TDECORE) autostartdir = $(datadir)/autostart autostart_DATA = kerry.autostart.desktop beagled.desktop diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp index 13473cb..1e13cae 100644 --- a/kerry/src/searchdlg.cpp +++ b/kerry/src/searchdlg.cpp @@ -728,20 +728,20 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde properties=properties+(*it); if (!m_addressBook) - m_addressBook = KABC::StdAddressBook::self( false ); + m_addressBook = TDEABC::StdAddressBook::self( false ); - KABC::Addressee addresseee = m_addressBook->findByUid( item->uri().mid(8,10) ); + TDEABC::Addressee addresseee = m_addressBook->findByUid( item->uri().mid(8,10) ); TQString number; - number = addresseee.phoneNumber(KABC::PhoneNumber::Work).number(); + number = addresseee.phoneNumber(TDEABC::PhoneNumber::Work).number(); if (!number.isEmpty()) properties=properties+i18n("Business phone: %1").arg(number)+"
"; - number = addresseee.phoneNumber(KABC::PhoneNumber::Cell).number(); + number = addresseee.phoneNumber(TDEABC::PhoneNumber::Cell).number(); if (!number.isEmpty()) properties=properties+i18n("Mobile phone: %1").arg(number)+"
"; - number = addresseee.phoneNumber(KABC::PhoneNumber::Home).number(); + number = addresseee.phoneNumber(TDEABC::PhoneNumber::Home).number(); if (!number.isEmpty()) properties=properties+i18n("Home phone: %1").arg(number)+"
"; @@ -1726,9 +1726,9 @@ void SearchDlg::searchBookmarks(KBookmarkGroup group) void SearchDlg::searchAddressbook() { 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/kerry/src/searchdlg.h b/kerry/src/searchdlg.h index 839e0c7..117ea16 100644 --- a/kerry/src/searchdlg.h +++ b/kerry/src/searchdlg.h @@ -159,7 +159,7 @@ class SearchDlg : public HitsLayout, virtual public dcopIface bool checkUriInResults(const TQString& path) const; KBookmarkManager *bookmarkManager; - KABC::AddressBook* m_addressBook; + TDEABC::AddressBook* m_addressBook; void searchAddressbook(); void searchBookmarks(KBookmarkGroup);