diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 21:47:32 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 21:47:32 -0600 |
commit | 7cb24f16beba124f021091c4b7bcf8565a06fb95 (patch) | |
tree | 966c56d322d59439374c65c06803bdca34b00af5 /kmail | |
parent | dbb49d72f7a1bc5c4b7312219cae8491cc571def (diff) | |
download | tdepim-7cb24f16beba124f021091c4b7bcf8565a06fb95.tar.gz tdepim-7cb24f16beba124f021091c4b7bcf8565a06fb95.zip |
Rename additional instances of KDE to TDE
Diffstat (limited to 'kmail')
-rw-r--r-- | kmail/Makefile.am | 2 | ||||
-rw-r--r-- | kmail/distributionlistdialog.cpp | 14 | ||||
-rw-r--r-- | kmail/folderdiaacltab.cpp | 14 | ||||
-rw-r--r-- | kmail/kleo_util.h | 6 | ||||
-rw-r--r-- | kmail/klistviewindexedsearchline.h | 2 | ||||
-rw-r--r-- | kmail/recipientspicker.cpp | 26 | ||||
-rw-r--r-- | kmail/recipientspicker.h | 12 | ||||
-rw-r--r-- | kmail/stl_util.h | 6 |
8 files changed, 41 insertions, 41 deletions
diff --git a/kmail/Makefile.am b/kmail/Makefile.am index 58a42297e..62bad8340 100644 --- a/kmail/Makefile.am +++ b/kmail/Makefile.am @@ -40,7 +40,7 @@ libkmailpart_la_LIBADD = libkmailprivate.la kcm_kmail_la_SOURCES = kcm_kmail.cpp kcm_kmail_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_kmail_la_LIBADD = libkmailprivate.la $(LIB_KDECORE) +kcm_kmail_la_LIBADD = libkmailprivate.la $(LIB_TDECORE) libkmail_bodypartformatter_application_octetstream_la_SOURCES = app_octetstream.cpp libkmail_bodypartformatter_application_octetstream_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index 6c21e8ba6..26f720ad6 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <config.h> // for KDEPIM_NEW_DISTRLISTS +#include <config.h> // for TDEPIM_NEW_DISTRLISTS #include "distributionlistdialog.h" @@ -28,7 +28,7 @@ #include <kabc/stdaddressbook.h> #include <kabc/distributionlist.h> -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include <libtdepim/distributionlist.h> #endif #include <libtdepim/kaddrbook.h> @@ -172,7 +172,7 @@ void DistributionListDialog::slotUser1() return; } -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS KABC::DistributionListManager manager( ab ); manager.load(); #endif @@ -189,7 +189,7 @@ void DistributionListDialog::slotUser1() KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS if ( !KPIM::DistributionList::findByName( ab, name ).isEmpty() ) { #else if ( manager.list( name ) ) { @@ -212,7 +212,7 @@ void DistributionListDialog::slotUser1() return; } -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList dlist; dlist.setName( name ); @@ -260,13 +260,13 @@ void DistributionListDialog::slotUser1() return; } -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS manager.save(); #endif // Only accept when the dist list is really in the addressbook, since we can't detect if the // user aborted saving in another way, since insertAddressee() lacks a return code. -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS if ( !KPIM::DistributionList::findByName( ab, name ).isEmpty() ) { #else if ( manager.list( name ) ) { 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, diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h index 7cf11ebdc..663f0b634 100644 --- a/kmail/kleo_util.h +++ b/kmail/kleo_util.h @@ -29,8 +29,8 @@ your version. */ -#ifndef __KDEPIM_KMAIL_KLEO_UTIL_H__ -#define __KDEPIM_KMAIL_KLEO_UTIL_H__ +#ifndef __TDEPIM_KMAIL_KLEO_UTIL_H__ +#define __TDEPIM_KMAIL_KLEO_UTIL_H__ #include <kleo/enum.h> @@ -85,4 +85,4 @@ static inline bool containsOpenPGP( unsigned int f ) { return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ; } -#endif // __KDEPIM_KMAIL_KLEO_UTIL_H__ +#endif // __TDEPIM_KMAIL_KLEO_UTIL_H__ diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h index 6cf00bc18..e8ba35c4f 100644 --- a/kmail/klistviewindexedsearchline.h +++ b/kmail/klistviewindexedsearchline.h @@ -46,7 +46,7 @@ class KListViewSearchLine; * Extends HeaderListQuickSearch to also search inside message bodies using KMMsgIndex */ -class KDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch +class TDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch { Q_OBJECT TQ_OBJECT 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; diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h index 7ab05b40b..fb6e657fd 100644 --- a/kmail/recipientspicker.h +++ b/kmail/recipientspicker.h @@ -21,7 +21,7 @@ #ifndef RECIPIENTSPICKER_H #define RECIPIENTSPICKER_H -#include <config.h> // for KDEPIM_NEW_DISTRLISTS +#include <config.h> // for TDEPIM_NEW_DISTRLISTS #include "recipientseditor.h" @@ -36,7 +36,7 @@ class TQComboBox; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS #include <libtdepim/distributionlist.h> #else namespace KABC { @@ -54,7 +54,7 @@ class RecipientItem public: typedef TQValueList<RecipientItem *> List; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS RecipientItem( KABC::AddressBook *ab ); void setDistributionList( KPIM::DistributionList& ); KPIM::DistributionList& distributionList(); @@ -79,7 +79,7 @@ class RecipientItem TQString tooltip() const; private: -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS TQString createTooltip( KPIM::DistributionList & ) const; #else TQString createTooltip( KABC::DistributionList * ) const; @@ -89,7 +89,7 @@ class RecipientItem TQString mName; TQString mEmail; TQString mRecipient; -#ifdef KDEPIM_NEW_DISTRLISTS +#ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList mDistributionList; KABC::AddressBook *mAddressBook; #else @@ -240,7 +240,7 @@ class RecipientsPicker : public TQDialog RecipientsCollection *mDistributionLists; RecipientsCollection *mSelectedRecipients; -#ifndef KDEPIM_NEW_DISTRLISTS +#ifndef TDEPIM_NEW_DISTRLISTS KABC::DistributionListManager *mDistributionListManager; #endif diff --git a/kmail/stl_util.h b/kmail/stl_util.h index 4b549a352..8a2738952 100644 --- a/kmail/stl_util.h +++ b/kmail/stl_util.h @@ -29,8 +29,8 @@ your version. */ -#ifndef __KDEPIM__KMAIL__STL_UTIL_H__ -#define __KDEPIM__KMAIL__STL_UTIL_H__ +#ifndef __TDEPIM__KMAIL__STL_UTIL_H__ +#define __TDEPIM__KMAIL__STL_UTIL_H__ #include <algorithm> @@ -61,4 +61,4 @@ namespace kdtools { } // namespace kdtools -#endif // __KDEPIM__KMAIL__STL_UTIL_H__ +#endif // __TDEPIM__KMAIL__STL_UTIL_H__ |