summaryrefslogtreecommitdiffstats
path: root/kaddressbook
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook')
-rw-r--r--kaddressbook/Makefile.am4
-rw-r--r--kaddressbook/kabcore.cpp6
-rw-r--r--kaddressbook/kcmconfigs/Makefile.am4
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp4
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp4
-rw-r--r--kaddressbook/nameeditdialog.cpp2
-rw-r--r--kaddressbook/views/Makefile.am6
-rw-r--r--kaddressbook/xxport/Makefile.am18
-rw-r--r--kaddressbook/xxport/bookmark_xxport.cpp2
9 files changed, 25 insertions, 25 deletions
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am
index 3ae6e6366..16026acae 100644
--- a/kaddressbook/Makefile.am
+++ b/kaddressbook/Makefile.am
@@ -17,14 +17,14 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
bin_PROGRAMS = kaddressbook
kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
-kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kaddressbook_LDADD = libkaddressbook.la
kde_module_LTLIBRARIES = libkaddressbookpart.la
libkaddressbookpart_la_SOURCES = kaddressbook_part.cpp
libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lDCOP
+libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lDCOP
lib_LTLIBRARIES = libkaddressbook.la
libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 6a7ece0e8..27b71139d 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -272,10 +272,10 @@ TQStringList KABCore::selectedUIDs() const
TDEABC::Resource *KABCore::requestResource( TQWidget *parent )
{
- TQPtrList<TDEABC::Resource> kabcResources = addressBook()->resources();
+ TQPtrList<TDEABC::Resource> tdeabcResources = addressBook()->resources();
TQPtrList<KRES::Resource> kresResources;
- TQPtrListIterator<TDEABC::Resource> resIt( kabcResources );
+ TQPtrListIterator<TDEABC::Resource> resIt( tdeabcResources );
TDEABC::Resource *resource;
while ( ( resource = resIt.current() ) != 0 ) {
++resIt;
@@ -320,7 +320,7 @@ TDEAboutData *KABCore::createAboutData()
about->addAuthor( "Tobias Koenig", I18N_NOOP( "Previous maintainer" ), "[email protected]" );
about->addAuthor( "Don Sanders", I18N_NOOP( "Original author" ) );
about->addAuthor( "Cornelius Schumacher",
- I18N_NOOP( "Co-maintainer, libkabc port, CSV import/export" ),
+ I18N_NOOP( "Co-maintainer, libtdeabc port, CSV import/export" ),
"[email protected]" );
about->addAuthor( "Mike Pilone", I18N_NOOP( "GUI and framework redesign" ),
"[email protected]" );
diff --git a/kaddressbook/kcmconfigs/Makefile.am b/kaddressbook/kcmconfigs/Makefile.am
index d066dfed4..d7659639f 100644
--- a/kaddressbook/kcmconfigs/Makefile.am
+++ b/kaddressbook/kcmconfigs/Makefile.am
@@ -10,7 +10,7 @@ kcm_kabconfig_la_SOURCES = kcmkabconfig.cpp kabconfigwidget.cpp \
extensionconfigdialog.cpp addresseewidget.cpp
kcm_kabconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
-kcm_kabconfig_la_LIBADD = $(LIB_KIO) \
+kcm_kabconfig_la_LIBADD = $(LIB_TDEIO) \
$(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/kaddressbook/common/libkabcommon.la
@@ -20,7 +20,7 @@ kcm_kabldapconfig_la_SOURCES = addhostdialog.cpp kcmkabldapconfig.cpp \
ldapoptionswidget.cpp
kcm_kabldapconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
-kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
+kcm_kabldapconfig_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp
kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 226bb3095..ad1364f50 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -169,7 +169,7 @@ AddresseeWidget::~AddresseeWidget()
void AddresseeWidget::restoreSettings()
{
- TDEConfig config( "kabcrc" );
+ TDEConfig config( "tdeabcrc" );
config.setGroup( "General" );
mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
@@ -183,7 +183,7 @@ void AddresseeWidget::restoreSettings()
void AddresseeWidget::saveSettings()
{
- TDEConfig config( "kabcrc" );
+ TDEConfig config( "tdeabcrc" );
config.setGroup( "General" );
config.writeEntry( "Prefixes", mPrefix->nameParts() );
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 83e0bc89b..b41bdf843 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -174,7 +174,7 @@ void KABConfigWidget::restoreSettings()
mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) );
mLocationMapURL->lineEdit()->setCursorPosition( 0 );
- TDEConfig config( "kabcrc", false, false );
+ TDEConfig config( "tdeabcrc", false, false );
config.setGroup( "General" );
mTradeAsFamilyName->setChecked( config.readBoolEntry( "TradeAsFamilyName", true ) );
mLimitContactDisplay->setChecked( config.readBoolEntry( "LimitContactDisplay", true ) );
@@ -197,7 +197,7 @@ void KABConfigWidget::saveSettings()
KABPrefs::instance()->writeConfig();
- TDEConfig config( "kabcrc", false, false );
+ TDEConfig config( "tdeabcrc", false, false );
config.setGroup( "General" );
config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 7724dd875..0d350ae70 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -124,7 +124,7 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type,
mFormattedNameEdit->setText( addr.formattedName() );
// Prefix and suffix combos
- TDEConfig config( "kabcrc" );
+ TDEConfig config( "tdeabcrc" );
config.setGroup( "General" );
TQStringList sTitle;
diff --git a/kaddressbook/views/Makefile.am b/kaddressbook/views/Makefile.am
index 37440a445..09ee38784 100644
--- a/kaddressbook/views/Makefile.am
+++ b/kaddressbook/views/Makefile.am
@@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
configurecardviewdialog.cpp \
kaddressbookcardview.cpp
libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC)
+libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC)
+libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
contactlistview.cpp \
kaddressbooktableview.cpp
libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) $(LIB_KIO) $(LIB_KIMPROXY)
+libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC) $(LIB_TDEIO) $(LIB_TDEIMPROXY)
noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
configuretableviewdialog.h contactlistview.h \
diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am
index ecf0372c4..c91a09451 100644
--- a/kaddressbook/xxport/Makefile.am
+++ b/kaddressbook/xxport/Makefile.am
@@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
$(top_builddir)/libtdepim/libtdepim.la
libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
-libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
-libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) \
+libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) \
$(top_builddir)/kaddressbook/libkaddressbook.la \
$(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la
libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
-libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
-libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
-libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
-libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
-libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
-libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
-libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
noinst_HEADERS = csvimportdialog.h
diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp
index 39c709b3e..f22495268 100644
--- a/kaddressbook/xxport/bookmark_xxport.cpp
+++ b/kaddressbook/xxport/bookmark_xxport.cpp
@@ -64,7 +64,7 @@ bool BookmarkXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQ
menu.location = fileName;
menu.type = "xbel";
menu.show = true;
- KBookmarkMenu::setDynamicBookmarks( "kabc", menu );
+ KBookmarkMenu::setDynamicBookmarks( "tdeabc", menu );
return true;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 09:47:18 +0000