From 533bad2a1503973aaf8186691422c2eda91d02d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:02:55 +0200 Subject: Additional k => tde renaming and fixes --- kaddressbook/Makefile.am | 4 ++-- kaddressbook/kabcore.cpp | 6 +++--- kaddressbook/kcmconfigs/Makefile.am | 4 ++-- kaddressbook/kcmconfigs/addresseewidget.cpp | 4 ++-- kaddressbook/kcmconfigs/kabconfigwidget.cpp | 4 ++-- kaddressbook/nameeditdialog.cpp | 2 +- kaddressbook/views/Makefile.am | 6 +++--- kaddressbook/xxport/Makefile.am | 18 +++++++++--------- kaddressbook/xxport/bookmark_xxport.cpp | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) (limited to 'kaddressbook') diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am index 3ae6e636..16026aca 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 6a7ece0e..27b71139 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -272,10 +272,10 @@ TQStringList KABCore::selectedUIDs() const TDEABC::Resource *KABCore::requestResource( TQWidget *parent ) { - TQPtrList kabcResources = addressBook()->resources(); + TQPtrList tdeabcResources = addressBook()->resources(); TQPtrList kresResources; - TQPtrListIterator resIt( kabcResources ); + TQPtrListIterator 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" ), "tokoe@kde.org" ); 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" ), "schumacher@kde.org" ); about->addAuthor( "Mike Pilone", I18N_NOOP( "GUI and framework redesign" ), "mpilone@slac.com" ); diff --git a/kaddressbook/kcmconfigs/Makefile.am b/kaddressbook/kcmconfigs/Makefile.am index d066dfed..d7659639 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 226bb309..ad1364f5 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 83e0bc89..b41bdf84 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 7724dd87..0d350ae7 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 37440a44..09ee3878 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 ecf0372c..c91a0945 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 39c709b3..f2249526 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; } -- cgit v1.2.3