diff options
Diffstat (limited to 'kmail/folderdiaacltab.cpp')
| -rw-r--r-- | kmail/folderdiaacltab.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 2bfa189c9..c714789cc 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -30,7 +30,7 @@ * your version. */ -#include <config.h> // FOR KDEPIM_NEW_DISTRLISTS +#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS #include "folderdiaacltab.h" #include "acljobs.h" @@ -41,7 +41,7 @@ #include <addressesdialog.h> #include <kabc/addresseelist.h> -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include <libtdepim/distributionlist.h> // libtdepim #else #include <kabc/distributionlist.h> @@ -204,7 +204,7 @@ public: void load( const ACLListEntry& entry ); void save( ACLList& list, -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KABC::AddressBook* abook, #else KABC::DistributionListManager& manager, @@ -270,7 +270,7 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry ) } void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList, -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KABC::AddressBook* addressBook, #else KABC::DistributionListManager& manager, @@ -278,7 +278,7 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList, IMAPUserIdFormat userIdFormat ) { // expand distribution lists -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList list = KPIM::DistributionList::findByName( addressBook, userId(), false ); if ( !list.isEmpty() ) { Q_ASSERT( mModified ); // it has to be new, it couldn't be stored as a distr list name.... @@ -675,7 +675,7 @@ bool KMail::FolderDiaACLTab::save() // listviewitems at the same time sounds dangerous, so let's just save into // ACLList and reload that. KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS KABC::DistributionListManager manager( addressBook ); manager.load(); #endif @@ -683,7 +683,7 @@ bool KMail::FolderDiaACLTab::save() for ( TQListViewItem* item = mListView->firstChild(); item; item = item->nextSibling() ) { ListViewItem* ACLitem = static_cast<ListViewItem *>( item ); ACLitem->save( aclList, -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS addressBook, #else manager, |