summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-20 16:25:21 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-20 16:25:21 -0600
commit5942d965c8fb73b53495797b81286c182f7e6328 (patch)
tree6a5bc9df85c53a173ee3f51a5ef7fbf02a933529 /kicker
parent7ca042263042aaa2f10aa0f436bf1df91e476c12 (diff)
downloadtdebase-5942d965c8fb73b53495797b81286c182f7e6328.tar.gz
tdebase-5942d965c8fb73b53495797b81286c182f7e6328.zip
Rename KABC namespace
Diffstat (limited to 'kicker')
-rw-r--r--kicker/kicker/Makefile.am2
-rw-r--r--kicker/kicker/ui/Makefile.am2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp6
-rw-r--r--kicker/kicker/ui/k_new_mnu.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am
index c97d61f60..7f3d0b275 100644
--- a/kicker/kicker/Makefile.am
+++ b/kicker/kicker/Makefile.am
@@ -10,7 +10,7 @@ tdeinit_LTLIBRARIES = kicker.la
CLEANFILES = dummy.cpp
kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \
- ui/libkicker_ui.la ../libkicker/libkickermain.la $(LIB_KIO) $(LIB_KUTILS) $(LIB_KABC)
+ ui/libkicker_ui.la ../libkicker/libkickermain.la $(LIB_KIO) $(LIB_KUTILS) $(LIB_TDEABC)
kicker_la_SOURCES = dummy.cpp
kicker_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/kicker/kicker/ui/Makefile.am b/kicker/kicker/ui/Makefile.am
index 04b951d31..f624e35ec 100644
--- a/kicker/kicker/ui/Makefile.am
+++ b/kicker/kicker/ui/Makefile.am
@@ -17,7 +17,7 @@ libkicker_ui_la_SOURCES = addbutton_mnu.cpp appletitem.ui appletview.ui addapple
media_watcher.cpp media_watcher.skel mykickoffsearchinterface.cpp query.cpp
libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/tdmlib/libdmctl.la \
- $(LIB_KABC) ../interfaces/libkickoffsearch_interfaces.la
+ $(LIB_TDEABC) ../interfaces/libkickoffsearch_interfaces.la
libkicker_ui_la_METASOURCES = AUTO
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index dfee118ed..f1781d8b5 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -2114,7 +2114,7 @@ void KMenu::searchBookmarks(KBookmarkGroup group)
void KMenu::initSearch()
{
if (!m_addressBook && KickerSettings::kickoffSearchAddressBook())
- m_addressBook = KABC::StdAddressBook::self( false );
+ m_addressBook = TDEABC::StdAddressBook::self( false );
if (!bookmarkManager)
bookmarkManager = KBookmarkManager::userBookmarksManager();
@@ -2139,9 +2139,9 @@ void KMenu::searchAddressbook()
return;
if (!m_addressBook)
- m_addressBook = KABC::StdAddressBook::self( false );
+ m_addressBook = TDEABC::StdAddressBook::self( false );
- KABC::AddressBook::ConstIterator it = m_addressBook->begin();
+ TDEABC::AddressBook::ConstIterator it = m_addressBook->begin();
while (it!=m_addressBook->end()) {
if (!current_query.matches((*it).assembledName()+' '+(*it).fullEmail())) {
it++;
diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h
index 95545324a..6dff75feb 100644
--- a/kicker/kicker/ui/k_new_mnu.h
+++ b/kicker/kicker/ui/k_new_mnu.h
@@ -276,7 +276,7 @@ private:
TQRegExp emailRegExp,uriRegExp,uri2RegExp,authRegExp;
KBookmarkManager *bookmarkManager;
- KABC::AddressBook* m_addressBook;
+ TDEABC::AddressBook* m_addressBook;
enum ContextMenuEntry { AddItemToPanel, EditItem, AddMenuToPanel, EditMenu,
AddItemToDesktop, AddMenuToDesktop, PutIntoRunDialog,