summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-20 16:20:49 -0600
committerTimothy Pearson <[email protected]>2013-02-20 16:20:49 -0600
commitddbeadcbd0b5659ae5e8171937303cab42e65ae3 (patch)
treed546620caeb21a41041e1107a416e31ac3777f5e
parentf30a2ee143c5c4de2891c497526e921418b06fe6 (diff)
downloadtellico-ddbeadcbd0b5659ae5e8171937303cab42e65ae3.tar.gz
tellico-ddbeadcbd0b5659ae5e8171937303cab42e65ae3.zip
Rename KABC namespace
-rw-r--r--acinclude.m42
-rw-r--r--src/Makefile.am2
-rw-r--r--src/borrowerdialog.cpp8
-rw-r--r--src/borrowerdialog.h4
-rw-r--r--src/loandialog.cpp6
5 files changed, 11 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 42b6e20..c6e3901 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2079,7 +2079,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/src/Makefile.am b/src/Makefile.am
index 0f45142..53220b2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ tellico_LDADD = ./core/libcore.a ./cite/libcite.a ./fetch/libfetch.a \
./translators/pilotdb/libpalm/liblibpalm.a ./rtf2html/librtf2html.a \
./commands/libcommands.a -lexslt $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) \
$(LIBSOCKET) $(LIBXSLT_LIBS) $(TAGLIB_LIBS) $(KCDDB_LIBS) $(YAZ_LIBS) $(LIB_KIO) \
- $(LIB_KABC) $(KCAL_LIBS) $(LDADD_LIBBTPARSE) $(LIB_KNEWSTUFF) $(EXEMPI_LIBS) \
+ $(LIB_TDEABC) $(KCAL_LIBS) $(LDADD_LIBBTPARSE) $(LIB_KNEWSTUFF) $(EXEMPI_LIBS) \
$(POPPLER_LIBS) $(LDADD_LIBBARCODE) $(LIBXML_LIBS)
EXTRA_DIST = tellicoui.rc tellicorc \
diff --git a/src/borrowerdialog.cpp b/src/borrowerdialog.cpp
index 1a3b10c..fca07d2 100644
--- a/src/borrowerdialog.cpp
+++ b/src/borrowerdialog.cpp
@@ -25,7 +25,7 @@
using Tellico::BorrowerDialog;
-BorrowerDialog::Item::Item(TDEListView* parent_, const KABC::Addressee& add_)
+BorrowerDialog::Item::Item(TDEListView* parent_, const TDEABC::Addressee& add_)
: TDEListViewItem(parent_), m_uid(add_.uid()) {
setText(0, add_.realName());
setPixmap(0, SmallIcon(TQString::fromLatin1("kaddressbook")));
@@ -58,7 +58,7 @@ BorrowerDialog::BorrowerDialog(TQWidget* parent_, const char* name_/*=0*/)
m_lineEdit->setFocus();
m_lineEdit->completionObject()->setIgnoreCase(true);
- KABC::AddressBook* abook = KABC::StdAddressBook::self(true);
+ TDEABC::AddressBook* abook = TDEABC::StdAddressBook::self(true);
connect(abook, TQT_SIGNAL(addressBookChanged(AddressBook*)),
TQT_SLOT(slotLoadAddressBook()));
connect(abook, TQT_SIGNAL(loadingFinished(Resource*)),
@@ -73,8 +73,8 @@ void BorrowerDialog::slotLoadAddressBook() {
m_itemDict.clear();
m_lineEdit->completionObject()->clear();
- const KABC::AddressBook* const abook = KABC::StdAddressBook::self(true);
- for(KABC::AddressBook::ConstIterator it = abook->begin(), end = abook->end();
+ const TDEABC::AddressBook* const abook = TDEABC::StdAddressBook::self(true);
+ for(TDEABC::AddressBook::ConstIterator it = abook->begin(), end = abook->end();
it != end; ++it) {
// skip people with no name
if((*it).realName().isEmpty()) {
diff --git a/src/borrowerdialog.h b/src/borrowerdialog.h
index 4d520ef..ba2b64b 100644
--- a/src/borrowerdialog.h
+++ b/src/borrowerdialog.h
@@ -23,7 +23,7 @@ class KLineEdit;
#include <tdelistview.h>
#include <tqdict.h>
-namespace KABC {
+namespace TDEABC {
class Addressee;
}
@@ -61,7 +61,7 @@ private:
class Item : public TDEListViewItem {
public:
- Item(TDEListView* parent, const KABC::Addressee& addressee);
+ Item(TDEListView* parent, const TDEABC::Addressee& addressee);
Item(TDEListView* parent, const Data::Borrower& borrower);
const TQString& uid() const { return m_uid; }
diff --git a/src/loandialog.cpp b/src/loandialog.cpp
index 0e9d538..fcaed2c 100644
--- a/src/loandialog.cpp
+++ b/src/loandialog.cpp
@@ -160,7 +160,7 @@ void LoanDialog::init() {
resize(configDialogSize(TQString::fromLatin1("Loan Dialog Options")));
- KABC::AddressBook* abook = KABC::StdAddressBook::self(true);
+ TDEABC::AddressBook* abook = TDEABC::StdAddressBook::self(true);
connect(abook, TQT_SIGNAL(addressBookChanged(AddressBook*)),
TQT_SLOT(slotLoadAddressBook()));
connect(abook, TQT_SIGNAL(loadingFinished(Resource*)),
@@ -193,8 +193,8 @@ void LoanDialog::slotGetBorrower() {
void LoanDialog::slotLoadAddressBook() {
m_borrowerEdit->completionObject()->clear();
- const KABC::AddressBook* const abook = KABC::StdAddressBook::self(true);
- for(KABC::AddressBook::ConstIterator it = abook->begin(), end = abook->end();
+ const TDEABC::AddressBook* const abook = TDEABC::StdAddressBook::self(true);
+ for(TDEABC::AddressBook::ConstIterator it = abook->begin(), end = abook->end();
it != end; ++it) {
m_borrowerEdit->completionObject()->addItem((*it).realName());
}