Rename KABC namespace

4 files changed, 15 insertions, 15 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 2416f36..eec5660 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/kmymoney2/Makefile.am b/kmymoney2/Makefile.am
index ee9d0cb..df53831 100644
--- a/kmymoney2/Makefile.am
+++ b/kmymoney2/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = kmymoney2
 
 kmymoney2_SOURCES = kmymoneyutils.cpp kstartuplogo.cpp kmymoney2.cpp main.cpp kmymoney2.stub kmymoney2.skel kmymoneysettings.kcfgc kmymoneyglobalsettings.cpp
 
-kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_KABC) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_KUTILS)
+kmymoney2_LDADD = $(top_builddir)/kmymoney2/views/libviews.a $(top_builddir)/kmymoney2/reports/libreports.a $(top_builddir)/kmymoney2/wizards/newuserwizard/libnewuserwizard.a $(top_builddir)/kmymoney2/wizards/newaccountwizard/libnewaccountwizard.a $(top_builddir)/kmymoney2/wizards/wizardpages/libwizardpages.a $(top_builddir)/kmymoney2/dialogs/libdialogs.a $(top_builddir)/kmymoney2/dialogs/settings/libsettings.a $(top_builddir)/kmymoney2/widgets/libwidgets.a $(top_builddir)/kmymoney2/converter/libconverter.a $(top_builddir)/kmymoney2/mymoney/storage/libstorage.a $(top_builddir)/kmymoney2/mymoney/libkmm_mymoney.la $(top_builddir)/libkgpgfile/libkgpgfile.la $(top_builddir)/kmymoney2/plugins/interfaces/libinterfaces.a $(top_builddir)/kmymoney2/plugins/libkmm_plugin.la $(top_builddir)/libkdchart/libkmm_kdchart.la dialogs/libdialogs.a $(LIB_TDEABC) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_KUTILS)
 
 SUBDIRS = mymoney widgets dialogs wizards views converter pics icons html templates plugins reports misc
 
diff --git a/kmymoney2/dialogs/knewfiledlg.cpp b/kmymoney2/dialogs/knewfiledlg.cpp
index 79b9752..f9ec0a7 100644
--- a/kmymoney2/dialogs/knewfiledlg.cpp
+++ b/kmymoney2/dialogs/knewfiledlg.cpp
@@ -75,8 +75,8 @@ void KNewFileDlg::init(const TQString& title)
     setCaption(title);
 
 #if KDE_IS_VERSION( 3, 1, 90 )
-  KABC::StdAddressBook *ab = static_cast<KABC::StdAddressBook*>
-    ( KABC::StdAddressBook::self() );
+  TDEABC::StdAddressBook *ab = static_cast<TDEABC::StdAddressBook*>
+    ( TDEABC::StdAddressBook::self() );
   if ( ab && !ab->whoAmI().isEmpty() )
       showLoadButton = true;
 #endif
@@ -110,12 +110,12 @@ void KNewFileDlg::okClicked()
 void KNewFileDlg::loadFromKABC(void)
 {
 #if KDE_IS_VERSION( 3, 1, 90 )
-  KABC::StdAddressBook *ab = static_cast<KABC::StdAddressBook*>
-    ( KABC::StdAddressBook::self() );
+  TDEABC::StdAddressBook *ab = static_cast<TDEABC::StdAddressBook*>
+    ( TDEABC::StdAddressBook::self() );
   if ( !ab )
     return;
 
-  KABC::Addressee addr = ab->whoAmI();
+  TDEABC::Addressee addr = ab->whoAmI();
   if ( addr.isEmpty() ) {
     KMessageBox::sorry(this, i18n("Unable to load data, because no contact has been associated with the owner of the standard addressbook."), i18n("Addressbook import"));
     return;
@@ -124,10 +124,10 @@ void KNewFileDlg::loadFromKABC(void)
   userNameEdit->setText( addr.formattedName() );
   emailEdit->setText( addr.preferredEmail() );
 
-  KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home );
+  TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Home );
   telephoneEdit->setText( phone.number() );
 
-  KABC::Address a = addr.address( KABC::Address::Home );
+  TDEABC::Address a = addr.address( TDEABC::Address::Home );
   countyEdit->setText( a.country() + " / " + a.region() );
   postcodeEdit->setText( a.postalCode() );
   townEdit->setText( a.locality() );
diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
index 52823df..dd8bb82 100644
--- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
+++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
@@ -171,7 +171,7 @@ GeneralPage::GeneralPage(Wizard* wizard, const char* name) :
   WizardPage<Wizard>(stepCount++, this, wizard, name)
 {
   m_userNameEdit->setFocus();
-  KABC::StdAddressBook *ab = KABC::StdAddressBook::self(true);
+  TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self(true);
   connect(ab, TQT_SIGNAL(addressBookChanged(AddressBook*)), this, TQT_SLOT(slotAddressBookLoaded()));
   connect(m_loadAddressButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadFromKABC()));
   m_loadAddressButton->setEnabled(false);
@@ -179,7 +179,7 @@ GeneralPage::GeneralPage(Wizard* wizard, const char* name) :
 
 void GeneralPage::slotAddressBookLoaded(void)
 {
-  KABC::StdAddressBook *ab = KABC::StdAddressBook::self();
+  TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self();
   if (!ab)
     return;
 
@@ -188,11 +188,11 @@ void GeneralPage::slotAddressBookLoaded(void)
 
 void GeneralPage::slotLoadFromKABC(void)
 {
-  KABC::StdAddressBook *ab = KABC::StdAddressBook::self();
+  TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self();
   if (!ab)
     return;
 
-  KABC::Addressee addr = ab->whoAmI();
+  TDEABC::Addressee addr = ab->whoAmI();
   if ( addr.isEmpty() ) {
     KMessageBox::sorry(this, i18n("Unable to load data, because no contact has been associated with the owner of the standard addressbook."), i18n("Addressbook import"));
     return;
@@ -201,10 +201,10 @@ void GeneralPage::slotLoadFromKABC(void)
   m_userNameEdit->setText( addr.formattedName() );
   m_emailEdit->setText( addr.preferredEmail() );
 
-  KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home );
+  TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Home );
   m_telephoneEdit->setText( phone.number() );
 
-  KABC::Address a = addr.address( KABC::Address::Home );
+  TDEABC::Address a = addr.address( TDEABC::Address::Home );
   TQString sep;
   if(!a.country().isEmpty() && !a.region().isEmpty())
     sep = " / ";