diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-20 16:12:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-20 16:12:01 -0600 |
| commit | 4ecfc4c6aa1ca5fa24b36007605998d965ae657a (patch) | |
| tree | d9aa4b908eaa74ad1ff7747b7dd9026b3b704bab | |
| parent | 756b495697a5d3035e55720b541ecc6677472e50 (diff) | |
| download | digikam-4ecfc4c6aa1ca5fa24b36007605998d965ae657a.tar.gz digikam-4ecfc4c6aa1ca5fa24b36007605998d965ae657a.zip | |
Rename KABC namespace
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | digikam/digikam/Makefile.am | 2 | ||||
| -rw-r--r-- | digikam/digikam/tagfilterview.cpp | 4 | ||||
| -rw-r--r-- | digikam/digikam/tagfolderview.cpp | 4 | ||||
| -rw-r--r-- | digikam/libs/imageproperties/imagedescedittab.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 6d61b12..bc45063 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2098,7 +2098,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/digikam/digikam/Makefile.am b/digikam/digikam/Makefile.am index 99cae41..1bc99f6 100644 --- a/digikam/digikam/Makefile.am +++ b/digikam/digikam/Makefile.am @@ -114,7 +114,7 @@ libdigikam_la_LIBADD = $(LIB_SQLITE3) \ $(LIB_QT) \ $(LIB_KPARTS) \ $(LIB_KIO) \ - $(LIB_KABC) \ + $(LIB_TDEABC) \ $(LIB_TDEHTML) \ $(LIBKIPI_LIBS) \ $(LIBKEXIV2_LIBS) \ diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp index 27ef49c..6157aeb 100644 --- a/digikam/digikam/tagfilterview.cpp +++ b/digikam/digikam/tagfilterview.cpp @@ -1097,9 +1097,9 @@ void TagFilterView::slotABCContextMenu() d->ABCMenu->clear(); int counter = 100; - KABC::AddressBook* ab = KABC::StdAddressBook::self(); + TDEABC::AddressBook* ab = TDEABC::StdAddressBook::self(); TQStringList names; - for ( KABC::AddressBook::Iterator it = ab->begin(); it != ab->end(); ++it ) + for ( TDEABC::AddressBook::Iterator it = ab->begin(); it != ab->end(); ++it ) { names.push_back(it->formattedName()); } diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp index 26f7bba..2b59aa6 100644 --- a/digikam/digikam/tagfolderview.cpp +++ b/digikam/digikam/tagfolderview.cpp @@ -593,9 +593,9 @@ void TagFolderView::slotABCContextMenu() d->ABCMenu->clear(); int counter = 100; - KABC::AddressBook* ab = KABC::StdAddressBook::self(); + TDEABC::AddressBook* ab = TDEABC::StdAddressBook::self(); TQStringList names; - for ( KABC::AddressBook::Iterator it = ab->begin(); it != ab->end(); ++it ) + for ( TDEABC::AddressBook::Iterator it = ab->begin(); it != ab->end(); ++it ) { names.push_back(it->formattedName()); } diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index 296ea35..cb01526 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -1014,9 +1014,9 @@ void ImageDescEditTab::slotABCContextMenu() d->ABCMenu->clear(); int counter = 100; - KABC::AddressBook* ab = KABC::StdAddressBook::self(); + TDEABC::AddressBook* ab = TDEABC::StdAddressBook::self(); TQStringList names; - for ( KABC::AddressBook::Iterator it = ab->begin(); it != ab->end(); ++it ) + for ( TDEABC::AddressBook::Iterator it = ab->begin(); it != ab->end(); ++it ) { names.push_back(it->formattedName()); } |