summaryrefslogtreecommitdiffstats
path: root/korganizer
diff options
context:
space:
mode:
Diffstat (limited to 'korganizer')
-rw-r--r--korganizer/freebusymanager.cpp4
-rw-r--r--korganizer/koagendaitem.cpp4
-rw-r--r--korganizer/koattendeeeditor.cpp26
-rw-r--r--korganizer/koattendeeeditor.h6
-rw-r--r--korganizer/koeditorattachments.cpp4
-rw-r--r--korganizer/koeditordetails.cpp8
-rw-r--r--korganizer/koeditorfreebusy.cpp4
-rw-r--r--korganizer/koincidenceeditor.cpp2
-rw-r--r--korganizer/koprefs.cpp4
-rw-r--r--korganizer/publishdialog.cpp8
10 files changed, 35 insertions, 35 deletions
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index b3de84ad7..9434a1ec0 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -496,8 +496,8 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
}
// Try with the url configurated by preferred email in kaddressbook
- KABC::Addressee::List list= KABC::StdAddressBook::self( true )->findByEmail( email );
- KABC::Addressee::List::Iterator it;
+ TDEABC::Addressee::List list= TDEABC::StdAddressBook::self( true )->findByEmail( email );
+ TDEABC::Addressee::List::Iterator it;
TQString pref;
for ( it = list.begin(); it != list.end(); ++it ) {
pref = (*it).preferredEmail();
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index bba8840ac..b1117737b 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -580,9 +580,9 @@ void KOAgendaItem::dropEvent( TQDropEvent *e )
}
#ifndef KORG_NOKABC
- KABC::Addressee::List list;
+ TDEABC::Addressee::List list;
if ( KVCardDrag::decode( e, list ) ) {
- KABC::Addressee::List::Iterator it;
+ TDEABC::Addressee::List::Iterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
TQString em( (*it).fullEmail() );
if ( em.isEmpty() ) {
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index 4411e9666..6345ae622 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -209,8 +209,8 @@ void KOAttendeeEditor::openAddressBook()
dia->setShowCC( false );
dia->setShowBCC( false );
if ( dia->exec() ) {
- KABC::Addressee::List aList = dia->allToAddressesNoDuplicates();
- for ( KABC::Addressee::List::iterator itr = aList.begin();
+ TDEABC::Addressee::List aList = dia->allToAddressesNoDuplicates();
+ for ( TDEABC::Addressee::List::iterator itr = aList.begin();
itr != aList.end(); ++itr ) {
insertAttendeeFromAddressee( (*itr) );
}
@@ -220,7 +220,7 @@ void KOAttendeeEditor::openAddressBook()
#endif
}
-void KOAttendeeEditor::insertAttendeeFromAddressee(const KABC::Addressee &a, const Attendee * at)
+void KOAttendeeEditor::insertAttendeeFromAddressee(const TDEABC::Addressee &a, const Attendee * at)
{
bool myself = KOPrefs::instance()->thatIsMe( a.preferredEmail() );
bool sameAsOrganizer = mOrganizerCombo &&
@@ -377,10 +377,10 @@ void KOAttendeeEditor::clearAttendeeInput()
void KOAttendeeEditor::expandAttendee()
{
- KABC::Addressee::List aList = expandDistList( mNameEdit->text() );
+ TDEABC::Addressee::List aList = expandDistList( mNameEdit->text() );
if ( !aList.isEmpty() ) {
int index = selectedIndex();
- for ( KABC::Addressee::List::iterator itr = aList.begin(); itr != aList.end(); ++itr ) {
+ for ( TDEABC::Addressee::List::iterator itr = aList.begin(); itr != aList.end(); ++itr ) {
insertAttendeeFromAddressee( (*itr) );
}
setSelected( index );
@@ -555,32 +555,32 @@ bool KOAttendeeEditor::isExampleAttendee( const KCal::Attendee* attendee ) const
return false;
}
-KABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text ) const
+TDEABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text ) const
{
- KABC::Addressee::List aList;
- KABC::AddressBook *abook = KABC::StdAddressBook::self( true );
+ TDEABC::Addressee::List aList;
+ TDEABC::AddressBook *abook = TDEABC::StdAddressBook::self( true );
#ifdef TDEPIM_NEW_DISTRLISTS
const TQValueList<KPIM::DistributionList::Entry> eList =
KPIM::DistributionList::findByName( abook, text ).entries( abook );
TQValueList<KPIM::DistributionList::Entry>::ConstIterator eit;
for ( eit = eList.begin(); eit != eList.end(); ++eit ) {
- KABC::Addressee a = (*eit).addressee;
+ TDEABC::Addressee a = (*eit).addressee;
if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) {
aList.append( a ) ;
}
}
#else
- KABC::DistributionListManager manager( abook );
+ TDEABC::DistributionListManager manager( abook );
manager.load();
const TQStringList dList = manager.listNames();
for ( TQStringList::ConstIterator it = dList.begin(); it != dList.end(); ++it ) {
if ( (*it) == text ) {
- const TQValueList<KABC::DistributionList::Entry> eList = manager.list( *it )->entries();
- TQValueList<KABC::DistributionList::Entry>::ConstIterator eit;
+ const TQValueList<TDEABC::DistributionList::Entry> eList = manager.list( *it )->entries();
+ TQValueList<TDEABC::DistributionList::Entry>::ConstIterator eit;
for ( eit = eList.begin(); eit != eList.end(); ++eit ) {
- KABC::Addressee a = (*eit).addressee;
+ TDEABC::Addressee a = (*eit).addressee;
if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) {
aList.append( a ) ;
}
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index abe649595..3454f81d2 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -71,12 +71,12 @@ class KOAttendeeEditor : public TQWidget
void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *layout );
void initEditWidgets( TQWidget *parent, TQBoxLayout *layout );
- /** Reads values from a KABC::Addressee and inserts a new Attendee
+ /** Reads values from a TDEABC::Addressee and inserts a new Attendee
* item into the listview with those items. Used when adding attendees
* from the addressbook and expanding distribution lists.
* The optional Attendee parameter can be used to pass in default values
* to be used by the new Attendee. */
- void insertAttendeeFromAddressee( const KABC::Addressee &a, const KCal::Attendee* at=0 );
+ void insertAttendeeFromAddressee( const TDEABC::Addressee &a, const KCal::Attendee* at=0 );
void fillOrganizerCombo();
virtual TQListViewItem* hasExampleAttendee() const = 0;
@@ -122,7 +122,7 @@ class KOAttendeeEditor : public TQWidget
TQPtrList<KCal::Attendee> mnewAttendees;
private:
- KABC::Addressee::List expandDistList( const TQString &text ) const;
+ TDEABC::Addressee::List expandDistList( const TQString &text ) const;
bool mDisableItemUpdate;
};
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index 77216a99e..224c7bffb 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -549,9 +549,9 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
TQStringList labels;
if ( KVCardDrag::canDecode( source ) ) {
- KABC::Addressee::List addressees;
+ TDEABC::Addressee::List addressees;
KVCardDrag::decode( source, addressees );
- for ( KABC::Addressee::List::ConstIterator it = addressees.constBegin();
+ for ( TDEABC::Addressee::List::ConstIterator it = addressees.constBegin();
it != addressees.constEnd(); ++it ) {
urls.append( TDEPIMPROTOCOL_CONTACT + ( *it ).uid() );
// there is some weirdness about realName(), hence fromUtf8
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 4889906a3..95d211762 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -155,9 +155,9 @@ void KOAttendeeListView::dropEvent( TQDropEvent *e )
TQString text;
#ifndef KORG_NOKABC
- KABC::Addressee::List list;
+ TDEABC::Addressee::List list;
if ( KVCardDrag::decode( e, list ) ) {
- KABC::Addressee::List::Iterator it;
+ TDEABC::Addressee::List::Iterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
TQString em( (*it).fullEmail() );
if ( em.isEmpty() ) {
@@ -312,10 +312,10 @@ void KOEditorDetails::writeEvent(Incidence *event)
/* Check if the attendee is a distribution list and expand it */
if ( attendee->email().isEmpty() ) {
KPIM::DistributionList list =
- KPIM::DistributionList::findByName( KABC::StdAddressBook::self(), attendee->name() );
+ KPIM::DistributionList::findByName( TDEABC::StdAddressBook::self(), attendee->name() );
if ( !list.isEmpty() ) {
toBeDeleted.push_back( item ); // remove it once we are done expanding
- KPIM::DistributionList::Entry::List entries = list.entries( KABC::StdAddressBook::self() );
+ KPIM::DistributionList::Entry::List entries = list.entries( TDEABC::StdAddressBook::self() );
KPIM::DistributionList::Entry::List::Iterator it( entries.begin() );
while ( it != entries.end() ) {
KPIM::DistributionList::Entry &e = ( *it );
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index ee416efaf..69c1f566f 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -766,10 +766,10 @@ void KOEditorFreeBusy::writeEvent(KCal::Event * event)
/* Check if the attendee is a distribution list and expand it */
if ( attendee->email().isEmpty() ) {
KPIM::DistributionList list =
- KPIM::DistributionList::findByName( KABC::StdAddressBook::self(), attendee->name() );
+ KPIM::DistributionList::findByName( TDEABC::StdAddressBook::self(), attendee->name() );
if ( !list.isEmpty() ) {
toBeDeleted.push_back( item ); // remove it once we are done expanding
- KPIM::DistributionList::Entry::List entries = list.entries( KABC::StdAddressBook::self() );
+ KPIM::DistributionList::Entry::List entries = list.entries( TDEABC::StdAddressBook::self() );
KPIM::DistributionList::Entry::List::Iterator it( entries.begin() );
while ( it != entries.end() ) {
KPIM::DistributionList::Entry &e = ( *it );
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 0cd128ccd..40851e994 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -366,7 +366,7 @@ void KOIncidenceEditor::addAttendees( const TQStringList &attendees )
TQStringList::ConstIterator it;
for ( it = attendees.begin(); it != attendees.end(); ++it ) {
TQString name, email;
- KABC::Addressee::parseEmailAddress( *it, name, email );
+ TDEABC::Addressee::parseEmailAddress( *it, name, email );
mAttendeeEditor->insertAttendee( new Attendee( name, email, true, Attendee::NeedsAction ) );
}
}
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index f5f76e26f..969b62449 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -90,7 +90,7 @@ KOPrefs::KOPrefs() :
monthViewFontItem()->setDefaultValue( mDefaultMonthViewFont );
// Load it now, not deep within some painting code
- mMyAddrBookMails = KABC::StdAddressBook::self()->whoAmI().emails();
+ mMyAddrBookMails = TDEABC::StdAddressBook::self()->whoAmI().emails();
}
@@ -380,7 +380,7 @@ TQStringList KOPrefs::fullEmails()
fullEmails << TQString("%1 <%2>").arg( fullName() ).arg( *it );
}
// Add emails from the user's kaddressbook entry
- KABC::Addressee me = KABC::StdAddressBook::self()->whoAmI();
+ TDEABC::Addressee me = TDEABC::StdAddressBook::self()->whoAmI();
lst = me.emails();
for ( it = lst.begin(); it != lst.end(); ++it ) {
fullEmails << me.fullEmail( *it );
diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp
index f4d8ea84f..c8366adda 100644
--- a/korganizer/publishdialog.cpp
+++ b/korganizer/publishdialog.cpp
@@ -124,10 +124,10 @@ void PublishDialog::removeItem()
void PublishDialog::openAddressbook()
{
#ifndef KORG_NOKABC
- KABC::Addressee::List addressList;
- addressList = KABC::AddresseeDialog::getAddressees( this );
- //KABC::Addressee a = KABC::AddresseeDialog::getAddressee(this);
- KABC::Addressee a = addressList.first();
+ TDEABC::Addressee::List addressList;
+ addressList = TDEABC::AddresseeDialog::getAddressees( this );
+ //TDEABC::Addressee a = TDEABC::AddresseeDialog::getAddressee(this);
+ TDEABC::Addressee a = addressList.first();
if ( !a.isEmpty() ) {
uint i;
for ( i=0; i<addressList.size(); i++ ) {