diff options
Diffstat (limited to 'libtdepim/addressesdialog.cpp')
| -rw-r--r-- | libtdepim/addressesdialog.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index 27f601833..a8d993bf8 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -30,7 +30,7 @@ #include <libemailfunctions/email.h> -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include "distributionlist.h" #include <kresources/selectdialog.h> #include <kabc/resource.h> @@ -395,7 +395,7 @@ AddressesDialog::allToAddressesNoDuplicates() const KABC::Addressee::List aList = allAddressee( d->toItem ); const TQStringList dList = toDistributionLists(); KABC::AddressBook* abook = KABC::StdAddressBook::self( true ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS for ( TQStringList::ConstIterator it = dList.begin(); it != dList.end(); ++it ) { const TQValueList<KPIM::DistributionList::Entry> eList = KPIM::DistributionList::findByName(abook, *it).entries(abook); @@ -593,7 +593,7 @@ AddressesDialog::initConnections() connect( d->ui->mSelectedView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(removeEntry()) ); -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS connect( KABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), this, TQT_SLOT( updateAvailableAddressees() ) ); #endif @@ -850,7 +850,7 @@ AddressesDialog::removeEntry() d->ui->mSaveAs->setEnabled(d->ui->mSelectedView->firstChild() != 0); } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS // copied from kabcore.cpp :( // KDE4: should be in libkabc I think @@ -878,7 +878,7 @@ static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *pare void AddressesDialog::saveAs() { -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS KABC::DistributionListManager manager( KABC::StdAddressBook::self( true ) ); manager.load(); #endif @@ -900,7 +900,7 @@ AddressesDialog::saveAs() return; bool alreadyExists = false; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KABC::AddressBook* abook = KABC::StdAddressBook::self( true ); KPIM::DistributionList dlist = KPIM::DistributionList::findByName( abook, name ); alreadyExists = !dlist.isEmpty(); @@ -916,7 +916,7 @@ AddressesDialog::saveAs() return; } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KABC::Resource* resource = requestResource( abook, this ); if ( !resource ) return; @@ -1135,7 +1135,7 @@ AddressesDialog::addDistributionLists() { KABC::AddressBook* abook = KABC::StdAddressBook::self( true ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS const TQValueList<KPIM::DistributionList> distLists = KPIM::DistributionList::allDistributionLists( abook ); #else @@ -1152,14 +1152,14 @@ AddressesDialog::addDistributionLists() d->topdist = new AddresseeViewItem( d->ui->mAvailableView, i18n( "Distribution Lists" ) ); } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS TQValueList<KPIM::DistributionList>::ConstIterator listIt; #else TQStringList::Iterator listIt; #endif int total = 0; for ( listIt = distLists.begin(); listIt != distLists.end(); ++listIt ) { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dlist = *listIt; KPIM::DistributionList::Entry::List entries = dlist.entries(abook); #else @@ -1172,7 +1172,7 @@ AddressesDialog::addDistributionLists() connect( item, TQT_SIGNAL( addressSelected( AddresseeViewItem*, bool ) ), this, TQT_SLOT( availableAddressSelected( AddresseeViewItem*, bool ) ) ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList::Entry::List::Iterator itemIt; #else KABC::DistributionList::Entry::List::Iterator itemIt; |