diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-20 16:26:45 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-20 16:26:45 -0600 |
commit | 45f3927b0ffec2599bc0e1ce361c5386474a85f4 (patch) | |
tree | 29e1842fe4d93f4e99481385a771e8bef061158b /interfaces/tdetexteditor | |
parent | 04105ef07304a9358e87eff0cb1a6d6f2a725192 (diff) | |
download | tdelibs-45f3927b0ffec2599bc0e1ce361c5386474a85f4.tar.gz tdelibs-45f3927b0ffec2599bc0e1ce361c5386474a85f4.zip |
Rename KABC namespace
Diffstat (limited to 'interfaces/tdetexteditor')
-rw-r--r-- | interfaces/tdetexteditor/Makefile.am | 2 | ||||
-rw-r--r-- | interfaces/tdetexteditor/templateinterface.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am index 4035a17f0..7588019e2 100644 --- a/interfaces/tdetexteditor/Makefile.am +++ b/interfaces/tdetexteditor/Makefile.am @@ -23,7 +23,7 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \ libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI) +libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI) tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \ selectioninterface.h cursorinterface.h \ diff --git a/interfaces/tdetexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp index 01e0c292f..25c103196 100644 --- a/interfaces/tdetexteditor/templateinterface.cpp +++ b/interfaces/tdetexteditor/templateinterface.cpp @@ -54,16 +54,16 @@ void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const TQCString &suffix #define INITKABC do { \ if (addrBook==0) { \ - addrBook=KABC::StdAddressBook::self(); \ + addrBook=TDEABC::StdAddressBook::self(); \ userAddress=addrBook->whoAmI(); \ if (userAddress.isEmpty()) { \ if ( KMessageBox::questionYesNo(parentWindow, \ i18n( "This template uses personal data that is stored in the TDE addressbook, but you have not selected a personal entry. You can still use the template without one, but you will have to type personal data. Would you like to select one now?" ), \ "Personal data requested", \ KStdGuiItem::yes(), KStdGuiItem::no(), "select personal data entry") == KMessageBox::Yes ) { \ - userAddress = KABC::AddresseeDialog::getAddressee(parentWindow); \ + userAddress = TDEABC::AddresseeDialog::getAddressee(parentWindow); \ if ( ! userAddress.isEmpty() ) \ - KABC::StdAddressBook::self()->setWhoAmI( userAddress ); \ + TDEABC::StdAddressBook::self()->setWhoAmI( userAddress ); \ }\ /*return false;//no, why??*/ \ } \ @@ -72,8 +72,8 @@ void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const TQCString &suffix bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *parentWindow ) { - KABC::StdAddressBook *addrBook = 0; - KABC::Addressee userAddress; + TDEABC::StdAddressBook *addrBook = 0; + TDEABC::Addressee userAddress; TQDateTime datetime = TQDateTime::currentDateTime(); TQDate date = TQT_TQDATE_OBJECT(datetime.date()); TQTime time = TQT_TQTIME_OBJECT(datetime.time()); |