diff options
Diffstat (limited to 'kmail/recipientspicker.cpp')
| -rw-r--r-- | kmail/recipientspicker.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 4a77d97c5..03a34d776 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -28,7 +28,7 @@ #include <libemailfunctions/email.h> -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS #include <kabc/distributionlist.h> #endif @@ -46,7 +46,7 @@ #include <tqtoolbutton.h> #include <tqlabel.h> -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS RecipientItem::RecipientItem( KABC::AddressBook *ab ) : mAddressBook( ab ) { @@ -58,7 +58,7 @@ RecipientItem::RecipientItem() } #endif -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS void RecipientItem::setDistributionList( KPIM::DistributionList &list ) { mDistributionList = list; @@ -142,7 +142,7 @@ TQString RecipientItem::tooltip() const return mTooltip; } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList& RecipientItem::distributionList() { return mDistributionList; } @@ -152,7 +152,7 @@ KABC::DistributionList * RecipientItem::distributionList() { } #endif -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS TQString RecipientItem::createTooltip( KPIM::DistributionList &distributionList ) const { TQString txt = "<qt>"; @@ -342,7 +342,7 @@ void SearchLine::keyPressEvent( TQKeyEvent *ev ) RecipientsPicker::RecipientsPicker( TQWidget *parent ) : TQDialog( parent, "RecipientsPicker" ) -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS , mDistributionListManager( 0 ) #endif ,mLdapSearchDialog( 0 ) @@ -452,7 +452,7 @@ RecipientsPicker::~RecipientsPicker() { writeConfig(); -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS delete mDistributionListManager; #endif @@ -497,7 +497,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook ) TQStringList emails = (*it).emails(); TQStringList::ConstIterator it3; for( it3 = emails.begin(); it3 != emails.end(); ++it3 ) { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS RecipientItem *item = new RecipientItem( mAddressBook ); #else RecipientItem *item = new RecipientItem; @@ -547,7 +547,7 @@ void RecipientsPicker::insertDistributionLists() { mDistributionLists->deleteAll(); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS TQValueList<KPIM::DistributionList> lists = KPIM::DistributionList::allDistributionLists( mAddressBook ); for ( uint i = 0; i < lists.count(); ++i ) { RecipientItem *item = new RecipientItem( mAddressBook ); @@ -583,7 +583,7 @@ void RecipientsPicker::insertRecentAddresses() KABC::Addressee::List::ConstIterator it; for( it = recents.begin(); it != recents.end(); ++it ) { -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS RecipientItem *item = new RecipientItem( mAddressBook ); #else RecipientItem *item = new RecipientItem; @@ -637,7 +637,7 @@ void RecipientsPicker::setRecipients( const Recipient::List &recipients ) // a detached copy. RecipientItem::List items = mDistributionLists->items(); RecipientItem::List::ConstIterator distIt; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS for ( distIt = items.begin(); distIt != items.end(); ++distIt ) { if ( (*it).email() == (*distIt)->name() ) { item = new RecipientItem( mAddressBook ); @@ -661,7 +661,7 @@ void RecipientsPicker::setRecipients( const Recipient::List &recipients ) a.setNameFromString( name ); a.insertEmail( email ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS item = new RecipientItem( mAddressBook ); #else item = new RecipientItem; @@ -865,7 +865,7 @@ void RecipientsPicker::ldapSearchResult() KABC::Addressee ad; ad.setNameFromString( name ); ad.insertEmail( email ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS RecipientItem *item = new RecipientItem( mAddressBook ); #else RecipientItem *item = new RecipientItem; |