diff options
-rw-r--r-- | AUTHORS | 2 | ||||
-rw-r--r-- | Documentation/ConduitProgrammingTutorial/index.tex | 2 | ||||
m--------- | admin | 0 | ||||
-rw-r--r-- | conduits/abbrowserconduit/CMakeLists.txt | 4 | ||||
-rw-r--r-- | conduits/abbrowserconduit/Makefile.am | 6 | ||||
-rw-r--r-- | conduits/abbrowserconduit/abbrowser-conduit.cc | 22 | ||||
-rw-r--r-- | conduits/abbrowserconduit/abbrowser-conduit.h | 2 | ||||
-rw-r--r-- | conduits/abbrowserconduit/tdeabcRecord.cc (renamed from conduits/abbrowserconduit/kabcRecord.cc) | 14 | ||||
-rw-r--r-- | conduits/abbrowserconduit/tdeabcRecord.h (renamed from conduits/abbrowserconduit/kabcRecord.h) | 6 | ||||
-rw-r--r-- | conduits/configure.in.in | 2 | ||||
-rw-r--r-- | conduits/docconduit/CMakeLists.txt | 2 | ||||
-rw-r--r-- | conduits/docconduit/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/notepadconduit/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/popmail/Makefile.am | 2 | ||||
-rw-r--r-- | conduits/sysinfoconduit/Makefile.am | 2 | ||||
-rw-r--r-- | kpilot/CMakeLists.txt | 6 | ||||
-rw-r--r-- | kpilot/Makefile.am | 10 | ||||
-rw-r--r-- | lib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | lib/kpilotlink.h | 2 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 2 |
21 files changed, 47 insertions, 47 deletions
@@ -12,7 +12,7 @@ o Philipp Hullmann fixed many bugs in the todo conduit. o David Bishop converted most of the UI to Qt Designer .ui. o Reinhold Kainhofer fixed and extended the VCal conduits when it was really needed. -o The addressbook conduit was rewritten by R. Kainhofer to use libkabc +o The addressbook conduit was rewritten by R. Kainhofer to use libtdeabc o The time conduit, the MAL conduit (AvantGo) and the PalmDOC conduit were also written by R. Kainhofer o Aaron J. Seigo, Jorg Habenicht, and others contributed too. diff --git a/Documentation/ConduitProgrammingTutorial/index.tex b/Documentation/ConduitProgrammingTutorial/index.tex index 89dd599..35bdc00 100644 --- a/Documentation/ConduitProgrammingTutorial/index.tex +++ b/Documentation/ConduitProgrammingTutorial/index.tex @@ -1572,7 +1572,7 @@ point of view > 1) Do I understand it right from the ksync proposal on pim.kde.org that > kitchensync is the application that does all the communication with the -> "devices" (korganizer, palm, opie, kabc, local files etc.), while ksync is +> "devices" (korganizer, palm, opie, tdeabc, local files etc.), while ksync is > just the abstract library with the sync algorithm framework? It's a bit more. diff --git a/admin b/admin -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 diff --git a/conduits/abbrowserconduit/CMakeLists.txt b/conduits/abbrowserconduit/CMakeLists.txt index 07b65e1..e89c097 100644 --- a/conduits/abbrowserconduit/CMakeLists.txt +++ b/conduits/abbrowserconduit/CMakeLists.txt @@ -6,7 +6,7 @@ set(conduit_abbrowser_SRCS resolutionDialog.cc abbrowser-factory.cc abbrowser-setup.cc - kabcRecord.cc + tdeabcRecord.cc abbrowser-conduit.cc ) @@ -23,7 +23,7 @@ kde3_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS}) trinity_add_ui_files(conduit_abbrowser_SRCS ${conduit_abbrowser_UIS}) trinity_automoc(${conduit_abbrowser_SRCS}) add_library(conduit_address SHARED ${conduit_abbrowser_SRCS}) -target_link_libraries(conduit_address kabc_file kabc) +target_link_libraries(conduit_address tdeabc_file tdeabc) set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib PREFIX "" diff --git a/conduits/abbrowserconduit/Makefile.am b/conduits/abbrowserconduit/Makefile.am index 708a0ee..8aaf6a1 100644 --- a/conduits/abbrowserconduit/Makefile.am +++ b/conduits/abbrowserconduit/Makefile.am @@ -9,7 +9,7 @@ conduit_address_la_SOURCES = \ resolutionDialog.cc \ abbrowser-factory.cc \ abbrowser-setup.cc \ - kabcRecord.cc \ + tdeabcRecord.cc \ abbrowser-conduit.cc conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui conduit_address_la_LIBADD = ../../lib/libkpilot.la -ltdeabc -ltdeabc_file @@ -18,7 +18,7 @@ servicedir = $(kde_servicesdir) service_DATA = abbrowser_conduit.desktop kde_kcfg_DATA = abbrowserconduit.kcfg -kabcustompagedir = $(kde_datadir)/kaddressbook/contacteditorpages -kabcustompage_DATA = KPilotCustomFieldEditor.ui +tdeabcustompagedir = $(kde_datadir)/kaddressbook/contacteditorpages +tdeabcustompage_DATA = KPilotCustomFieldEditor.ui METASOURCES = AUTO diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc index f89e78f..c4441b1 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.cc +++ b/conduits/abbrowserconduit/abbrowser-conduit.cc @@ -5,7 +5,7 @@ ** Copyright (C) 2007 by Adriaan de Groot <groot@kde.org> ** ** The abbrowser conduit copies addresses from the Pilot's address book to -** the KDE addressbook maintained via the kabc library. +** the KDE addressbook maintained via the tdeabc library. */ /* @@ -49,7 +49,7 @@ #include "resolutionDialog.h" #include "resolutionTable.h" #include "abbrowserSettings.h" -#include "kabcRecord.h" +#include "tdeabcRecord.h" #include "abbrowser-conduit.moc" @@ -765,7 +765,7 @@ void AbbrowserConduit::slotDeletedRecord() Addressee e = aBook->findByUid(uid); DEBUGKPILOT << fname << ": now looking at palm id: [" - << id << "], kabc uid: [" << uid << "]." << endl; + << id << "], tdeabc uid: [" << uid << "]." << endl; PilotAddress*backupAddr=0L; if (backupRec) @@ -1234,13 +1234,13 @@ bool AbbrowserConduit::_savePCAddr(Addressee &pcAddr, PilotAddress*, long pilotIdL = pilotId.toLong(); if(!pilotId.isEmpty()) { - // because we maintain a mapping between pilotId -> kabc uid, whenever we add + // because we maintain a mapping between pilotId -> tdeabc uid, whenever we add // a new relationship, we have to remove any old mapping that would tie a different - // pilot id -> this kabc uid + // pilot id -> this tdeabc uid TQMap < recordid_t, TQString>::iterator it; for ( it = addresseeMap.begin(); it != addresseeMap.end(); ++it ) { - TQString kabcUid = it.data(); - if (kabcUid == pcAddr.uid()) { + TQString tdeabcUid = it.data(); + if (tdeabcUid == pcAddr.uid()) { addresseeMap.remove(it); break; } @@ -1348,7 +1348,7 @@ bool AbbrowserConduit::_equal(const PilotAddress *piAddress, const Addressee &ab for (TQStringList::Iterator it = piEmails.begin(); it != piEmails.end(); it++) { if (!abEmails.contains(*it)) { - DEBUGKPILOT << fname << ": kabc e-mail missing" << endl; + DEBUGKPILOT << fname << ": tdeabc e-mail missing" << endl; return false; } } @@ -1359,7 +1359,7 @@ bool AbbrowserConduit::_equal(const PilotAddress *piAddress, const Addressee &ab PhoneNumber::List abPhones(abEntry.phoneNumbers()); PhoneNumber::List piPhones = TDEABCSync::getPhoneNumbers(*piAddress); - // first make sure that all of the pilot phone numbers are in kabc + // first make sure that all of the pilot phone numbers are in tdeabc for (PhoneNumber::List::Iterator it = piPhones.begin(); it != piPhones.end(); it++) { PhoneNumber piPhone = *it; bool found=false; @@ -1375,11 +1375,11 @@ bool AbbrowserConduit::_equal(const PilotAddress *piAddress, const Addressee &ab } } if (!found) { - DEBUGKPILOT << fname << ": not equal because kabc phone not found." << endl; + DEBUGKPILOT << fname << ": not equal because tdeabc phone not found." << endl; return false; } } - // now the other way. *cringe* kabc has the capacity to store way more addresses + // now the other way. *cringe* tdeabc has the capacity to store way more addresses // than the Pilot, so this might give false positives more than we'd want.... for (PhoneNumber::List::Iterator it = abPhones.begin(); it != abPhones.end(); it++) { PhoneNumber abPhone = *it; diff --git a/conduits/abbrowserconduit/abbrowser-conduit.h b/conduits/abbrowserconduit/abbrowser-conduit.h index 652915c..3f017eb 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.h +++ b/conduits/abbrowserconduit/abbrowser-conduit.h @@ -35,7 +35,7 @@ #include <pilotAddress.h> #include <plugin.h> -#include "kabcRecord.h" +#include "tdeabcRecord.h" class ResolutionTable; diff --git a/conduits/abbrowserconduit/kabcRecord.cc b/conduits/abbrowserconduit/tdeabcRecord.cc index dae2539..275450d 100644 --- a/conduits/abbrowserconduit/kabcRecord.cc +++ b/conduits/abbrowserconduit/tdeabcRecord.cc @@ -5,7 +5,7 @@ ** Copyright (C) 2007 by Adriaan de Groot <groot@kde.org> ** ** The abbrowser conduit copies addresses from the Pilot's address book to -** the KDE addressbook maintained via the kabc library. This file +** the KDE addressbook maintained via the tdeabc library. This file ** deals with the actual copying of HH addresses to KABC addresses ** and back again. */ @@ -38,7 +38,7 @@ #include <tdeglobal.h> #include <tdeabc/addressee.h> -#include "kabcRecord.h" +#include "tdeabcRecord.h" /** * Okay, this is so that we can map the Pilot phone types to Phone Number @@ -590,9 +590,9 @@ void TDEABCSync::copy(TDEABC::Addressee &toAbEntry, // the other phone number fields toAbEntry.setEmails(fromPiAddr.getEmails()); - // going from Pilot to kabc, we need to clear out all phone records in kabc + // going from Pilot to tdeabc, we need to clear out all phone records in tdeabc // so that they can be set from the Pilot. If we do not do this, then records - // will be left in kabc when they are removed from the Pilot and we'll look + // will be left in tdeabc when they are removed from the Pilot and we'll look // broken. TDEABC::PhoneNumber::List old = toAbEntry.phoneNumbers(); for (TDEABC::PhoneNumber::List::Iterator it = old.begin(); it != old.end(); ++it) { @@ -600,7 +600,7 @@ void TDEABCSync::copy(TDEABC::Addressee &toAbEntry, toAbEntry.removePhoneNumber(phone); } - // now, get the phone numbers from the Pilot and set them one at a time in kabc + // now, get the phone numbers from the Pilot and set them one at a time in tdeabc TDEABC::PhoneNumber::List phones = TDEABCSync::getPhoneNumbers(fromPiAddr); for (TDEABC::PhoneNumber::List::Iterator it = phones.begin(); it != phones.end(); ++it) { TDEABC::PhoneNumber phone = *it; @@ -618,9 +618,9 @@ void TDEABCSync::copy(TDEABC::Addressee &toAbEntry, TDEABCSync::setFieldFromHHOtherPhone(toAbEntry, fromPiAddr.getPhoneField(PilotAddressInfo::eOther),syncSettings); - // going from Pilot to kabc, we need to clear out all addresses in kabc + // going from Pilot to tdeabc, we need to clear out all addresses in tdeabc // so that they can be set from the Pilot. If we do not do this, then records - // will be left in kabc when they are removed from the Pilot and we'll look + // will be left in tdeabc when they are removed from the Pilot and we'll look // broken. TDEABC::Address::List oAddr = toAbEntry.addresses(); for (TDEABC::Address::List::Iterator it = oAddr.begin(); it != oAddr.end(); ++it) { diff --git a/conduits/abbrowserconduit/kabcRecord.h b/conduits/abbrowserconduit/tdeabcRecord.h index 4efb10d..390a212 100644 --- a/conduits/abbrowserconduit/kabcRecord.h +++ b/conduits/abbrowserconduit/tdeabcRecord.h @@ -1,5 +1,5 @@ -#ifndef _KPILOT_KABCRECORD_H -#define _KPILOT_KABCRECORD_H +#ifndef _KPILOT_TDEABCRECORD_H +#define _KPILOT_TDEABCRECORD_H /* KPilot ** ** Copyright (C) 2000,2001 by Dan Pilone @@ -7,7 +7,7 @@ ** Copyright (C) 2007 by Adriaan de Groot <groot@kde.org> ** ** The abbrowser conduit copies addresses from the Pilot's address book to -** the KDE addressbook maintained via the kabc library. This file +** the KDE addressbook maintained via the tdeabc library. This file ** deals with the actual copying of HH addresses to KABC addresses ** and back again. */ diff --git a/conduits/configure.in.in b/conduits/configure.in.in index db7d8d7..ae2359d 100644 --- a/conduits/configure.in.in +++ b/conduits/configure.in.in @@ -23,7 +23,7 @@ dnl dnl dnl Questions and comments can be sent to kde-pim@kde.org dnl -dnl This was copied and adapted from kabc's ldap configure.in.in +dnl This was copied and adapted from tdeabc's ldap configure.in.in AC_DEFUN([KPILOT_CHECK_MAL], diff --git a/conduits/docconduit/CMakeLists.txt b/conduits/docconduit/CMakeLists.txt index 8793b28..72e6445 100644 --- a/conduits/docconduit/CMakeLists.txt +++ b/conduits/docconduit/CMakeLists.txt @@ -58,7 +58,7 @@ kde3_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc) trinity_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui) trinity_automoc(${kpalmdoc_SRCS}) add_executable(kpalmdoc ${kpalmdoc_SRCS}) -target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot tdeui kio) +target_link_libraries(kpalmdoc ${QT_LIBRARIES} kpilot tdeui tdeio) kpilot_rpath(kpalmdoc) install( diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am index 617df41..2e1f79c 100644 --- a/conduits/docconduit/Makefile.am +++ b/conduits/docconduit/Makefile.am @@ -28,7 +28,7 @@ conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ ##libpalmdoc_shared.la kpalmdoc_SOURCES = kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cc kpalmdoc.cpp -kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kpalmdoc_LDADD = $(LIB_TDEFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la xdg_apps_DATA = kpalmdoc.desktop diff --git a/conduits/notepadconduit/Makefile.am b/conduits/notepadconduit/Makefile.am index 1e2c35c..33ab473 100644 --- a/conduits/notepadconduit/Makefile.am +++ b/conduits/notepadconduit/Makefile.am @@ -10,5 +10,5 @@ kde_module_LTLIBRARIES = conduit_notepad.la conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \ notepad-conduit.cc notepad-factory.cc conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KIO) +conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEIO) diff --git a/conduits/popmail/Makefile.am b/conduits/popmail/Makefile.am index 3a87f22..cc1e444 100644 --- a/conduits/popmail/Makefile.am +++ b/conduits/popmail/Makefile.am @@ -17,7 +17,7 @@ conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \ popmail-factory.cc setupDialog.cc \ popmail-conduit.cc conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -lDCOP -conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_KIO) +conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEIO) # this option you can leave out. Just, if you use "make dist", you need it noinst_HEADERS = popmail-conduit.h setupDialog.h diff --git a/conduits/sysinfoconduit/Makefile.am b/conduits/sysinfoconduit/Makefile.am index b1f87be..d8f48ae 100644 --- a/conduits/sysinfoconduit/Makefile.am +++ b/conduits/sysinfoconduit/Makefile.am @@ -16,7 +16,7 @@ conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \ sysinfo-conduit.cc \ sysinfo-setup_dialog.ui conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -ltdecore -ltdeio -ltdeui -conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_KIO) +conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEIO) kpilot_sysinfo_data_DATA = Template.html Template.txt kpilot_sysinfo_datadir = $(kde_datadir)/kpilot/sysinfoconduit diff --git a/kpilot/CMakeLists.txt b/kpilot/CMakeLists.txt index 8f10499..5144077 100644 --- a/kpilot/CMakeLists.txt +++ b/kpilot/CMakeLists.txt @@ -79,7 +79,7 @@ kde3_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h) trinity_automoc(${kpilotTest_SRCS}) add_executable(kpilotTest ${kpilotTest_SRCS}) -target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot tdeui kio) +target_link_libraries(kpilotTest ${QT_LIBRARIES} kpilot tdeui tdeio) kpilot_rpath(kpilotTest) ### @@ -99,7 +99,7 @@ kde3_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h) kde3_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h) trinity_automoc(${kpilotDaemon_SRCS}) add_executable(kpilotDaemon ${kpilotDaemon_SRCS}) -target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot tdeui kio) +target_link_libraries(kpilotDaemon ${QT_LIBRARIES} kpilot tdeui tdeio) kpilot_rpath(kpilotDaemon) ### @@ -137,7 +137,7 @@ kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h) kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h) trinity_automoc(${kpilot_SRCS}) add_executable(kpilot_bin ${kpilot_SRCS}) -target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot tdeutils tdeui kio) +target_link_libraries(kpilot_bin ${QT_LIBRARIES} kpilot tdeutils tdeui tdeio) kpilot_rpath(kpilot_bin) set_target_properties(kpilot_bin PROPERTIES OUTPUT_NAME kpilot diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am index 6e71abc..e715651 100644 --- a/kpilot/Makefile.am +++ b/kpilot/Makefile.am @@ -18,7 +18,7 @@ METASOURCES = AUTO INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes) libconfiguration_la_SOURCES = kpilotConfig.cc kpilotSettings.kcfgc -libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \ kpilotConfigDialog_device.ui \ @@ -35,7 +35,7 @@ kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub kpilotConfigDialog.cc \ kpilotConfigWizard_app.ui \ kpilotConfigWizard.cc \ dbSelectionDialog.cc dbSelection_base.ui -kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module -avoid-version -no-undefined +kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module -avoid-version -no-undefined kcm_kpilot_la_LIBADD = $(LIB_TDEFILE) $(PISOCK_LIB) \ ../lib/libkpilot.la \ libconfiguration.la @@ -68,9 +68,9 @@ kpilotTest_SOURCES = \ main-test.cc -kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 27378f4..ff15f2f 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -55,7 +55,7 @@ set(lib_SRCS trinity_automoc(${lib_SRCS}) kde3_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc) add_library(kpilot SHARED ${lib_SRCS}) -target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${QT_LIBRARIES} tdeui kio) +target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${QT_LIBRARIES} tdeui tdeio) kpilot_rpath(kpilot) #---------- INSTALL -----------------------* diff --git a/lib/Makefile.am b/lib/Makefile.am index dba5780..2da70b3 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -29,7 +29,7 @@ libkpilot_la_SOURCES = kpilotlibSettings.kcfgc \ pilotTodoEntry.cc libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH) -libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_TDEUI) $(LIB_TDEABC) -lkcal $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_KIO) +libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_TDEUI) $(LIB_TDEABC) -lkcal $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEIO) kpilotincludedir = $(includedir)/kpilot kpilotinclude_HEADERS = \ diff --git a/lib/kpilotlink.h b/lib/kpilotlink.h index bfb8e92..c2fde40 100644 --- a/lib/kpilotlink.h +++ b/lib/kpilotlink.h @@ -118,7 +118,7 @@ class PilotDatabase; * Sometimes, however, periods of inactivity cannot be avoided -- * for instance, if you _have_ to ask the user something during a * sync, or if you are fetching a large amount of data from a slow -* source (libkabc can do that, if your addressbook is on an LDAP +* source (libtdeabc can do that, if your addressbook is on an LDAP * server). During these periods of inactivity (as far as the Pilot * can tell), you can "tickle" the Pilot to keep it awake. This * prevents the communications from being shut down. It's not diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8ad47a8..eaad4db 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -50,6 +50,6 @@ endif (HAVE_CALENDARLOCAL_H) set(importaddresses_SRCS importaddresses.cc) trinity_add_executable(importaddresses ${importaddresses_SRCS}) -target_link_libraries(importaddresses kpilot ${QT_LIBRARIES} kabc kabc_file) +target_link_libraries(importaddresses kpilot ${QT_LIBRARIES} tdeabc tdeabc_file) add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses) |