From 7cb24f16beba124f021091c4b7bcf8565a06fb95 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:47:32 -0600 Subject: Rename additional instances of KDE to TDE --- kaddressbook/Makefile.am | 4 +-- kaddressbook/distributionlistpicker.cpp | 6 ++-- kaddressbook/editors/Makefile.am | 2 +- kaddressbook/features/Makefile.am | 6 ++-- kaddressbook/features/distributionlistwidget.cpp | 44 ++++++++++++------------ kaddressbook/features/distributionlistwidget.h | 6 ++-- kaddressbook/interfaces/core.h | 6 ++-- kaddressbook/kabcore.cpp | 18 +++++----- kaddressbook/kabcore.h | 8 ++--- kaddressbook/kcmconfigs/Makefile.am | 2 +- kaddressbook/ldapsearchdialog.cpp | 8 ++--- kaddressbook/ldapsearchdialog.h | 4 +-- kaddressbook/searchmanager.cpp | 8 ++--- kaddressbook/searchmanager.h | 8 ++--- kaddressbook/thumbnailcreator/Makefile.am | 2 +- kaddressbook/views/Makefile.am | 6 ++-- kaddressbook/xxport/Makefile.am | 18 +++++----- 17 files changed, 78 insertions(+), 78 deletions(-) (limited to 'kaddressbook') diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am index b0c2d96c..7978319b 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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor 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_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) -lDCOP +libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lDCOP lib_LTLIBRARIES = libkaddressbook.la libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \ diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 766f8871..9f8626fb 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -23,7 +23,7 @@ #include "distributionlistpicker.h" #include "config.h" -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include #endif @@ -59,7 +59,7 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ), this, TQT_SLOT( entrySelected( const TQString& ) ) ); setMainWidget( main ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS typedef TQValueList DistListList; const DistListList lists = KPIM::DistributionList::allDistributionLists( m_book ); for ( DistListList::ConstIterator it = lists.begin(); it != lists.end(); ++it ) @@ -81,7 +81,7 @@ void KPIM::DistributionListPickerDialog::setLabelText( const TQString& text ) void KPIM::DistributionListPickerDialog::slotUser1() { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS const TQValueList lists = KPIM::DistributionList::allDistributionLists( m_book ); TQStringList listNames; for ( TQValueList::ConstIterator it = lists.begin(); it != lists.end(); ++it ) diff --git a/kaddressbook/editors/Makefile.am b/kaddressbook/editors/Makefile.am index bb39762b..378c19b6 100644 --- a/kaddressbook/editors/Makefile.am +++ b/kaddressbook/editors/Makefile.am @@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined -libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) +libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am index e529cb68..6258a6a7 100644 --- a/kaddressbook/features/Makefile.am +++ b/kaddressbook/features/Makefile.am @@ -17,16 +17,16 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ if compile_newdistrlists libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) +libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) else libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) +libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) endif libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) -lkresources +libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -lkresources noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 86515599..035eba6c 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -39,7 +39,7 @@ #include #include -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include typedef KPIM::DistributionList DistributionList; #else @@ -149,7 +149,7 @@ class ContactItem : public TQListViewItem DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS , mManager( 0 ) #endif { @@ -201,7 +201,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren topLayout->addWidget( mRemoveContactButton, 2, 3 ); connect( mRemoveContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeContact() ) ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS // When contacts are changed, update both distr list combo and contents of displayed distr list connect( core, TQT_SIGNAL( contactsUpdated() ), this, TQT_SLOT( updateNameCombo() ) ); @@ -228,7 +228,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren DistributionListWidget::~DistributionListWidget() { -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS delete mManager; #endif @@ -237,7 +237,7 @@ DistributionListWidget::~DistributionListWidget() void DistributionListWidget::save() { -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS mManager->save(); #endif } @@ -254,7 +254,7 @@ void DistributionListWidget::selectionContactViewChanged() bool DistributionListWidget::alreadyExists( const TQString& distrListName ) const { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS return core()->distributionListNames().contains( distrListName ); #else return mManager->listNames().contains( distrListName ); @@ -273,7 +273,7 @@ void DistributionListWidget::createList() KMessageBox::sorry( this, i18n( "The name already exists" ) ); return; } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KABC::Resource* resource = core()->requestResource( this ); if ( !resource ) return; @@ -313,7 +313,7 @@ void DistributionListWidget::editList() KMessageBox::sorry( this, i18n( "The name already exists." ) ); return; } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dist = KPIM::DistributionList::findByName( core()->addressBook(), mNameCombo->currentText() ); if ( dist.isEmpty() ) // not found [should be impossible] @@ -335,7 +335,7 @@ void DistributionListWidget::editList() // Display the contents of the list we just selected updateContactView(); -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS changed(); #endif } @@ -349,7 +349,7 @@ void DistributionListWidget::removeList() if ( result != KMessageBox::Continue ) return; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dist = KPIM::DistributionList::findByName( core()->addressBook(), mNameCombo->currentText() ); if ( dist.isEmpty() ) // not found [should be impossible] @@ -369,7 +369,7 @@ void DistributionListWidget::removeList() void DistributionListWidget::addContact() { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dist = KPIM::DistributionList::findByName( core()->addressBook(), mNameCombo->currentText() ); if ( dist.isEmpty() ) { // not found @@ -388,7 +388,7 @@ void DistributionListWidget::addContact() for ( it = addrList.begin(); it != addrList.end(); ++it ) dist.insertEntry( *it ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS core()->addressBook()->insertAddressee( dist ); changed( dist ); #else @@ -399,7 +399,7 @@ void DistributionListWidget::addContact() void DistributionListWidget::removeContact() { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dist = KPIM::DistributionList::findByName( core()->addressBook(), mNameCombo->currentText() ); if ( dist.isEmpty() ) // not found @@ -419,7 +419,7 @@ void DistributionListWidget::removeContact() dist.removeEntry( contactItem->addressee(), contactItem->email() ); delete contactItem; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS core()->addressBook()->insertAddressee( dist ); changed( dist ); #else @@ -429,7 +429,7 @@ void DistributionListWidget::removeContact() void DistributionListWidget::changeEmail() { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dist = KPIM::DistributionList::findByName( core()->addressBook(), mNameCombo->currentText() ); if ( dist.isEmpty() ) // not found @@ -454,7 +454,7 @@ void DistributionListWidget::changeEmail() dist.removeEntry( contactItem->addressee(), contactItem->email() ); dist.insertEntry( contactItem->addressee(), email ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS core()->addressBook()->insertAddressee( dist ); changed( dist ); #else @@ -468,7 +468,7 @@ void DistributionListWidget::updateContactView() mContactView->clear(); bool isListSelected = false; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dist; if ( mNameCombo->count() != 0 ) dist = KPIM::DistributionList::findByName( @@ -491,7 +491,7 @@ void DistributionListWidget::updateContactView() mContactView->setEnabled( true ); uint entryCount = 0; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS const KPIM::DistributionList::Entry::List entries = dist.entries( core()->addressBook() ); KPIM::DistributionList::Entry::List::ConstIterator it; #else @@ -512,7 +512,7 @@ void DistributionListWidget::updateNameCombo() { int pos = mNameCombo->currentItem(); mNameCombo->clear(); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS const TQStringList names = core()->distributionListNames(); #else mManager->load(); @@ -529,7 +529,7 @@ void DistributionListWidget::dropEvent( TQDropEvent *e ) if ( mNameCombo->count() == 0 ) return; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dist = KPIM::DistributionList::findByName( core()->addressBook(), mNameCombo->currentText() ); if ( dist.isEmpty() ) @@ -548,7 +548,7 @@ void DistributionListWidget::dropEvent( TQDropEvent *e ) for ( KABC::Addressee::List::ConstIterator it = lst.begin(); it != lst.end(); ++it ) dist.insertEntry( *it ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS core()->addressBook()->insertAddressee( dist ); changed( dist ); #else @@ -578,7 +578,7 @@ void DistributionListWidget::dropped( TQDropEvent *e, TQListViewItem* ) dropEvent( e ); } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS void DistributionListWidget::changed( const KABC::Addressee& dist ) { emit modified( KABC::Addressee::List() << dist ); diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h index 7729b50d..1d82e99a 100644 --- a/kaddressbook/features/distributionlistwidget.h +++ b/kaddressbook/features/distributionlistwidget.h @@ -24,7 +24,7 @@ #ifndef DISTRIBUTIONLISTWIDGET_H #define DISTRIBUTIONLISTWIDGET_H -#include // for KDEPIM_NEW_DISTRLISTS +#include // for TDEPIM_NEW_DISTRLISTS #include #include @@ -76,7 +76,7 @@ class DistributionListWidget : public KAB::ExtensionWidget void selectionContactViewChanged(); private: -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS void changed( const KABC::Addressee& dist ); #else void changed(); @@ -91,7 +91,7 @@ class DistributionListWidget : public KAB::ExtensionWidget TQLabel *mEntryCountLabel; DistributionListView *mContactView; -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS KABC::DistributionListManager *mManager; #endif TQPushButton *mCreateListButton; diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index 3b5e1cf3..3e2a175f 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -24,9 +24,9 @@ #ifndef KAB_CORE_H #define KAB_CORE_H -#include // for KDEPIM_NEW_DISTRLISTS +#include // for TDEPIM_NEW_DISTRLISTS -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include #endif @@ -117,7 +117,7 @@ class KDE_EXPORT Core : public TQObject */ virtual void deleteDistributionLists( const TQStringList &uids ) = 0; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS /** Returns all the distribution lists. */ diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 0e5d1020..de847b0e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -354,7 +354,7 @@ void KABCore::setContactSelected( const TQString &uid ) KABC::Addressee addr = mAddressBook->findByUid( uid ); if ( !mDetailsViewer->isHidden() ) mDetailsViewer->setAddressee( addr ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS if ( !mSelectedDistributionList.isNull() && mDistListEntryView->isShown() ) { showDistributionListEntry( uid ); } @@ -439,7 +439,7 @@ void KABCore::setContactSelected( const TQString &uid ) #endif mActionPaste->setEnabled( !list.isEmpty() ); } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS mAddDistListButton->setEnabled( writable ); mRemoveDistListButton->setEnabled( someSelected && writable ); #endif @@ -709,7 +709,7 @@ void KABCore::contactModified( const KABC::Addressee &addr ) void KABCore::newDistributionList() { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KABC::Resource *resource = requestResource( mWidget ); if ( !resource ) return; @@ -1230,7 +1230,7 @@ void KABCore::initGUI() mViewManager = new ViewManager( this, viewWidget ); viewLayout->addWidget( mViewManager, 1 ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS mDistListButtonWidget = new TQWidget( viewWidget ); TQHBoxLayout *buttonLayout = new TQHBoxLayout( mDistListButtonWidget ); buttonLayout->setSpacing( KDialog::spacingHint() ); @@ -1604,7 +1604,7 @@ bool KABCore::handleCommandLine( KAddressBookIface* iface ) void KABCore::removeSelectedContactsFromDistList() { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dist = KPIM::DistributionList::findByName( addressBook(), mSelectedDistributionList ); if ( dist.isEmpty() ) @@ -1656,7 +1656,7 @@ void KABCore::removeSelectedContactsFromDistList() void KABCore::sendMailToDistributionList( const TQString &name ) { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dist = KPIM::DistributionList::findByName( addressBook(), name ); if ( dist.isEmpty() ) return; @@ -1671,7 +1671,7 @@ void KABCore::sendMailToDistributionList( const TQString &name ) void KABCore::editSelectedDistributionList() { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS editDistributionList( KPIM::DistributionList::findByName( addressBook(), mSelectedDistributionList ) ); #endif } @@ -1679,12 +1679,12 @@ void KABCore::editSelectedDistributionList() void KABCore::editDistributionList( const TQString &name ) { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS editDistributionList( KPIM::DistributionList::findByName( addressBook(), name ) ); #endif } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS void KABCore::showDistributionListEntry( const TQString& uid ) { diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 47e55243..39f229a5 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -24,7 +24,7 @@ #ifndef KABCORE_H #define KABCORE_H -#include // FOR KDEPIM_NEW_DISTRLISTS +#include // FOR TDEPIM_NEW_DISTRLISTS #include @@ -148,7 +148,7 @@ class KDE_EXPORT KABCore : public KAB::Core KCommandHistory *commandHistory() const { return mCommandHistory; } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS /** Returns all the distribution lists. */ @@ -395,7 +395,7 @@ class KDE_EXPORT KABCore : public KAB::Core private: -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS void editDistributionList( const KPIM::DistributionList &list ); void showDistributionListEntry( const TQString &uid ); #endif @@ -445,7 +445,7 @@ class KDE_EXPORT KABCore : public KAB::Core ViewManager *mViewManager; TQLabel *mViewHeaderLabel; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS TQString mSelectedDistributionList; KPushButton *mAddDistListButton; KPushButton *mRemoveDistListButton; diff --git a/kaddressbook/kcmconfigs/Makefile.am b/kaddressbook/kcmconfigs/Makefile.am index aad1b921..257b0ed8 100644 --- a/kaddressbook/kcmconfigs/Makefile.am +++ b/kaddressbook/kcmconfigs/Makefile.am @@ -25,7 +25,7 @@ kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(top_builddir)/libtdepim/l kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ -avoid-version -no-undefined -kcm_kabcustomfields_la_LIBADD = $(LIB_KDEUI) -lqui \ +kcm_kabcustomfields_la_LIBADD = $(LIB_TDEUI) -lqui \ $(top_builddir)/kaddressbook/common/libkabcommon.la kcm_kabcustomfields_la_COMPILE_FIRST = $(top_builddir)/kaddressbook/common/kabprefs_base.h diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 8d5b90d9..4722feac 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -42,7 +42,7 @@ #include "ldapsearchdialog.h" #include "kablock.h" -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include "distributionlistpicker.h" #endif @@ -214,7 +214,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, showButton( User2, false ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS showButton( User2, true ); setButtonText( User2, i18n( "Add to Distribution List..." ) ); #endif @@ -543,7 +543,7 @@ KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM:: return addr; } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList LDAPSearchDialog::selectDistributionList() { TQGuardedPtr picker = new KPIM::DistributionListPickerDialog( mCore->addressBook(), this ); @@ -601,7 +601,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV void LDAPSearchDialog::slotUser2() { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS const TQValueList selectedItems = d->selectedItems( mResultListView ); if ( selectedItems.isEmpty() ) { KMessageBox::information( this, i18n( "Please select the contacts you want to add to the distribution list." ), i18n( "No Contacts Selected" ) ); diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h index b08db399..bc24de92 100644 --- a/kaddressbook/ldapsearchdialog.h +++ b/kaddressbook/ldapsearchdialog.h @@ -29,7 +29,7 @@ #include #include -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include #endif @@ -90,7 +90,7 @@ class LDAPSearchDialog : public KDialogBase private: void saveSettings(); static KABC::Addressee convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList selectDistributionList(); #endif diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp index 3bad8eb7..1cc1a9aa 100644 --- a/kaddressbook/searchmanager.cpp +++ b/kaddressbook/searchmanager.cpp @@ -20,7 +20,7 @@ with any edition of TQt, and distribute the resulting executable, without including the source code for TQt in the source distribution. */ -#include // FOR KDEPIM_NEW_DISTRLISTS +#include // FOR TDEPIM_NEW_DISTRLISTS #include #include @@ -57,7 +57,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi allContacts.append( *abIt ); #endif -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS // Extract distribution lists from allContacts mDistributionLists.clear(); KABC::Addressee::List::Iterator rmIt( allContacts.begin() ); @@ -98,7 +98,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi KABC::Addressee::List::ConstIterator it( allContacts.begin() ); const KABC::Addressee::List::ConstIterator endIt( allContacts.end() ); for ( ; it != endIt; ++it ) { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS if ( KPIM::DistributionList::isDistributionList( *it ) ) continue; #endif @@ -169,7 +169,7 @@ void SearchManager::reload() search( mPattern, mFields, mType ); } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS void KAB::SearchManager::setSelectedDistributionList( const TQString &name ) { diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h index eeb84e01..e038b463 100644 --- a/kaddressbook/searchmanager.h +++ b/kaddressbook/searchmanager.h @@ -24,11 +24,11 @@ #ifndef SEARCHMANAGER_H #define SEARCHMANAGER_H -#include // for KDEPIM_NEW_DISTRLISTS +#include // for TDEPIM_NEW_DISTRLISTS #include #include -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include #endif @@ -67,7 +67,7 @@ class SearchManager : public TQObject KABC::Addressee::List contacts() const; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS /** sets the distribution list to be shown */ @@ -95,7 +95,7 @@ class SearchManager : public TQObject private: KABC::Addressee::List mContacts; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS TQString mSelectedDistributionList; KPIM::DistributionList::List mDistributionLists; #endif diff --git a/kaddressbook/thumbnailcreator/Makefile.am b/kaddressbook/thumbnailcreator/Makefile.am index 1140f1df..d0d4c789 100644 --- a/kaddressbook/thumbnailcreator/Makefile.am +++ b/kaddressbook/thumbnailcreator/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = ldifvcardthumbnail.la ldifvcardthumbnail_la_SOURCES = ldifvcardcreator.cpp ldifvcardthumbnail_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -ldifvcardthumbnail_la_LIBADD = $(LIB_KDECORE) $(LIB_KABC) -ltdefx +ldifvcardthumbnail_la_LIBADD = $(LIB_TDECORE) $(LIB_KABC) -ltdefx noinst_HEADERS = ldifvcardcreator.h diff --git a/kaddressbook/views/Makefile.am b/kaddressbook/views/Makefile.am index 98cf458a..7b8cf31c 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_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) +libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC) 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_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) +libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC) 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_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY) +libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY) 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 04e2aead..8cef2fc7 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_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp -libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) \ +libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) \ $(top_builddir)/kaddressbook/libkaddressbook.la \ $(top_builddir)/libkdenetwork/qgpgme/libqgpgme.la libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp -libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp -libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp -libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp -libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp -libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp -libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp -libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) noinst_HEADERS = csvimportdialog.h -- cgit v1.2.3