From 82be30e1721d153b0592f2f01b421a9bc6999233 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 20 Feb 2013 16:27:59 -0600 Subject: Rename KABC namespace --- kgpg/Makefile.am | 2 +- kgpg/listkeys.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kgpg/Makefile.am b/kgpg/Makefile.am index 7cb6316..64de0b6 100644 --- a/kgpg/Makefile.am +++ b/kgpg/Makefile.am @@ -11,7 +11,7 @@ kgpg_SOURCES = kgpgoptions.cpp listkeys.cpp popuppublic.cpp kgpgview.cpp \ keyproperties.ui conf_encryption.ui conf_decryption.ui conf_gpg.ui dcopiface.skel \ keyinfowidget.cpp groupedit.ui kgpgrevokewidget.ui newkey.ui adduid.ui keyexport.ui \ sourceselect.ui kgpgsettings.kcfgc conf_servers.ui conf_ui2.ui conf_misc.ui -kgpg_LDADD = $(LIB_KIO) $(LIB_KABC) -ltdeutils -ltdeprint +kgpg_LDADD = $(LIB_KIO) $(LIB_TDEABC) -ltdeutils -ltdeprint pics_DATA= kgpg_anim.gif kgpg_docked.png kgpg_docked.gif kgpg_blank.png kgpg_fill.png picsdir=$(kde_datadir)/kgpg/pics diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index f42e6b7..f7af318 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -1119,18 +1119,18 @@ void listKeys::findNextKey() void listKeys::addToKAB() { - KABC::Key key; + TDEABC::Key key; if (!keysList2->currentItem()) return; //TQString email=extractKeyMail(keysList2->currentItem()).stripWhiteSpace(); TQString email=keysList2->currentItem()->text(1); - KABC::AddressBook *ab = KABC::StdAddressBook::self(); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self(); if ( !ab->load() ) { KMessageBox::sorry(this,i18n("Unable to contact the address book. Please check your installation.")); return; } - KABC::Addressee::List addresseeList = ab->findByEmail(email); + TDEABC::Addressee::List addresseeList = ab->findByEmail(email); kapp->startServiceByDesktopName( "kaddressbook" ); DCOPRef call( "kaddressbook", "KAddressBookIface" ); if( !addresseeList.isEmpty() ) { @@ -1144,12 +1144,12 @@ void listKeys::addToKAB() /* void listKeys::allToKAB() { - KABC::Key key; + TDEABC::Key key; TQString email; TQStringList keylist; - KABC::Addressee a; + TDEABC::Addressee a; - KABC::AddressBook *ab = KABC::StdAddressBook::self(); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self(); if ( !ab->load() ) { KMessageBox::sorry(this,i18n("Unable to contact the address book. Please check your installation.")); return; @@ -1159,7 +1159,7 @@ void listKeys::allToKAB() while( myChild ) { //email=extractKeyMail(myChild).stripWhiteSpace(); email=myChild->text(1); - KABC::Addressee::List addressees = ab->findByEmail( email ); + TDEABC::Addressee::List addressees = ab->findByEmail( email ); if (addressees.count()==1) { a=addressees.first(); KgpgInterface *ks=new KgpgInterface(); @@ -1171,7 +1171,7 @@ void listKeys::allToKAB() // doSomething( myChild ); myChild = myChild->nextSibling(); } - KABC::StdAddressBook::save(); + TDEABC::StdAddressBook::save(); if (!keylist.isEmpty()) KMessageBox::informationList(this,i18n("The following keys were exported to the address book:"),keylist); else -- cgit v1.2.1