summaryrefslogtreecommitdiffstats
path: root/kaddressbook
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook')
-rw-r--r--kaddressbook/Makefile.am2
-rw-r--r--kaddressbook/TODO4
-rw-r--r--kaddressbook/addresseditwidget.cpp86
-rw-r--r--kaddressbook/addresseditwidget.h30
-rw-r--r--kaddressbook/addresseeconfig.cpp2
-rw-r--r--kaddressbook/addresseeconfig.h2
-rw-r--r--kaddressbook/addresseeeditorbase.h4
-rw-r--r--kaddressbook/addresseeeditordialog.cpp8
-rw-r--r--kaddressbook/addresseeeditordialog.h8
-rw-r--r--kaddressbook/addresseeeditorextension.cpp4
-rw-r--r--kaddressbook/addresseeeditorextension.h2
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp28
-rw-r--r--kaddressbook/addresseeeditorwidget.h8
-rw-r--r--kaddressbook/addresseeutil.cpp20
-rw-r--r--kaddressbook/addresseeutil.h14
-rw-r--r--kaddressbook/advancedcustomfields.cpp10
-rw-r--r--kaddressbook/advancedcustomfields.h6
-rw-r--r--kaddressbook/common/filter.cpp6
-rw-r--r--kaddressbook/common/filter.h4
-rw-r--r--kaddressbook/common/locationmap.cpp4
-rw-r--r--kaddressbook/common/locationmap.h4
-rw-r--r--kaddressbook/contacteditorwidgetmanager.cpp4
-rw-r--r--kaddressbook/contacteditorwidgetmanager.h6
-rw-r--r--kaddressbook/customfieldswidget.cpp10
-rw-r--r--kaddressbook/customfieldswidget.h14
-rw-r--r--kaddressbook/distributionlisteditor.cpp20
-rw-r--r--kaddressbook/distributionlisteditor.h4
-rw-r--r--kaddressbook/distributionlisteditor_p.h8
-rw-r--r--kaddressbook/distributionlistpicker.cpp2
-rw-r--r--kaddressbook/distributionlistpicker.h6
-rw-r--r--kaddressbook/editors/Makefile.am2
-rw-r--r--kaddressbook/editors/cryptowidget.cpp6
-rw-r--r--kaddressbook/editors/cryptowidget.h8
-rw-r--r--kaddressbook/editors/imeditorwidget.cpp4
-rw-r--r--kaddressbook/editors/imeditorwidget.h4
-rw-r--r--kaddressbook/extensionmanager.cpp8
-rw-r--r--kaddressbook/extensionmanager.h2
-rw-r--r--kaddressbook/features/Makefile.am6
-rw-r--r--kaddressbook/features/distributionlistngwidget.cpp14
-rw-r--r--kaddressbook/features/distributionlistngwidget.h8
-rw-r--r--kaddressbook/features/distributionlistwidget.cpp54
-rw-r--r--kaddressbook/features/distributionlistwidget.h6
-rw-r--r--kaddressbook/features/resourceselection.cpp26
-rw-r--r--kaddressbook/features/resourceselection.h2
-rw-r--r--kaddressbook/freebusywidget.cpp6
-rw-r--r--kaddressbook/freebusywidget.h8
-rw-r--r--kaddressbook/geowidget.cpp10
-rw-r--r--kaddressbook/geowidget.h10
-rw-r--r--kaddressbook/imagewidget.cpp28
-rw-r--r--kaddressbook/imagewidget.h22
-rw-r--r--kaddressbook/imeditwidget.cpp2
-rw-r--r--kaddressbook/imeditwidget.h4
-rw-r--r--kaddressbook/incsearchwidget.cpp10
-rw-r--r--kaddressbook/incsearchwidget.h8
-rw-r--r--kaddressbook/interfaces/Makefile.am2
-rw-r--r--kaddressbook/interfaces/configurewidget.cpp4
-rw-r--r--kaddressbook/interfaces/configurewidget.h8
-rw-r--r--kaddressbook/interfaces/contacteditorwidget.cpp4
-rw-r--r--kaddressbook/interfaces/contacteditorwidget.h12
-rw-r--r--kaddressbook/interfaces/core.h8
-rw-r--r--kaddressbook/interfaces/extensionwidget.cpp4
-rw-r--r--kaddressbook/interfaces/extensionwidget.h4
-rw-r--r--kaddressbook/interfaces/xxport.cpp10
-rw-r--r--kaddressbook/interfaces/xxport.h14
-rw-r--r--kaddressbook/jumpbuttonbar.cpp6
-rw-r--r--kaddressbook/jumpbuttonbar.h2
-rw-r--r--kaddressbook/kabcore.cpp174
-rw-r--r--kaddressbook/kabcore.h18
-rw-r--r--kaddressbook/kablock.cpp16
-rw-r--r--kaddressbook/kablock.h16
-rw-r--r--kaddressbook/kabtools.cpp46
-rw-r--r--kaddressbook/kabtools.h6
-rw-r--r--kaddressbook/kaddressbookview.cpp24
-rw-r--r--kaddressbook/kaddressbookview.h12
-rw-r--r--kaddressbook/kcmconfigs/Makefile.am2
-rw-r--r--kaddressbook/kcmconfigs/addhostdialog.cpp26
-rw-r--r--kaddressbook/kcmconfigs/addhostdialog.h2
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp2
-rw-r--r--kaddressbook/keywidget.cpp36
-rw-r--r--kaddressbook/keywidget.h6
-rw-r--r--kaddressbook/ldapsearchdialog.cpp46
-rw-r--r--kaddressbook/ldapsearchdialog.h10
-rw-r--r--kaddressbook/nameeditdialog.cpp6
-rw-r--r--kaddressbook/nameeditdialog.h6
-rw-r--r--kaddressbook/phoneeditwidget.cpp48
-rw-r--r--kaddressbook/phoneeditwidget.h14
-rw-r--r--kaddressbook/printing/detailledstyle.cpp6
-rw-r--r--kaddressbook/printing/detailledstyle.h6
-rw-r--r--kaddressbook/printing/kabentrypainter.cpp26
-rw-r--r--kaddressbook/printing/kabentrypainter.h2
-rw-r--r--kaddressbook/printing/mikesstyle.cpp12
-rw-r--r--kaddressbook/printing/mikesstyle.h6
-rw-r--r--kaddressbook/printing/printingwizard.cpp14
-rw-r--r--kaddressbook/printing/printingwizard.h6
-rw-r--r--kaddressbook/printing/printsortmode.cpp16
-rw-r--r--kaddressbook/printing/printsortmode.h14
-rw-r--r--kaddressbook/printing/printstyle.cpp4
-rw-r--r--kaddressbook/printing/printstyle.h8
-rw-r--r--kaddressbook/printing/stylepage.cpp10
-rw-r--r--kaddressbook/printing/stylepage.h10
-rw-r--r--kaddressbook/searchmanager.cpp28
-rw-r--r--kaddressbook/searchmanager.h12
-rw-r--r--kaddressbook/secrecywidget.cpp14
-rw-r--r--kaddressbook/secrecywidget.h6
-rw-r--r--kaddressbook/simpleaddresseeeditor.cpp4
-rw-r--r--kaddressbook/simpleaddresseeeditor.h6
-rw-r--r--kaddressbook/soundwidget.cpp10
-rw-r--r--kaddressbook/soundwidget.h10
-rw-r--r--kaddressbook/thumbnailcreator/Makefile.am2
-rw-r--r--kaddressbook/thumbnailcreator/ldifvcardcreator.cpp18
-rw-r--r--kaddressbook/undocmds.cpp80
-rw-r--r--kaddressbook/undocmds.h50
-rw-r--r--kaddressbook/viewconfigurefieldspage.cpp40
-rw-r--r--kaddressbook/viewconfigurefieldspage.h4
-rw-r--r--kaddressbook/viewconfigurewidget.cpp2
-rw-r--r--kaddressbook/viewconfigurewidget.h2
-rw-r--r--kaddressbook/viewmanager.cpp22
-rw-r--r--kaddressbook/viewmanager.h8
-rw-r--r--kaddressbook/views/Makefile.am6
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp2
-rw-r--r--kaddressbook/views/configurecardviewdialog.h4
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp2
-rw-r--r--kaddressbook/views/configuretableviewdialog.h4
-rw-r--r--kaddressbook/views/contactlistview.cpp14
-rw-r--r--kaddressbook/views/contactlistview.h18
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp30
-rw-r--r--kaddressbook/views/kaddressbookcardview.h2
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp22
-rw-r--r--kaddressbook/views/kaddressbookiconview.h4
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp14
-rw-r--r--kaddressbook/views/kaddressbooktableview.h4
-rw-r--r--kaddressbook/xxport/Makefile.am18
-rw-r--r--kaddressbook/xxport/bookmark_xxport.cpp6
-rw-r--r--kaddressbook/xxport/bookmark_xxport.h4
-rw-r--r--kaddressbook/xxport/csv_xxport.cpp18
-rw-r--r--kaddressbook/xxport/csv_xxport.h8
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp114
-rw-r--r--kaddressbook/xxport/csvimportdialog.h6
-rw-r--r--kaddressbook/xxport/eudora_xxport.cpp20
-rw-r--r--kaddressbook/xxport/eudora_xxport.h4
-rw-r--r--kaddressbook/xxport/gnokii_xxport.cpp146
-rw-r--r--kaddressbook/xxport/gnokii_xxport.h6
-rw-r--r--kaddressbook/xxport/kde2_xxport.cpp12
-rw-r--r--kaddressbook/xxport/kde2_xxport.h4
-rw-r--r--kaddressbook/xxport/ldif_xxport.cpp14
-rw-r--r--kaddressbook/xxport/ldif_xxport.h8
-rw-r--r--kaddressbook/xxport/opera_xxport.cpp22
-rw-r--r--kaddressbook/xxport/opera_xxport.h4
-rw-r--r--kaddressbook/xxport/pab_mapihd.cpp14
-rw-r--r--kaddressbook/xxport/pab_mapihd.h2
-rw-r--r--kaddressbook/xxport/pab_xxport.cpp6
-rw-r--r--kaddressbook/xxport/pab_xxport.h6
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp104
-rw-r--r--kaddressbook/xxport/vcard_xxport.h14
-rw-r--r--kaddressbook/xxportmanager.cpp8
-rw-r--r--kaddressbook/xxportselectdialog.cpp18
-rw-r--r--kaddressbook/xxportselectdialog.h6
157 files changed, 1179 insertions, 1179 deletions
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am
index 677d94ad0..3ae6e6366 100644
--- a/kaddressbook/Makefile.am
+++ b/kaddressbook/Makefile.am
@@ -45,7 +45,7 @@ libkaddressbook_la_LIBADD = $(top_builddir)/kaddressbook/printing/libprinter.la
$(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkcal/libkcal.la \
- -ltdeabc_file $(LIB_KABC) $(LIB_TDEHTML) \
+ -ltdeabc_file $(LIB_TDEABC) $(LIB_TDEHTML) \
$(top_builddir)/kaddressbook/common/libkabcommon.la \
$(top_builddir)/kaddressbook/editors/libkabim.la \
-ltdeprint
diff --git a/kaddressbook/TODO b/kaddressbook/TODO
index df0db82b0..36b7ff8cf 100644
--- a/kaddressbook/TODO
+++ b/kaddressbook/TODO
@@ -29,7 +29,7 @@ Improvements (things that just need to be improved/rewritten)
- Add a meta data wrapper for views - DONE
- Add show/hide toolbars in the edit menu - DONE
- Break KAddressBook into KAddressBook and ViewManager - DONE
-- Change the view items to take a KABC::Addressee rather than a uid - DONE
+- Change the view items to take a TDEABC::Addressee rather than a uid - DONE
- DnD on Card View - DONE
- Card View specific config options - DONE
- Implemented a good date picker widget somehow using the KDatePicker
@@ -44,7 +44,7 @@ Improvements (things that just need to be improved/rewritten)
Fixes (things that used to work and are now broken)
-----
-- Fix import/export code to use KABC::Addressee - DONE
+- Fix import/export code to use TDEABC::Addressee - DONE
- Fix/reinstate LDAP dialog - DONE
- Fix vcard importing
- Fix KPilot abbrowser conduit
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index a02092646..83f278748 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -112,11 +112,11 @@ void AddressEditWidget::setReadOnly( bool readOnly )
mEditButton->setEnabled( !readOnly );
}
-KABC::Address::List AddressEditWidget::addresses()
+TDEABC::Address::List AddressEditWidget::addresses()
{
- KABC::Address::List retList;
+ TDEABC::Address::List retList;
- KABC::Address::List::ConstIterator it;
+ TDEABC::Address::List::ConstIterator it;
for ( it = mAddressList.begin(); it != mAddressList.end(); ++it )
if ( !(*it).isEmpty() )
retList.append( *it );
@@ -124,8 +124,8 @@ KABC::Address::List AddressEditWidget::addresses()
return retList;
}
-void AddressEditWidget::setAddresses( const KABC::Addressee &addr,
- const KABC::Address::List &list )
+void AddressEditWidget::setAddresses( const TDEABC::Addressee &addr,
+ const TDEABC::Address::List &list )
{
mAddressee = addr;
@@ -135,8 +135,8 @@ void AddressEditWidget::setAddresses( const KABC::Addressee &addr,
mTypeCombo->insertTypeList( list );
TQValueList<int> defaultTypes;
- defaultTypes << KABC::Address::Home;
- defaultTypes << KABC::Address::Work;
+ defaultTypes << TDEABC::Address::Home;
+ defaultTypes << TDEABC::Address::Work;
AddresseeConfig config( mAddressee );
const TQValueList<int> configList = config.noDefaultAddrTypes();
@@ -155,10 +155,10 @@ void AddressEditWidget::setAddresses( const KABC::Addressee &addr,
mTypeCombo->updateTypes();
// find preferred address which will be shown
- int preferred = KABC::Address::Home; // default if no preferred address set
- KABC::Address::List::ConstIterator addrIt;
+ int preferred = TDEABC::Address::Home; // default if no preferred address set
+ TDEABC::Address::List::ConstIterator addrIt;
for ( addrIt = list.begin(); addrIt != list.end(); ++addrIt )
- if ( (*addrIt).type() & KABC::Address::Pref ) {
+ if ( (*addrIt).type() & TDEABC::Address::Pref ) {
preferred = (*addrIt).type();
break;
}
@@ -168,7 +168,7 @@ void AddressEditWidget::setAddresses( const KABC::Addressee &addr,
updateAddressEdit();
}
-void AddressEditWidget::updateAddressee( const KABC::Addressee &addr )
+void AddressEditWidget::updateAddressee( const TDEABC::Addressee &addr )
{
mAddressee = addr;
updateAddressEdit();
@@ -182,13 +182,13 @@ void AddressEditWidget::edit()
mAddressList = dialog.addresses();
bool hasHome = false, hasWork = false;
- KABC::Address::List::ConstIterator it;
+ TDEABC::Address::List::ConstIterator it;
for ( it = mAddressList.begin(); it != mAddressList.end(); ++it ) {
- if ( (*it).type() == KABC::Address::Home ) {
+ if ( (*it).type() == TDEABC::Address::Home ) {
if ( !(*it).isEmpty() )
hasHome = true;
}
- if ( (*it).type() == KABC::Address::Work ) {
+ if ( (*it).type() == TDEABC::Address::Work ) {
if ( !(*it).isEmpty() )
hasWork = true;
}
@@ -197,9 +197,9 @@ void AddressEditWidget::edit()
AddresseeConfig config( mAddressee );
TQValueList<int> configList;
if ( !hasHome )
- configList << KABC::Address::Home;
+ configList << TDEABC::Address::Home;
if ( !hasWork )
- configList << KABC::Address::Work;
+ configList << TDEABC::Address::Work;
config.setNoDefaultAddrTypes( configList );
mTypeCombo->updateTypes();
@@ -211,7 +211,7 @@ void AddressEditWidget::edit()
void AddressEditWidget::updateAddressEdit()
{
- KABC::Address::List::Iterator it = mTypeCombo->selectedElement();
+ TDEABC::Address::List::Iterator it = mTypeCombo->selectedElement();
bool block = signalsBlocked();
blockSignals( true );
@@ -219,10 +219,10 @@ void AddressEditWidget::updateAddressEdit()
mAddressField->setText( "" );
if ( it != mAddressList.end() ) {
- KABC::Address a = *it;
+ TDEABC::Address a = *it;
if ( !a.isEmpty() ) {
#if TDE_VERSION >= 319
- if ( a.type() & KABC::Address::Work && mAddressee.realName() != mAddressee.organization() ) {
+ if ( a.type() & TDEABC::Address::Work && mAddressee.realName() != mAddressee.organization() ) {
mAddressField->setText( a.formattedAddress( mAddressee.realName(),
mAddressee.organization() ) );
} else {
@@ -256,7 +256,7 @@ void AddressEditWidget::updateAddressEdit()
blockSignals( block );
}
-AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
+AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list,
int selected, TQWidget *parent,
const char *name )
: KDialogBase( Plain, i18n( "street/postal", "Edit Address" ), Ok | Cancel, Ok,
@@ -273,7 +273,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
mTypeCombo = new AddressTypeCombo( mAddressList, page );
topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 );
- TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page );
+ TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( TDEABC::Address::streetLabel() ), page );
label->setAlignment( TQt::AlignTop | TQt::AlignLeft );
topLayout->addWidget( label, 1, 0 );
mStreetTextEdit = new TQTextEdit( page );
@@ -284,31 +284,31 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) );
mStreetTextEdit->installEventFilter( eater );
- label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page );
+ label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( TDEABC::Address::postOfficeBoxLabel() ), page );
topLayout->addWidget( label, 2 , 0 );
mPOBoxEdit = new KLineEdit( page );
label->setBuddy( mPOBoxEdit );
topLayout->addWidget( mPOBoxEdit, 2, 1 );
- label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( KABC::Address::localityLabel() ), page );
+ label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( TDEABC::Address::localityLabel() ), page );
topLayout->addWidget( label, 3, 0 );
mLocalityEdit = new KLineEdit( page );
label->setBuddy( mLocalityEdit );
topLayout->addWidget( mLocalityEdit, 3, 1 );
- label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( KABC::Address::regionLabel() ), page );
+ label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( TDEABC::Address::regionLabel() ), page );
topLayout->addWidget( label, 4, 0 );
mRegionEdit = new KLineEdit( page );
label->setBuddy( mRegionEdit );
topLayout->addWidget( mRegionEdit, 4, 1 );
- label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( KABC::Address::postalCodeLabel() ), page );
+ label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( TDEABC::Address::postalCodeLabel() ), page );
topLayout->addWidget( label, 5, 0 );
mPostalCodeEdit = new KLineEdit( page );
label->setBuddy( mPostalCodeEdit );
topLayout->addWidget( mPostalCodeEdit, 5, 1 );
- label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page );
+ label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( TDEABC::Address::countryLabel() ), page );
topLayout->addWidget( label, 6, 0 );
mCountryCombo = new KComboBox( page );
mCountryCombo->setEditable( true );
@@ -371,7 +371,7 @@ AddressEditDialog::~AddressEditDialog()
{
}
-KABC::Address::List AddressEditDialog::addresses()
+TDEABC::Address::List AddressEditDialog::addresses()
{
saveAddress( *(mTypeCombo->selectedElement()) );
@@ -403,7 +403,7 @@ void AddressEditDialog::addAddress()
void AddressEditDialog::removeAddress()
{
if ( mAddressList.count() > 0 ) {
- KABC::Address::List::Iterator it = mTypeCombo->selectedElement();
+ TDEABC::Address::List::Iterator it = mTypeCombo->selectedElement();
if ( mPreviousAddress && mPreviousAddress->id() == (*it).id() )
mPreviousAddress = 0;
@@ -421,7 +421,7 @@ void AddressEditDialog::removeAddress()
void AddressEditDialog::changeType()
{
- KABC::Address::List::Iterator a = mTypeCombo->selectedElement();
+ TDEABC::Address::List::Iterator a = mTypeCombo->selectedElement();
AddressTypeDialog dlg( (*a).type(), this );
if ( dlg.exec() ) {
@@ -437,8 +437,8 @@ void AddressEditDialog::editLabel()
{
#if KDE_IS_VERSION(3,3,0)
bool ok = false;
- TQString result = KInputDialog::getMultiLineText( KABC::Address::labelLabel(),
- KABC::Address::labelLabel(),
+ TQString result = KInputDialog::getMultiLineText( TDEABC::Address::labelLabel(),
+ TDEABC::Address::labelLabel(),
mLabel, &ok, this );
if ( ok ) {
mLabel = result;
@@ -452,8 +452,8 @@ void AddressEditDialog::updateAddressEdits()
if ( mPreviousAddress )
saveAddress( *mPreviousAddress );
- KABC::Address::List::Iterator it = mTypeCombo->selectedElement();
- KABC::Address a = *it;
+ TDEABC::Address::List::Iterator it = mTypeCombo->selectedElement();
+ TDEABC::Address a = *it;
mPreviousAddress = &(*it);
bool tmp = mChanged;
@@ -466,7 +466,7 @@ void AddressEditDialog::updateAddressEdits()
mCountryCombo->setCurrentText( a.country() );
mLabel = a.label();
- mPreferredCheckBox->setChecked( a.type() & KABC::Address::Pref );
+ mPreferredCheckBox->setChecked( a.type() & TDEABC::Address::Pref );
if ( a.isEmpty() )
mCountryCombo->setCurrentText( TDEGlobal::locale()->twoAlphaToCountryName( TDEGlobal::locale()->country() ) );
@@ -481,7 +481,7 @@ void AddressEditDialog::modified()
mChanged = true;
}
-void AddressEditDialog::saveAddress( KABC::Address &addr )
+void AddressEditDialog::saveAddress( TDEABC::Address &addr )
{
addr.setLocality( mLocalityEdit->text() );
addr.setRegion( mRegionEdit->text() );
@@ -493,13 +493,13 @@ void AddressEditDialog::saveAddress( KABC::Address &addr )
if ( mPreferredCheckBox->isChecked() ) {
- KABC::Address::List::Iterator it;
+ TDEABC::Address::List::Iterator it;
for ( it = mAddressList.begin(); it != mAddressList.end(); ++it )
- (*it).setType( (*it).type() & ~( KABC::Address::Pref ) );
+ (*it).setType( (*it).type() & ~( TDEABC::Address::Pref ) );
- addr.setType( addr.type() | KABC::Address::Pref );
+ addr.setType( addr.type() | TDEABC::Address::Pref );
} else
- addr.setType( addr.type() & ~( KABC::Address::Pref ) );
+ addr.setType( addr.type() & ~( TDEABC::Address::Pref ) );
}
void AddressEditDialog::fillCountryCombo()
@@ -609,12 +609,12 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent )
mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page );
layout->addWidget( mGroup );
- mTypeList = KABC::Address::typeList();
- mTypeList.remove( KABC::Address::Pref );
+ mTypeList = TDEABC::Address::typeList();
+ mTypeList.remove( TDEABC::Address::Pref );
- KABC::Address::TypeList::ConstIterator it;
+ TDEABC::Address::TypeList::ConstIterator it;
for ( it = mTypeList.begin(); it != mTypeList.end(); ++it )
- new TQCheckBox( KABC::Address::typeLabel( *it ), mGroup );
+ new TQCheckBox( TDEABC::Address::typeLabel( *it ), mGroup );
for ( int i = 0; i < mGroup->count(); ++i ) {
TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h
index 5d863573c..e52e5960e 100644
--- a/kaddressbook/addresseditwidget.h
+++ b/kaddressbook/addresseditwidget.h
@@ -44,7 +44,7 @@ class KComboBox;
class KLineEdit;
class TDEListView;
-typedef TypeCombo<KABC::Address> AddressTypeCombo;
+typedef TypeCombo<TDEABC::Address> AddressTypeCombo;
/**
Editor widget for addresses.
@@ -58,13 +58,13 @@ class AddressEditWidget : public TQWidget
AddressEditWidget( TQWidget *parent, const char *name = 0 );
~AddressEditWidget();
- KABC::Address::List addresses();
- void setAddresses( const KABC::Addressee &addr,
- const KABC::Address::List &list );
- void updateAddressee( const KABC::Addressee &addr );
+ TDEABC::Address::List addresses();
+ void setAddresses( const TDEABC::Addressee &addr,
+ const TDEABC::Address::List &list );
+ void updateAddressee( const TDEABC::Addressee &addr );
- void updateTypeCombo( const KABC::Address::List&, KComboBox* );
- KABC::Address currentAddress( KComboBox*, int );
+ void updateTypeCombo( const TDEABC::Address::List&, KComboBox* );
+ TDEABC::Address currentAddress( KComboBox*, int );
void setReadOnly( bool readOnly );
@@ -82,8 +82,8 @@ class AddressEditWidget : public TQWidget
TQPushButton *mEditButton;
KActiveLabel *mAddressField;
- KABC::Address::List mAddressList;
- KABC::Addressee mAddressee;
+ TDEABC::Address::List mAddressList;
+ TDEABC::Addressee mAddressee;
int mIndex;
};
@@ -96,11 +96,11 @@ class AddressEditDialog : public KDialogBase
public:
- AddressEditDialog( const KABC::Address::List &list, int selected,
+ AddressEditDialog( const TDEABC::Address::List &list, int selected,
TQWidget *parent, const char *name = 0 );
~AddressEditDialog();
- KABC::Address::List addresses();
+ TDEABC::Address::List addresses();
bool changed() const;
protected slots:
@@ -113,7 +113,7 @@ class AddressEditDialog : public KDialogBase
void modified();
private:
- void saveAddress( KABC::Address &addr );
+ void saveAddress( TDEABC::Address &addr );
void fillCountryCombo();
TQStringList sortLocaleAware( const TQStringList& );
@@ -129,8 +129,8 @@ class AddressEditDialog : public KDialogBase
TQPushButton *mRemoveButton;
TQPushButton *mChangeTypeButton;
- KABC::Address::List mAddressList;
- KABC::Address *mPreviousAddress;
+ TDEABC::Address::List mAddressList;
+ TDEABC::Address *mPreviousAddress;
bool mChanged;
TQString mLabel;
@@ -150,7 +150,7 @@ class AddressTypeDialog : public KDialogBase
private:
TQButtonGroup *mGroup;
- KABC::Address::TypeList mTypeList;
+ TDEABC::Address::TypeList mTypeList;
};
#endif
diff --git a/kaddressbook/addresseeconfig.cpp b/kaddressbook/addresseeconfig.cpp
index 81f5ceef5..9afda1b2e 100644
--- a/kaddressbook/addresseeconfig.cpp
+++ b/kaddressbook/addresseeconfig.cpp
@@ -24,7 +24,7 @@
#include "addresseeconfig.h"
#include "kabprefs.h"
-using namespace KABC;
+using namespace TDEABC;
AddresseeConfig::AddresseeConfig()
{
diff --git a/kaddressbook/addresseeconfig.h b/kaddressbook/addresseeconfig.h
index 025663fdd..28056dc5a 100644
--- a/kaddressbook/addresseeconfig.h
+++ b/kaddressbook/addresseeconfig.h
@@ -27,7 +27,7 @@
#include <tdeabc/addressee.h>
#include <tdeconfig.h>
-using namespace KABC;
+using namespace TDEABC;
class AddresseeConfig
{
diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h
index d9124609b..036e47e36 100644
--- a/kaddressbook/addresseeeditorbase.h
+++ b/kaddressbook/addresseeeditorbase.h
@@ -41,8 +41,8 @@ class AddresseeEditorBase : public TQWidget
~AddresseeEditorBase() {}
- virtual void setAddressee( const KABC::Addressee& ) = 0;
- virtual const KABC::Addressee &addressee() = 0;
+ virtual void setAddressee( const TDEABC::Addressee& ) = 0;
+ virtual const TDEABC::Addressee &addressee() = 0;
virtual void setInitialFocus() = 0;
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index e53b57218..77d7bcbed 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -77,7 +77,7 @@ AddresseeEditorDialog::~AddresseeEditorDialog()
emit editorDestroyed( mEditorWidget->addressee().uid() );
}
-void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr )
+void AddresseeEditorDialog::setAddressee( const TDEABC::Addressee &addr )
{
enableButton( KDialogBase::Apply, false );
@@ -87,7 +87,7 @@ void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr )
mEditorWidget->setInitialFocus();
}
-KABC::Addressee AddresseeEditorDialog::addressee()
+TDEABC::Addressee AddresseeEditorDialog::addressee()
{
return mEditorWidget->addressee();
}
@@ -129,7 +129,7 @@ void AddresseeEditorDialog::slotOk()
void AddresseeEditorDialog::widgetModified()
{
- const KABC::Addressee addressee = mEditorWidget->addressee();
+ const TDEABC::Addressee addressee = mEditorWidget->addressee();
if ( !addressee.isEmpty() )
setTitle( addressee );
@@ -144,7 +144,7 @@ void AddresseeEditorDialog::slotCancel()
delayedDestruct();
}
-void AddresseeEditorDialog::setTitle( const KABC::Addressee &addr )
+void AddresseeEditorDialog::setTitle( const TDEABC::Addressee &addr )
{
if ( !addr.realName().isEmpty() )
setCaption( i18n( "Edit Contact '%1'" ).arg( addr.realName() ) );
diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h
index 9e53580b3..bfdb3ca9d 100644
--- a/kaddressbook/addresseeeditordialog.h
+++ b/kaddressbook/addresseeeditordialog.h
@@ -42,13 +42,13 @@ class AddresseeEditorDialog : public KDialogBase
TQWidget *parent, const char *name = 0 );
~AddresseeEditorDialog();
- void setAddressee( const KABC::Addressee& );
- KABC::Addressee addressee();
+ void setAddressee( const TDEABC::Addressee& );
+ TDEABC::Addressee addressee();
bool dirty();
signals:
- void contactModified( const KABC::Addressee& );
+ void contactModified( const TDEABC::Addressee& );
void editorDestroyed( const TQString& );
protected slots:
@@ -58,7 +58,7 @@ class AddresseeEditorDialog : public KDialogBase
void widgetModified();
private:
- virtual void setTitle( const KABC::Addressee& );
+ virtual void setTitle( const TDEABC::Addressee& );
AddresseeEditorBase *mEditorWidget;
};
diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp
index 9b9aceac4..5ff8a3f13 100644
--- a/kaddressbook/addresseeeditorextension.cpp
+++ b/kaddressbook/addresseeeditorextension.cpp
@@ -52,8 +52,8 @@ AddresseeEditorExtension::~AddresseeEditorExtension()
void AddresseeEditorExtension::contactsSelectionChanged()
{
- const KABC::Addressee::List selectedAddressees = selectedContacts();
- KABC::Addressee::List modifiedAddress;
+ const TDEABC::Addressee::List selectedAddressees = selectedContacts();
+ TDEABC::Addressee::List modifiedAddress;
if ( mAddresseeEditor->dirty() ) {
mAddresseeEditor->save();
addressees.append( mAddresseeEditor->addressee() );
diff --git a/kaddressbook/addresseeeditorextension.h b/kaddressbook/addresseeeditorextension.h
index 5d152ca2f..949fe0b62 100644
--- a/kaddressbook/addresseeeditorextension.h
+++ b/kaddressbook/addresseeeditorextension.h
@@ -56,7 +56,7 @@ class AddresseeEditorExtension : public KAB::ExtensionWidget
private:
AddresseeEditorBase *mAddresseeEditor;
bool mDirty;
- KABC::Addressee::List addressees;
+ TDEABC::Addressee::List addressees;
};
#endif
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 357de392a..a39101b48 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -88,14 +88,14 @@ AddresseeEditorWidget::~AddresseeEditorWidget()
kdDebug(5720) << "~AddresseeEditorWidget()" << endl;
}
-void AddresseeEditorWidget::setAddressee( const KABC::Addressee &addr )
+void AddresseeEditorWidget::setAddressee( const TDEABC::Addressee &addr )
{
if ( mAddressee.uid() == addr.uid() )
return;
mAddressee = addr;
bool readOnly = false;
- if ( KABC::Resource *res = addr.resource() ) {
+ if ( TDEABC::Resource *res = addr.resource() ) {
if ( res->readOnly() ) {
readOnly = true;
@@ -113,7 +113,7 @@ void AddresseeEditorWidget::setAddressee( const KABC::Addressee &addr )
load();
}
-const KABC::Addressee &AddresseeEditorWidget::addressee()
+const TDEABC::Addressee &AddresseeEditorWidget::addressee()
{
return mAddressee;
}
@@ -181,7 +181,7 @@ void AddresseeEditorWidget::setupTab1()
layout->addWidget( button, 0, 1 );
layout->addWidget( mNameEdit, 0, 2 );
layout->addWidget( mNameLabel, 0, 2 );
- label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 );
+ label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( TDEABC::Addressee::roleLabel() ), tab1 );
mRoleEdit = new KLineEdit( tab1 );
connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
@@ -190,7 +190,7 @@ void AddresseeEditorWidget::setupTab1()
layout->addWidget( mRoleEdit, 1, 2 );
// Organization
- label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 );
+ label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( TDEABC::Addressee::organizationLabel() ), tab1 );
mOrgEdit = new KLineEdit( tab1 );
label->setBuddy( mOrgEdit );
connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
@@ -256,7 +256,7 @@ void AddresseeEditorWidget::setupTab1()
TDEIcon::SizeMedium ) );
homePageLayout->addWidget( label );
- label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 );
+ label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( TDEABC::Addressee::urlLabel() ), tab1 );
mURLEdit = new KLineEdit( tab1 );
connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
TQT_SLOT( textChanged( const TQString& ) ) );
@@ -369,7 +369,7 @@ void AddresseeEditorWidget::setupTab2()
label->setBuddy( mAssistantEdit );
layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
- label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 );
+ label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( TDEABC::Addressee::titleLabel() ), tab2 );
layout->addWidget( label, 2, 3 );
mTitleEdit = new KLineEdit( tab2 );
connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
@@ -468,7 +468,7 @@ void AddresseeEditorWidget::setupAdditionalTabs()
}
KAB::ContactEditorWidget *widget
- = manager->factory( i )->createWidget( KABC::StdAddressBook::self( true ),
+ = manager->factory( i )->createWidget( TDEABC::StdAddressBook::self( true ),
page );
if ( widget )
page->addWidget( widget );
@@ -490,7 +490,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs()
continue;
ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget );
- AdvancedCustomFields *wdg = new AdvancedCustomFields( *it, KABC::StdAddressBook::self( true ), page );
+ AdvancedCustomFields *wdg = new AdvancedCustomFields( *it, TDEABC::StdAddressBook::self( true ), page );
if ( wdg ) {
mTabPages.insert( wdg->pageIdentifier(), page );
mTabWidget->addTab( page, wdg->pageTitle() );
@@ -662,8 +662,8 @@ void AddresseeEditorWidget::save()
mAddressee.setEmails( mEmailWidget->emails() );
// Save the phone numbers
- KABC::PhoneNumber::List phoneNumbers;
- KABC::PhoneNumber::List::ConstIterator phoneIter;
+ TDEABC::PhoneNumber::List phoneNumbers;
+ TDEABC::PhoneNumber::List::ConstIterator phoneIter;
phoneNumbers = mAddressee.phoneNumbers();
for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end();
++phoneIter )
@@ -675,8 +675,8 @@ void AddresseeEditorWidget::save()
mAddressee.insertPhoneNumber( *phoneIter );
// Save the addresses
- KABC::Address::List addresses;
- KABC::Address::List::ConstIterator addressIter;
+ TDEABC::Address::List addresses;
+ TDEABC::Address::List::ConstIterator addressIter;
addresses = mAddressee.addresses();
for ( addressIter = addresses.begin(); addressIter != addresses.end();
++addressIter )
@@ -741,7 +741,7 @@ void AddresseeEditorWidget::organizationTextChanged( const TQString &text )
void AddresseeEditorWidget::nameBoxChanged()
{
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
AddresseeConfig config( mAddressee );
if ( config.automaticNameParsing() ) {
addr.setNameFromString( mNameEdit->text() );
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h
index 30dcad3f5..918070bb5 100644
--- a/kaddressbook/addresseeeditorwidget.h
+++ b/kaddressbook/addresseeeditorwidget.h
@@ -61,7 +61,7 @@ class CategorySelectDialog;
class CategoryEditDialog;
}
-namespace KABC { class AddressBook; }
+namespace TDEABC { class AddressBook; }
class AddresseeEditorWidget : public AddresseeEditorBase
{
@@ -72,8 +72,8 @@ class AddresseeEditorWidget : public AddresseeEditorBase
AddresseeEditorWidget( TQWidget *parent, const char *name = 0 );
~AddresseeEditorWidget();
- void setAddressee( const KABC::Addressee& );
- const KABC::Addressee &addressee();
+ void setAddressee( const TDEABC::Addressee& );
+ const TDEABC::Addressee &addressee();
void load();
void save();
@@ -122,7 +122,7 @@ class AddresseeEditorWidget : public AddresseeEditorBase
void setReadOnly( bool );
- KABC::Addressee mAddressee;
+ TDEABC::Addressee mAddressee;
int mFormattedNameType;
bool mDirty;
bool mBlockSignals;
diff --git a/kaddressbook/addresseeutil.cpp b/kaddressbook/addresseeutil.cpp
index 1368e4782..f2a925fcb 100644
--- a/kaddressbook/addresseeutil.cpp
+++ b/kaddressbook/addresseeutil.cpp
@@ -30,40 +30,40 @@
#include "addresseeutil.h"
#if defined(KABC_VCARD_ENCODING_FIX)
-TQByteArray AddresseeUtil::addresseesToClipboard( const KABC::Addressee::List &list )
+TQByteArray AddresseeUtil::addresseesToClipboard( const TDEABC::Addressee::List &list )
{
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
return converter.createVCardsRaw( list );
}
-KABC::Addressee::List AddresseeUtil::clipboardToAddressees( const TQByteArray &data )
+TDEABC::Addressee::List AddresseeUtil::clipboardToAddressees( const TQByteArray &data )
{
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
return converter.parseVCardsRaw( data.data() );
}
#else
-TQString AddresseeUtil::addresseesToClipboard( const KABC::Addressee::List &list )
+TQString AddresseeUtil::addresseesToClipboard( const TDEABC::Addressee::List &list )
{
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
return converter.createVCards( list );
}
-KABC::Addressee::List AddresseeUtil::clipboardToAddressees( const TQString &data )
+TDEABC::Addressee::List AddresseeUtil::clipboardToAddressees( const TQString &data )
{
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
return converter.parseVCards( data );
}
#endif
-TQString AddresseeUtil::addresseesToEmails( const KABC::Addressee::List &addrList )
+TQString AddresseeUtil::addresseesToEmails( const TDEABC::Addressee::List &addrList )
{
TQStringList emails;
- KABC::Addressee::List::ConstIterator it;
+ TDEABC::Addressee::List::ConstIterator it;
for ( it = addrList.begin(); it != addrList.end(); ++it )
emails.append( (*it).fullEmail() );
diff --git a/kaddressbook/addresseeutil.h b/kaddressbook/addresseeutil.h
index ed84512ff..0b68069be 100644
--- a/kaddressbook/addresseeutil.h
+++ b/kaddressbook/addresseeutil.h
@@ -36,19 +36,19 @@
NOTE: Currently these methods are not implemented properly. The
vCard parser in KABC needs to be updated and there is no way to get from
- KABC::Addressee to vCard.
+ TDEABC::Addressee to vCard.
*/
class AddresseeUtil
{
public:
/**
- Same as above function, except that an entire list of KABC::Addressee
+ Same as above function, except that an entire list of TDEABC::Addressee
objects will be converted to vCard and put in the string.
*/
#if defined(KABC_VCARD_ENCODING_FIX)
- static TQByteArray addresseesToClipboard( const KABC::Addressee::List &addrList );
+ static TQByteArray addresseesToClipboard( const TDEABC::Addressee::List &addrList );
#else
- static TQString addresseesToClipboard( const KABC::Addressee::List &addrList );
+ static TQString addresseesToClipboard( const TDEABC::Addressee::List &addrList );
#endif
/**
@@ -57,15 +57,15 @@ class AddresseeUtil
will be returned.
*/
#if defined(KABC_VCARD_ENCODING_FIX)
- static KABC::Addressee::List clipboardToAddressees( const TQByteArray &clipboard );
+ static TDEABC::Addressee::List clipboardToAddressees( const TQByteArray &clipboard );
#else
- static KABC::Addressee::List clipboardToAddressees( const TQString &clipboard );
+ static TDEABC::Addressee::List clipboardToAddressees( const TQString &clipboard );
#endif
/**
Converts the list of addressee objects into a list of email addresses.
*/
- static TQString addresseesToEmails( const KABC::Addressee::List &addrList );
+ static TQString addresseesToEmails( const TDEABC::Addressee::List &addrList );
private:
AddresseeUtil() {}
diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp
index 6af325236..d5b534791 100644
--- a/kaddressbook/advancedcustomfields.cpp
+++ b/kaddressbook/advancedcustomfields.cpp
@@ -48,7 +48,7 @@
class KABCStorage : public KPIM::DesignerFields::Storage
{
public:
- KABCStorage( KABC::Addressee *a, const TQString &ns )
+ KABCStorage( TDEABC::Addressee *a, const TQString &ns )
: mAddressee( a ), mNs( ns )
{
}
@@ -79,19 +79,19 @@ class KABCStorage : public KPIM::DesignerFields::Storage
}
private:
- KABC::Addressee *mAddressee;
+ TDEABC::Addressee *mAddressee;
TQString mNs;
};
-AdvancedCustomFields::AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab,
+AdvancedCustomFields::AdvancedCustomFields( const TQString &uiFile, TDEABC::AddressBook *ab,
TQWidget *parent, const char *name )
: KAB::ContactEditorWidget( ab, parent, name )
{
initGUI( uiFile );
}
-void AdvancedCustomFields::loadContact( KABC::Addressee *addr )
+void AdvancedCustomFields::loadContact( TDEABC::Addressee *addr )
{
TQString ns;
if ( mFields->identifier().upper() == "KADDRESSBOOK" ||
@@ -105,7 +105,7 @@ void AdvancedCustomFields::loadContact( KABC::Addressee *addr )
mFields->load( &storage );
}
-void AdvancedCustomFields::storeContact( KABC::Addressee *addr )
+void AdvancedCustomFields::storeContact( TDEABC::Addressee *addr )
{
TQString ns;
if ( mFields->identifier().upper() == "KADDRESSBOOK" ||
diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h
index 7e36faa31..5d4b27584 100644
--- a/kaddressbook/advancedcustomfields.h
+++ b/kaddressbook/advancedcustomfields.h
@@ -42,11 +42,11 @@ class AdvancedCustomFields : public KAB::ContactEditorWidget
public:
- AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab,
+ AdvancedCustomFields( const TQString &uiFile, TDEABC::AddressBook *ab,
TQWidget *parent, const char *name = 0 );
- void loadContact( KABC::Addressee *addr );
- void storeContact( KABC::Addressee *addr );
+ void loadContact( TDEABC::Addressee *addr );
+ void storeContact( TDEABC::Addressee *addr );
void setReadOnly( bool readOnly );
TQString pageIdentifier() const;
diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp
index e312fbcdc..9b7464307 100644
--- a/kaddressbook/common/filter.cpp
+++ b/kaddressbook/common/filter.cpp
@@ -61,9 +61,9 @@ bool Filter::isInternal() const
return mInternal;
}
-void Filter::apply( KABC::Addressee::List &addresseeList )
+void Filter::apply( TDEABC::Addressee::List &addresseeList )
{
- KABC::Addressee::List::Iterator iter;
+ TDEABC::Addressee::List::Iterator iter;
for ( iter = addresseeList.begin(); iter != addresseeList.end(); ) {
if ( filterAddressee( *iter ) )
++iter;
@@ -72,7 +72,7 @@ void Filter::apply( KABC::Addressee::List &addresseeList )
}
}
-bool Filter::filterAddressee( const KABC::Addressee &a ) const
+bool Filter::filterAddressee( const TDEABC::Addressee &a ) const
{
TQStringList::ConstIterator iter;
iter = mCategoryList.begin();
diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h
index 004da6425..88ba32cc3 100644
--- a/kaddressbook/common/filter.h
+++ b/kaddressbook/common/filter.h
@@ -69,7 +69,7 @@ class Filter
If the MatchRule is NotMatch, then all the addressees matching the
filter will be removed from the list.
*/
- void apply( KABC::Addressee::List &addresseeList );
+ void apply( TDEABC::Addressee::List &addresseeList );
/**
Apply the filter to the addressee.
@@ -77,7 +77,7 @@ class Filter
@return True if the addressee passes the criteria, false otherwise.
The return values are opposite if the MatchRule is NotMatch.
*/
- bool filterAddressee( const KABC::Addressee &a ) const;
+ bool filterAddressee( const TDEABC::Addressee &a ) const;
/**
Enable or disable the filter
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index d4c5cb2d6..0f6bcdb86 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -52,7 +52,7 @@ LocationMap *LocationMap::instance()
return mSelf;
}
-void LocationMap::showAddress( const KABC::Address &addr )
+void LocationMap::showAddress( const TDEABC::Address &addr )
{
KURL url( createUrl( addr ) );
if ( url.isEmpty() )
@@ -61,7 +61,7 @@ void LocationMap::showAddress( const KABC::Address &addr )
kapp->invokeBrowser( url.url() );
}
-TQString LocationMap::createUrl( const KABC::Address &addr )
+TQString LocationMap::createUrl( const TDEABC::Address &addr )
{
/**
This method makes substitutions for the following place holders:
diff --git a/kaddressbook/common/locationmap.h b/kaddressbook/common/locationmap.h
index a5a53426d..be625f579 100644
--- a/kaddressbook/common/locationmap.h
+++ b/kaddressbook/common/locationmap.h
@@ -38,13 +38,13 @@ class LocationMap : public TQObject
~LocationMap();
public slots:
- void showAddress( const KABC::Address& );
+ void showAddress( const TDEABC::Address& );
protected:
LocationMap();
private:
- TQString createUrl( const KABC::Address& );
+ TQString createUrl( const TDEABC::Address& );
static LocationMap *mSelf;
};
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index cc6bc51da..a88a95545 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -136,7 +136,7 @@ void ContactEditorTabPage::addWidget( KAB::ContactEditorWidget *widget )
connect( widget, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) );
}
-void ContactEditorTabPage::loadContact( KABC::Addressee *addr )
+void ContactEditorTabPage::loadContact( TDEABC::Addressee *addr )
{
KAB::ContactEditorWidget::List::Iterator it;
for ( it = mWidgets.begin(); it != mWidgets.end(); ++it ) {
@@ -145,7 +145,7 @@ void ContactEditorTabPage::loadContact( KABC::Addressee *addr )
}
}
-void ContactEditorTabPage::storeContact( KABC::Addressee *addr )
+void ContactEditorTabPage::storeContact( TDEABC::Addressee *addr )
{
KAB::ContactEditorWidget::List::Iterator it;
for ( it = mWidgets.begin(); it != mWidgets.end(); ++it ) {
diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h
index 26cf50523..27a4fc62c 100644
--- a/kaddressbook/contacteditorwidgetmanager.h
+++ b/kaddressbook/contacteditorwidgetmanager.h
@@ -28,7 +28,7 @@
#include "contacteditorwidget.h"
-namespace KABC {
+namespace TDEABC {
class Addressee;
}
@@ -80,13 +80,13 @@ class ContactEditorTabPage : public TQWidget
/**
Load the contacts data into the GUI.
*/
- void loadContact( KABC::Addressee *addr );
+ void loadContact( TDEABC::Addressee *addr );
/**
Save the data from the GUI into the passed contact
object.
*/
- void storeContact( KABC::Addressee *addr );
+ void storeContact( TDEABC::Addressee *addr );
/**
Sets whether the contact should be presented as
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index 788b43915..b267eddc9 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -249,7 +249,7 @@ void FieldWidget::clearFields()
}
}
-void FieldWidget::loadContact( KABC::Addressee *addr )
+void FieldWidget::loadContact( TDEABC::Addressee *addr )
{
const TQStringList customs = addr->customs();
@@ -316,7 +316,7 @@ void FieldWidget::setReadOnly( bool readOnly )
}
}
-void FieldWidget::storeContact( KABC::Addressee *addr )
+void FieldWidget::storeContact( TDEABC::Addressee *addr )
{
FieldRecordList::ConstIterator it;
for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) {
@@ -376,7 +376,7 @@ void FieldWidget::recalculateLayout()
(*it).mLabel->setMinimumWidth( maxWidth );
}
-CustomFieldsWidget::CustomFieldsWidget( KABC::AddressBook *ab,
+CustomFieldsWidget::CustomFieldsWidget( TDEABC::AddressBook *ab,
TQWidget *parent, const char *name )
: KAB::ContactEditorWidget( ab, parent, name )
{
@@ -388,7 +388,7 @@ CustomFieldsWidget::CustomFieldsWidget( KABC::AddressBook *ab,
connect( mFieldWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( setModified() ) );
}
-void CustomFieldsWidget::loadContact( KABC::Addressee *addr )
+void CustomFieldsWidget::loadContact( TDEABC::Addressee *addr )
{
mAddressee = *addr;
@@ -408,7 +408,7 @@ void CustomFieldsWidget::loadContact( KABC::Addressee *addr )
mFieldWidget->loadContact( addr );
}
-void CustomFieldsWidget::storeContact( KABC::Addressee *addr )
+void CustomFieldsWidget::storeContact( TDEABC::Addressee *addr )
{
mFieldWidget->storeContact( addr );
}
diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h
index ac44521a2..e584833a3 100644
--- a/kaddressbook/customfieldswidget.h
+++ b/kaddressbook/customfieldswidget.h
@@ -96,8 +96,8 @@ class FieldWidget : public TQWidget
void removeField( const TQString &identifier );
- void loadContact( KABC::Addressee *addr );
- void storeContact( KABC::Addressee *addr );
+ void loadContact( TDEABC::Addressee *addr );
+ void storeContact( TDEABC::Addressee *addr );
void setReadOnly( bool readOnly );
FieldRecordList fields() const { return mFieldList; }
@@ -124,10 +124,10 @@ class CustomFieldsWidget : public KAB::ContactEditorWidget
public:
- CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ CustomFieldsWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
- void loadContact( KABC::Addressee *addr );
- void storeContact( KABC::Addressee *addr );
+ void loadContact( TDEABC::Addressee *addr );
+ void storeContact( TDEABC::Addressee *addr );
void setReadOnly( bool readOnly );
private slots:
@@ -145,13 +145,13 @@ class CustomFieldsWidget : public KAB::ContactEditorWidget
FieldWidget *mFieldWidget;
- KABC::Addressee mAddressee;
+ TDEABC::Addressee mAddressee;
};
class CustomFieldsWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
{
return new CustomFieldsWidget( ab, parent, name );
}
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 485a36278..3f7b73531 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -49,7 +49,7 @@ class KPIM::DistributionListEditor::EditorWidgetPrivate
public:
TQScrollView* scrollView;
TQSignalMapper* mapper;
- KABC::AddressBook* addressBook;
+ TDEABC::AddressBook* addressBook;
TQString distListUid;
TQLabel* nameLabel;
TQLabel* memberListLabel;
@@ -57,14 +57,14 @@ public:
TQWidget* memberListWidget;
TQVBoxLayout* addresseeLayout;
TQValueList<KPIM::DistributionListEditor::Line*> addressees;
- TQGuardedPtr<KABC::Resource> resource;
+ TQGuardedPtr<TDEABC::Resource> resource;
KPIM::DistributionList distributionList;
KPIM::DistributionListEditor::Line* addLineForEntry( const KPIM::DistributionList::Entry& entry );
int lastLineId;
};
-KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book )
+KPIM::DistributionListEditor::Line::Line( TDEABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book )
{
Q_ASSERT( m_addressBook );
TQBoxLayout* layout = new TQHBoxLayout( this );
@@ -100,12 +100,12 @@ void KPIM::DistributionListEditor::Line::setEntry( const KPIM::DistributionList:
m_lineEdit->setText( m_initialText );
}
-KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQString& name, const TQString& email ) const
+TDEABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQString& name, const TQString& email ) const
{
if ( name.isEmpty() && email.isEmpty() )
- return KABC::Addressee();
+ return TDEABC::Addressee();
- typedef KABC::Addressee::List List;
+ typedef TDEABC::Addressee::List List;
const List byEmail = m_addressBook->findByEmail( email );
if ( !byEmail.isEmpty() )
{
@@ -118,7 +118,7 @@ KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQStrin
return byEmail.first();
}
// no entry found, create new addressee:
- KABC::Addressee addressee;
+ TDEABC::Addressee addressee;
addressee.setUid( TDEApplication::randomString( 10 ) );
addressee.setFormattedName( name );
addressee.setEmails( email );
@@ -136,7 +136,7 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const
KPIM::DistributionList::Entry res;
if ( !m_uid.isNull() )
{
- const KABC::Addressee addr = m_addressBook->findByUid( m_uid );
+ const TDEABC::Addressee addr = m_addressBook->findByUid( m_uid );
if ( m_initialText == text || addr.formattedName() == name )
res.addressee = addr;
}
@@ -153,7 +153,7 @@ KPIM::DistributionListEditor::LineEdit::LineEdit( TQWidget* parent ) : KPIM::Add
}
-KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* book, TQWidget* parent )
+KPIM::DistributionListEditor::EditorWidget::EditorWidget( TDEABC::AddressBook* book, TQWidget* parent )
: KDialogBase( parent, /*name=*/0, /*modal=*/ true, /*caption=*/TQString(), KDialogBase::Ok|KDialogBase::Cancel ), d( new DistributionListEditor::EditorWidgetPrivate )
{
d->addressBook = book;
@@ -265,7 +265,7 @@ void KPIM::DistributionListEditor::EditorWidget::slotOk()
return;
}
- KABC::Ticket *ticket = d->resource->requestSaveTicket();
+ TDEABC::Ticket *ticket = d->resource->requestSaveTicket();
if ( !ticket ) {
kdWarning(5720) << "Unable to get save ticket!" << endl;
return;
diff --git a/kaddressbook/distributionlisteditor.h b/kaddressbook/distributionlisteditor.h
index 74aee7fe9..d1ec2e112 100644
--- a/kaddressbook/distributionlisteditor.h
+++ b/kaddressbook/distributionlisteditor.h
@@ -25,7 +25,7 @@
#include <kdialogbase.h>
-namespace KABC {
+namespace TDEABC {
class AddressBook;
}
@@ -41,7 +41,7 @@ class EditorWidget : public KDialogBase
Q_OBJECT
public:
- explicit EditorWidget( KABC::AddressBook* book, TQWidget* parent = 0 );
+ explicit EditorWidget( TDEABC::AddressBook* book, TQWidget* parent = 0 );
~EditorWidget();
void setDistributionList( const KPIM::DistributionList& list );
diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h
index 4bbb24369..9d3ed7552 100644
--- a/kaddressbook/distributionlisteditor_p.h
+++ b/kaddressbook/distributionlisteditor_p.h
@@ -31,7 +31,7 @@
class TQToolButton;
-namespace KABC {
+namespace TDEABC {
class Addressee;
class AddressBook;
}
@@ -53,7 +53,7 @@ class Line : public TQWidget
Q_OBJECT
public:
- explicit Line( KABC::AddressBook* book, TQWidget* parent = 0 );
+ explicit Line( TDEABC::AddressBook* book, TQWidget* parent = 0 );
void setEntry( const KPIM::DistributionList::Entry& entry );
KPIM::DistributionList::Entry entry() const;
@@ -64,7 +64,7 @@ signals:
void textChanged();
private:
- KABC::Addressee findAddressee( const TQString& name, const TQString& email ) const;
+ TDEABC::Addressee findAddressee( const TQString& name, const TQString& email ) const;
private slots:
void textChanged( const TQString& );
@@ -74,7 +74,7 @@ private:
TQString m_initialText;
LineEdit* m_lineEdit;
TQToolButton* m_clearButton;
- KABC::AddressBook* m_addressBook;
+ TDEABC::AddressBook* m_addressBook;
};
} // namespace DisributionListEditor
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index 3a54e6008..272a62005 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -41,7 +41,7 @@
#include <tqregexp.h>
#include <tqvalidator.h>
-KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent ) : KDialogBase( parent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book )
+KPIM::DistributionListPickerDialog::DistributionListPickerDialog( TDEABC::AddressBook* book, TQWidget* parent ) : KDialogBase( parent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book )
{
Q_ASSERT( m_book );
setModal( true );
diff --git a/kaddressbook/distributionlistpicker.h b/kaddressbook/distributionlistpicker.h
index d38f936d7..bc4c0f650 100644
--- a/kaddressbook/distributionlistpicker.h
+++ b/kaddressbook/distributionlistpicker.h
@@ -29,7 +29,7 @@
class TDEListBox;
-namespace KABC {
+namespace TDEABC {
class AddressBook;
}
@@ -40,7 +40,7 @@ class DistributionListPickerDialog : public KDialogBase
Q_OBJECT
public:
- explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent = 0 );
+ explicit DistributionListPickerDialog( TDEABC::AddressBook* book, TQWidget* parent = 0 );
TQString selectedDistributionList() const;
void setLabelText( const TQString& text );
@@ -59,7 +59,7 @@ private slots:
void entrySelected( const TQString& name );
private:
- KABC::AddressBook* m_book;
+ TDEABC::AddressBook* m_book;
TQLabel* m_label;
TDEListBox* m_listBox;
TQString m_selectedDistributionList;
diff --git a/kaddressbook/editors/Makefile.am b/kaddressbook/editors/Makefile.am
index 6c1096c02..2eeafc941 100644
--- a/kaddressbook/editors/Makefile.am
+++ b/kaddressbook/editors/Makefile.am
@@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp
libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined
-libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC)
+libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC)
noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h
diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp
index 892125852..06472da7d 100644
--- a/kaddressbook/editors/cryptowidget.cpp
+++ b/kaddressbook/editors/cryptowidget.cpp
@@ -68,7 +68,7 @@ TQString CryptoWidgetFactory::pageIdentifier() const
return "crypto";
}
-CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false )
{
TQGridLayout *topLayout = new TQGridLayout( this, 2, 5, KDialog::marginHint(),
@@ -139,7 +139,7 @@ CryptoWidget::~CryptoWidget()
{
}
-void CryptoWidget::loadContact( KABC::Addressee *addr )
+void CryptoWidget::loadContact( TDEABC::Addressee *addr )
{
bool blocked = signalsBlocked();
blockSignals( true );
@@ -167,7 +167,7 @@ void CryptoWidget::loadContact( KABC::Addressee *addr )
blockSignals( blocked );
}
-void CryptoWidget::storeContact( KABC::Addressee *addr )
+void CryptoWidget::storeContact( TDEABC::Addressee *addr )
{
uint cryptoFormats = 0;
uint msgFormat = 1;
diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h
index 288920d1a..1d8794ba4 100644
--- a/kaddressbook/editors/cryptowidget.h
+++ b/kaddressbook/editors/cryptowidget.h
@@ -39,11 +39,11 @@ class CryptoWidget : public KAB::ContactEditorWidget
public:
- CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~CryptoWidget();
- void loadContact( KABC::Addressee *addr );
- void storeContact( KABC::Addressee *addr );
+ void loadContact( TDEABC::Addressee *addr );
+ void storeContact( TDEABC::Addressee *addr );
void setReadOnly( bool readOnly );
private:
@@ -60,7 +60,7 @@ class CryptoWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
CryptoWidgetFactory();
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
{
return new CryptoWidget( ab, parent, name );
}
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index b0f1590e7..38d641c4c 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -190,7 +190,7 @@ TQValueList<KPluginInfo *> IMEditorWidget::availableProtocols() const
return mProtocols;
}
-void IMEditorWidget::loadContact( KABC::Addressee *addr )
+void IMEditorWidget::loadContact( TDEABC::Addressee *addr )
{
if ( mWidget->lvAddresses )
mWidget->lvAddresses->clear();
@@ -227,7 +227,7 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr )
mWidget->lvAddresses->firstChild()->setSelected( true );
}
-void IMEditorWidget::storeContact( KABC::Addressee *addr )
+void IMEditorWidget::storeContact( TDEABC::Addressee *addr )
{
// for each changed protocol, write a new custom field containing the current set of
// addresses
diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h
index 517e26498..1119144ce 100644
--- a/kaddressbook/editors/imeditorwidget.h
+++ b/kaddressbook/editors/imeditorwidget.h
@@ -55,8 +55,8 @@ class IMEditorWidget : public KDialogBase
IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name = 0 );
~IMEditorWidget() {};
- void loadContact( KABC::Addressee *addr );
- void storeContact( KABC::Addressee *addr );
+ void loadContact( TDEABC::Addressee *addr );
+ void storeContact( TDEABC::Addressee *addr );
void setReadOnly( bool readOnly );
TQValueList<KPluginInfo *> availableProtocols() const;
bool isModified() const;
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 7275f90cf..0e88486cd 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -202,8 +202,8 @@ void ExtensionManager::createExtensionWidgets()
wdg = new AddresseeEditorExtension( mCore, mDetailsStack );
wdg->hide();
- connect( wdg, TQT_SIGNAL( modified( const KABC::Addressee::List& ) ),
- TQT_SIGNAL( modified( const KABC::Addressee::List& ) ) );
+ connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ),
+ TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) );
connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ),
TQT_SIGNAL( deleted( const TQStringList& ) ) );
@@ -239,8 +239,8 @@ void ExtensionManager::createExtensionWidgets()
if ( wdg->identifier() == "distribution_list_editor_ng" )
mSplitter->moveToFirst( wdg );
wdg->hide();
- connect( wdg, TQT_SIGNAL( modified( const KABC::Addressee::List& ) ),
- TQT_SIGNAL( modified( const KABC::Addressee::List& ) ) );
+ connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ),
+ TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) );
connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ),
TQT_SIGNAL( deleted( const TQStringList& ) ) );
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h
index b80ec01cc..fafa2e3b3 100644
--- a/kaddressbook/extensionmanager.h
+++ b/kaddressbook/extensionmanager.h
@@ -93,7 +93,7 @@ class ExtensionManager : public TQObject
void detailsWidgetActivated( TQWidget* widget );
void detailsWidgetDeactivated( TQWidget* widget );
- void modified( const KABC::Addressee::List& );
+ void modified( const TDEABC::Addressee::List& );
void deleted( const TQStringList& );
private slots:
diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am
index c4e8c247d..bfcbd9651 100644
--- a/kaddressbook/features/Makefile.am
+++ b/kaddressbook/features/Makefile.am
@@ -17,16 +17,16 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
if compile_newdistrlists
libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp
libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC)
+libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC)
else
libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp
libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC)
+libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC)
endif
libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -ltderesources
+libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) -ltderesources
noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h
diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 1d5acc09c..4a4a20a28 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -71,7 +71,7 @@ void KAB::DistributionListNg::ListBox::dropEvent( TQDropEvent *event )
if ( !item || index( item ) == 0 )
return;
- KABC::Addressee::List list;
+ TDEABC::Addressee::List list;
if ( !KVCardDrag::decode( event, list ) )
return;
@@ -149,8 +149,8 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare
mListBox = new ListBox( this );
connect( mListBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ),
this, TQT_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) );
- connect( mListBox, TQT_SIGNAL( dropped( const TQString &, const KABC::Addressee::List & ) ),
- this, TQT_SLOT( contactsDropped( const TQString &, const KABC::Addressee::List & ) ) );
+ connect( mListBox, TQT_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ),
+ this, TQT_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) );
connect( mListBox, TQT_SIGNAL( highlighted( int ) ),
this, TQT_SLOT( itemSelected( int ) ) );
connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) );
@@ -202,7 +202,7 @@ void KAB::DistributionListNg::MainWidget::deleteSelectedDistributionList()
core()->deleteDistributionLists( name );
}
-void KAB::DistributionListNg::MainWidget::contactsDropped( const TQString &listName, const KABC::Addressee::List &addressees )
+void KAB::DistributionListNg::MainWidget::contactsDropped( const TQString &listName, const TDEABC::Addressee::List &addressees )
{
if ( addressees.isEmpty() )
return;
@@ -212,7 +212,7 @@ void KAB::DistributionListNg::MainWidget::contactsDropped( const TQString &listN
if ( list.isEmpty() ) // not found [should be impossible]
return;
- for ( KABC::Addressee::List::ConstIterator it = addressees.begin(); it != addressees.end(); ++it ) {
+ for ( TDEABC::Addressee::List::ConstIterator it = addressees.begin(); it != addressees.end(); ++it ) {
list.insertEntry( *it );
}
@@ -220,9 +220,9 @@ void KAB::DistributionListNg::MainWidget::contactsDropped( const TQString &listN
changed( list );
}
-void KAB::DistributionListNg::MainWidget::changed( const KABC::Addressee& dist )
+void KAB::DistributionListNg::MainWidget::changed( const TDEABC::Addressee& dist )
{
- emit modified( KABC::Addressee::List() << dist );
+ emit modified( TDEABC::Addressee::List() << dist );
}
void KAB::DistributionListNg::MainWidget::updateEntries()
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index 3e5515486..c8cf84d31 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -37,7 +37,7 @@ class TQDropEvent;
class TQPoint;
class TQPushButton;
-namespace KABC {
+namespace TDEABC {
class DistributionListManager;
}
@@ -53,7 +53,7 @@ public:
signals:
- void dropped( const TQString &listName, const KABC::Addressee::List &addressees );
+ void dropped( const TQString &listName, const TDEABC::Addressee::List &addressees );
protected:
//override
@@ -80,7 +80,7 @@ public:
private:
- void changed( const KABC::Addressee& );
+ void changed( const TDEABC::Addressee& );
private slots:
@@ -90,7 +90,7 @@ private slots:
void contextMenuRequested( TQListBoxItem *item, const TQPoint &point );
void updateEntries();
void itemSelected( int index );
- void contactsDropped( const TQString &listName, const KABC::Addressee::List &addressees );
+ void contactsDropped( const TQString &listName, const TDEABC::Addressee::List &addressees );
private:
ListBox *mListBox;
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 95bf46607..dce024a87 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -44,7 +44,7 @@
typedef KPIM::DistributionList DistributionList;
#else
#include <tdeabc/distributionlist.h>
-typedef KABC::DistributionList DistributionList;
+typedef TDEABC::DistributionList DistributionList;
#endif
#include <tdeabc/stdaddressbook.h>
#include <tdeabc/vcardconverter.h>
@@ -109,7 +109,7 @@ class DeletePressedCatcher : public TQObject
class ContactItem : public TQListViewItem
{
public:
- ContactItem( DistributionListView *parent, const KABC::Addressee &addressee,
+ ContactItem( DistributionListView *parent, const TDEABC::Addressee &addressee,
const TQString &email = TQString() ) :
TQListViewItem( parent ),
mAddressee( addressee ),
@@ -125,7 +125,7 @@ class ContactItem : public TQListViewItem
}
}
- KABC::Addressee addressee() const
+ TDEABC::Addressee addressee() const
{
return mAddressee;
}
@@ -142,7 +142,7 @@ class ContactItem : public TQListViewItem
}
private:
- KABC::Addressee mAddressee;
+ TDEABC::Addressee mAddressee;
TQString mEmail;
};
@@ -206,9 +206,9 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren
connect( core, TQT_SIGNAL( contactsUpdated() ),
this, TQT_SLOT( updateNameCombo() ) );
#else
- mManager = new KABC::DistributionListManager( core->addressBook() );
+ mManager = new TDEABC::DistributionListManager( core->addressBook() );
- connect( KABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ),
+ connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ),
this, TQT_SLOT( updateNameCombo() ) );
#endif
@@ -274,7 +274,7 @@ void DistributionListWidget::createList()
return;
}
#ifdef TDEPIM_NEW_DISTRLISTS
- KABC::Resource* resource = core()->requestResource( this );
+ TDEABC::Resource* resource = core()->requestResource( this );
if ( !resource )
return;
@@ -287,7 +287,7 @@ void DistributionListWidget::createList()
core()->addressBook()->insertAddressee( dist );
#else
- new KABC::DistributionList( mManager, newName );
+ new TDEABC::DistributionList( mManager, newName );
changed();
updateNameCombo();
@@ -324,7 +324,7 @@ void DistributionListWidget::editList()
changed( dist );
#else
- KABC::DistributionList *list = mManager->list( oldName );
+ TDEABC::DistributionList *list = mManager->list( oldName );
list->setName( newName );
mManager->save();
updateNameCombo();
@@ -377,14 +377,14 @@ void DistributionListWidget::addContact()
return;
}
#else
- KABC::DistributionList *list = mManager->list( mNameCombo->currentText() );
+ TDEABC::DistributionList *list = mManager->list( mNameCombo->currentText() );
if ( !list )
return;
- KABC::DistributionList& dist = *list;
+ TDEABC::DistributionList& dist = *list;
#endif
- const KABC::Addressee::List addrList = selectedContacts();
- KABC::Addressee::List::ConstIterator it;
+ const TDEABC::Addressee::List addrList = selectedContacts();
+ TDEABC::Addressee::List::ConstIterator it;
for ( it = addrList.begin(); it != addrList.end(); ++it )
dist.insertEntry( *it );
@@ -405,10 +405,10 @@ void DistributionListWidget::removeContact()
if ( dist.isEmpty() ) // not found
return;
#else
- KABC::DistributionList *list = mManager->list( mNameCombo->currentText() );
+ TDEABC::DistributionList *list = mManager->list( mNameCombo->currentText() );
if ( !list )
return;
- KABC::DistributionList& dist = *list;
+ TDEABC::DistributionList& dist = *list;
#endif
ContactItem *contactItem =
@@ -435,10 +435,10 @@ void DistributionListWidget::changeEmail()
if ( dist.isEmpty() ) // not found
return;
#else
- KABC::DistributionList *list = mManager->list( mNameCombo->currentText() );
+ TDEABC::DistributionList *list = mManager->list( mNameCombo->currentText() );
if ( !list )
return;
- KABC::DistributionList& dist = *list;
+ TDEABC::DistributionList& dist = *list;
#endif
ContactItem *contactItem =
@@ -475,7 +475,7 @@ void DistributionListWidget::updateContactView()
core()->addressBook(), mNameCombo->currentText() );
isListSelected = !dist.isEmpty();
#else
- KABC::DistributionList *list = mManager->list( mNameCombo->currentText() );
+ TDEABC::DistributionList *list = mManager->list( mNameCombo->currentText() );
isListSelected = list != 0;
#endif
if ( !isListSelected ) {
@@ -495,8 +495,8 @@ void DistributionListWidget::updateContactView()
const KPIM::DistributionList::Entry::List entries = dist.entries( core()->addressBook() );
KPIM::DistributionList::Entry::List::ConstIterator it;
#else
- const KABC::DistributionList::Entry::List entries = list->entries();
- KABC::DistributionList::Entry::List::ConstIterator it;
+ const TDEABC::DistributionList::Entry::List entries = list->entries();
+ TDEABC::DistributionList::Entry::List::ConstIterator it;
#endif
for ( it = entries.begin(); it != entries.end(); ++it, ++entryCount )
new ContactItem( mContactView, (*it).addressee, (*it).email );
@@ -535,17 +535,17 @@ void DistributionListWidget::dropEvent( TQDropEvent *e )
if ( dist.isEmpty() )
return;
#else
- KABC::DistributionList *list = mManager->list( mNameCombo->currentText() );
+ TDEABC::DistributionList *list = mManager->list( mNameCombo->currentText() );
if ( !list )
return;
- KABC::DistributionList& dist = *list;
+ TDEABC::DistributionList& dist = *list;
#endif
TQString vcards;
if ( KVCardDrag::decode( e, vcards ) ) {
- KABC::VCardConverter converter;
- const KABC::Addressee::List lst = converter.parseVCards( vcards );
- for ( KABC::Addressee::List::ConstIterator it = lst.begin(); it != lst.end(); ++it )
+ TDEABC::VCardConverter converter;
+ const TDEABC::Addressee::List lst = converter.parseVCards( vcards );
+ for ( TDEABC::Addressee::List::ConstIterator it = lst.begin(); it != lst.end(); ++it )
dist.insertEntry( *it );
#ifdef TDEPIM_NEW_DISTRLISTS
@@ -579,9 +579,9 @@ void DistributionListWidget::dropped( TQDropEvent *e, TQListViewItem* )
}
#ifdef TDEPIM_NEW_DISTRLISTS
-void DistributionListWidget::changed( const KABC::Addressee& dist )
+void DistributionListWidget::changed( const TDEABC::Addressee& dist )
{
- emit modified( KABC::Addressee::List() << dist );
+ emit modified( TDEABC::Addressee::List() << dist );
}
#else
void DistributionListWidget::changed()
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index 1429aa7bc..e502dda1c 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -40,7 +40,7 @@ namespace KAB {
class Core;
}
-namespace KABC {
+namespace TDEABC {
class AddressBook;
class DistributionListManager;
}
@@ -77,7 +77,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
private:
#ifdef TDEPIM_NEW_DISTRLISTS
- void changed( const KABC::Addressee& dist );
+ void changed( const TDEABC::Addressee& dist );
#else
void changed();
#endif
@@ -92,7 +92,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
DistributionListView *mContactView;
#ifndef TDEPIM_NEW_DISTRLISTS
- KABC::DistributionListManager *mManager;
+ TDEABC::DistributionListManager *mManager;
#endif
TQPushButton *mCreateListButton;
TQPushButton *mEditListButton;
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 132d0bc8a..66d75b985 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -43,12 +43,12 @@
#include "resourceselection.h"
#include <libtdepim/resourceabc.h>
-class AddressBookWrapper : public KABC::AddressBook
+class AddressBookWrapper : public TDEABC::AddressBook
{
public:
- AddressBookWrapper( KABC::AddressBook* );
+ AddressBookWrapper( TDEABC::AddressBook* );
- KRES::Manager<KABC::Resource>* getResourceManager()
+ KRES::Manager<TDEABC::Resource>* getResourceManager()
{
return resourceManager();
}
@@ -57,7 +57,7 @@ class AddressBookWrapper : public KABC::AddressBook
class ResourceItem : public TQCheckListItem
{
public:
- ResourceItem( TDEListView *parent, KABC::Resource *resource )
+ ResourceItem( TDEListView *parent, TDEABC::Resource *resource )
: TQCheckListItem( parent, resource->resourceName(), CheckBox ),
mResource( resource ), mChecked( false ),
mIsSubresource( false ), mSubItemsCreated( false ),
@@ -88,14 +88,14 @@ class ResourceItem : public TQCheckListItem
setOn(state);
}
bool checked() const { return mChecked; }
- KABC::Resource *resource() const { return mResource; }
+ TDEABC::Resource *resource() const { return mResource; }
TQString resourceIdentifier() const { return mResourceIdentifier; }
bool isSubResource() const { return mIsSubresource; }
virtual void stateChange( bool active );
private:
- KABC::Resource * const mResource;
+ TDEABC::Resource * const mResource;
bool mChecked;
const bool mIsSubresource;
bool mSubItemsCreated;
@@ -194,7 +194,7 @@ void ResourceSelection::reloadResource()
ResourceItem *item = selectedItem();
if ( !item ) return;
- KABC::Resource *r = item->resource();
+ TDEABC::Resource *r = item->resource();
r->load();
}
@@ -203,8 +203,8 @@ void ResourceSelection::saveResource()
ResourceItem *item = selectedItem();
if ( !item ) return;
- KABC::Resource *r = item->resource();
- KABC::Ticket *ticket = core()->addressBook()->requestSaveTicket( r );
+ TDEABC::Resource *r = item->resource();
+ TDEABC::Ticket *ticket = core()->addressBook()->requestSaveTicket( r );
if ( ticket ) {
r->save( ticket );
}
@@ -244,7 +244,7 @@ void ResourceSelection::add()
TQString type = types[ descs.findIndex( desc ) ];
// Create new resource
- KABC::Resource *resource = mManager->createResource( type );
+ TDEABC::Resource *resource = mManager->createResource( type );
if ( !resource ) {
KMessageBox::error( this, i18n("<qt>Unable to create an address book of type <b>%1</b>.</qt>")
.arg( type ) );
@@ -277,7 +277,7 @@ void ResourceSelection::edit()
// view items can change during "edit", e.g. sub resources being removed ->
// sub resource item removed
// thus keep their data rather than their pointer
- KABC::Resource *resource = item->resource();
+ TDEABC::Resource *resource = item->resource();
KRES::ConfigDialog dlg( this, TQString( "contact" ), resource );
@@ -323,7 +323,7 @@ void ResourceSelection::currentChanged( TQListViewItem *item )
if ( !resItem )
return;
- KABC::Resource *resource = resItem->resource();
+ TDEABC::Resource *resource = resItem->resource();
if ( resItem->checked() != resItem->isOn() ) {
resItem->setChecked( resItem->isOn() );
@@ -361,7 +361,7 @@ void ResourceSelection::updateView()
mListView->clear();
- KRES::Manager<KABC::Resource>::Iterator it;
+ KRES::Manager<TDEABC::Resource>::Iterator it;
for ( it = mManager->begin(); it != mManager->end(); ++it ) {
ResourceItem *item = new ResourceItem( mListView, *it );
diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h
index 4c1a6df61..a627fb512 100644
--- a/kaddressbook/features/resourceselection.h
+++ b/kaddressbook/features/resourceselection.h
@@ -87,7 +87,7 @@ class ResourceSelection : public KAB::ExtensionWidget
TQString mLastResource;
- KRES::Manager<KABC::Resource> *mManager;
+ KRES::Manager<TDEABC::Resource> *mManager;
};
#endif
diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp
index c325ec6fb..491a94658 100644
--- a/kaddressbook/freebusywidget.cpp
+++ b/kaddressbook/freebusywidget.cpp
@@ -32,7 +32,7 @@
#include "freebusywidget.h"
-FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+FreeBusyWidget::FreeBusyWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::ContactEditorWidget( ab, parent, name )
{
TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
@@ -53,7 +53,7 @@ FreeBusyWidget::~FreeBusyWidget()
{
}
-void FreeBusyWidget::loadContact( KABC::Addressee *addr )
+void FreeBusyWidget::loadContact( TDEABC::Addressee *addr )
{
if ( addr->preferredEmail().isEmpty() )
return;
@@ -61,7 +61,7 @@ void FreeBusyWidget::loadContact( KABC::Addressee *addr )
mURL->setURL( KCal::FreeBusyUrlStore::self()->readUrl( addr->preferredEmail() ) );
}
-void FreeBusyWidget::storeContact( KABC::Addressee *addr )
+void FreeBusyWidget::storeContact( TDEABC::Addressee *addr )
{
if ( addr->preferredEmail().isEmpty() )
return;
diff --git a/kaddressbook/freebusywidget.h b/kaddressbook/freebusywidget.h
index 1a874176c..d9c9ba501 100644
--- a/kaddressbook/freebusywidget.h
+++ b/kaddressbook/freebusywidget.h
@@ -34,11 +34,11 @@ class FreeBusyWidget : public KAB::ContactEditorWidget
public:
- FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ FreeBusyWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~FreeBusyWidget();
- void loadContact( KABC::Addressee *addr );
- void storeContact( KABC::Addressee *addr );
+ void loadContact( TDEABC::Addressee *addr );
+ void storeContact( TDEABC::Addressee *addr );
void setReadOnly( bool readOnly );
@@ -51,7 +51,7 @@ class FreeBusyWidget : public KAB::ContactEditorWidget
class FreeBusyWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
{
return new FreeBusyWidget( ab, parent, name );
}
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index f7261bf7a..4ff19033e 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -44,7 +44,7 @@
#include "geowidget.h"
-GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+GeoWidget::GeoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false )
{
TQLabel *label = 0;
@@ -105,9 +105,9 @@ GeoWidget::~GeoWidget()
{
}
-void GeoWidget::loadContact( KABC::Addressee *addr )
+void GeoWidget::loadContact( TDEABC::Addressee *addr )
{
- KABC::Geo geo = addr->geo();
+ TDEABC::Geo geo = addr->geo();
if ( geo.isValid() ) {
if ( !mReadOnly )
@@ -118,9 +118,9 @@ void GeoWidget::loadContact( KABC::Addressee *addr )
mGeoIsValid->setChecked( false );
}
-void GeoWidget::storeContact( KABC::Addressee *addr )
+void GeoWidget::storeContact( TDEABC::Addressee *addr )
{
- KABC::Geo geo;
+ TDEABC::Geo geo;
if ( mGeoIsValid->isChecked() ) {
geo.setLatitude( mLatitudeBox->value() );
diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h
index 4598b49c6..9694edcce 100644
--- a/kaddressbook/geowidget.h
+++ b/kaddressbook/geowidget.h
@@ -28,7 +28,7 @@
#include "contacteditorwidget.h"
-namespace KABC {
+namespace TDEABC {
class Geo;
}
@@ -54,11 +54,11 @@ class GeoWidget : public KAB::ContactEditorWidget
public:
- GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ GeoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~GeoWidget();
- void loadContact( KABC::Addressee *addr );
- void storeContact( KABC::Addressee *addr );
+ void loadContact( TDEABC::Addressee *addr );
+ void storeContact( TDEABC::Addressee *addr );
void setReadOnly( bool readOnly );
@@ -151,7 +151,7 @@ class GeoMapWidget : public TQWidget
class GeoWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
{
return new GeoWidget( ab, parent, name );
}
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index b69e90bb2..722b8dd78 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -52,9 +52,9 @@ ImageLoader::ImageLoader( TQWidget *parent )
{
}
-KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok )
+TDEABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok )
{
- KABC::Picture picture;
+ TDEABC::Picture picture;
TQString tempFile;
if ( url.isEmpty() )
@@ -117,13 +117,13 @@ void ImageButton::setReadOnly( bool readOnly )
mReadOnly = readOnly;
}
-void ImageButton::setPicture( const KABC::Picture &picture )
+void ImageButton::setPicture( const TDEABC::Picture &picture )
{
mPicture = picture;
updateGUI();
}
-KABC::Picture ImageButton::picture() const
+TDEABC::Picture ImageButton::picture() const
{
return mPicture;
}
@@ -188,7 +188,7 @@ void ImageButton::dropEvent( TQDropEvent *event )
if ( mImageLoader ) {
bool ok = false;
- KABC::Picture pic = mImageLoader->loadPicture( urls[ 0 ], &ok );
+ TDEABC::Picture pic = mImageLoader->loadPicture( urls[ 0 ], &ok );
if ( ok ) {
mPicture = pic;
updateGUI();
@@ -228,7 +228,7 @@ void ImageButton::load()
if ( url.isValid() ) {
if ( mImageLoader ) {
bool ok = false;
- KABC::Picture pic = mImageLoader->loadPicture( url, &ok );
+ TDEABC::Picture pic = mImageLoader->loadPicture( url, &ok );
if ( ok ) {
mPicture = pic;
updateGUI();
@@ -240,7 +240,7 @@ void ImageButton::load()
void ImageButton::clear()
{
- mPicture = KABC::Picture();
+ mPicture = TDEABC::Picture();
updateGUI();
emit changed();
@@ -279,40 +279,40 @@ void ImageBaseWidget::setReadOnly( bool readOnly )
mImageButton->setReadOnly( mReadOnly );
}
-void ImageBaseWidget::setImage( const KABC::Picture &photo )
+void ImageBaseWidget::setImage( const TDEABC::Picture &photo )
{
mImageButton->setPicture( photo );
}
-KABC::Picture ImageBaseWidget::image() const
+TDEABC::Picture ImageBaseWidget::image() const
{
return mImageButton->picture();
}
-ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ImageWidget::ImageWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::ContactEditorWidget( ab, parent, name )
{
TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(),
KDialog::spacingHint() );
- mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this );
+ mPhotoWidget = new ImageBaseWidget( TDEABC::Addressee::photoLabel(), this );
layout->addWidget( mPhotoWidget );
- mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this );
+ mLogoWidget = new ImageBaseWidget( TDEABC::Addressee::logoLabel(), this );
layout->addWidget( mLogoWidget );
connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) );
}
-void ImageWidget::loadContact( KABC::Addressee *addr )
+void ImageWidget::loadContact( TDEABC::Addressee *addr )
{
mPhotoWidget->setImage( addr->photo() );
mLogoWidget->setImage( addr->logo() );
}
-void ImageWidget::storeContact( KABC::Addressee *addr )
+void ImageWidget::storeContact( TDEABC::Addressee *addr )
{
addr->setPhoto( mPhotoWidget->image() );
addr->setLogo( mLogoWidget->image() );
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index 449790e21..77c26478e 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -43,10 +43,10 @@ class ImageLoader : public TQObject
public:
ImageLoader( TQWidget *parent );
- KABC::Picture loadPicture( const KURL &url, bool *ok );
+ TDEABC::Picture loadPicture( const KURL &url, bool *ok );
private:
- KABC::Picture mPicture;
+ TDEABC::Picture mPicture;
TQWidget *mParent;
};
@@ -63,8 +63,8 @@ class ImageButton : public TQPushButton
void setReadOnly( bool readOnly );
- void setPicture( const KABC::Picture &picture );
- KABC::Picture picture() const;
+ void setPicture( const TDEABC::Picture &picture );
+ TDEABC::Picture picture() const;
void setImageLoader( ImageLoader *loader );
@@ -89,7 +89,7 @@ class ImageButton : public TQPushButton
bool mReadOnly;
TQPoint mDragStartPos;
- KABC::Picture mPicture;
+ TDEABC::Picture mPicture;
ImageLoader *mImageLoader;
};
@@ -107,12 +107,12 @@ class ImageBaseWidget : public TQWidget
/**
Sets the photo object.
*/
- void setImage( const KABC::Picture &photo );
+ void setImage( const TDEABC::Picture &photo );
/**
Returns a photo object.
*/
- KABC::Picture image() const;
+ TDEABC::Picture image() const;
void setReadOnly( bool readOnly );
@@ -129,10 +129,10 @@ class ImageBaseWidget : public TQWidget
class ImageWidget : public KAB::ContactEditorWidget
{
public:
- ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ ImageWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
- void loadContact( KABC::Addressee *addr );
- void storeContact( KABC::Addressee *addr );
+ void loadContact( TDEABC::Addressee *addr );
+ void storeContact( TDEABC::Addressee *addr );
void setReadOnly( bool readOnly );
int logicalWidth() const { return 2; }
@@ -145,7 +145,7 @@ class ImageWidget : public KAB::ContactEditorWidget
class ImageWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
{
return new ImageWidget( ab, parent, name );
}
diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp
index 9a36cb77c..b7f812dbf 100644
--- a/kaddressbook/imeditwidget.cpp
+++ b/kaddressbook/imeditwidget.cpp
@@ -43,7 +43,7 @@
#include "imeditwidget.h"
#include "imeditorwidget.h"
-IMEditWidget::IMEditWidget( TQWidget *parent, KABC::Addressee &addr, const char *name )
+IMEditWidget::IMEditWidget( TQWidget *parent, TDEABC::Addressee &addr, const char *name )
: TQWidget( parent, name ), mAddressee(addr)
{
TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(),
diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h
index 2ef2fb5f3..ce6b1a943 100644
--- a/kaddressbook/imeditwidget.h
+++ b/kaddressbook/imeditwidget.h
@@ -47,7 +47,7 @@ class IMEditWidget : public TQWidget
public:
- IMEditWidget(TQWidget *parent, KABC::Addressee &addr, const char *name = 0 );
+ IMEditWidget(TQWidget *parent, TDEABC::Addressee &addr, const char *name = 0 );
~IMEditWidget();
void setIMs( const TQStringList &list );
@@ -69,7 +69,7 @@ class IMEditWidget : public TQWidget
TQPushButton *mEditButton;
TQStringList mIMList;
bool mReadOnly;
- KABC::Addressee &mAddressee;
+ TDEABC::Addressee &mAddressee;
};
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index dbec4651e..2c7c3870c 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -112,22 +112,22 @@ void IncSearchWidget::timeout()
void IncSearchWidget::initFields()
{
- mFieldList = KABC::Field::allFields();
+ mFieldList = TDEABC::Field::allFields();
mFieldCombo->clear();
mFieldCombo->insertItem( i18n( "Visible Fields" ) );
mFieldCombo->insertItem( i18n( "All Fields" ) );
- KABC::Field::List::ConstIterator it;
+ TDEABC::Field::List::ConstIterator it;
for ( it = mFieldList.begin(); it != mFieldList.end(); ++it )
mFieldCombo->insertItem( (*it)->label() );
announceDoSearch();
}
-KABC::Field::List IncSearchWidget::currentFields() const
+TDEABC::Field::List IncSearchWidget::currentFields() const
{
- KABC::Field::List fieldList;
+ TDEABC::Field::List fieldList;
if ( mFieldCombo->currentItem() == 0 )
fieldList = mViewFields;
@@ -147,7 +147,7 @@ int IncSearchWidget::currentItem() const
return mFieldCombo->currentItem();
}
-void IncSearchWidget::setViewFields( const KABC::Field::List &fields )
+void IncSearchWidget::setViewFields( const TDEABC::Field::List &fields )
{
mViewFields = fields;
}
diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h
index 9b22f75fe..3d5732027 100644
--- a/kaddressbook/incsearchwidget.h
+++ b/kaddressbook/incsearchwidget.h
@@ -41,7 +41,7 @@ class IncSearchWidget : public TQWidget
IncSearchWidget( TQWidget *parent, const char *name = 0 );
~IncSearchWidget();
- KABC::Field::List currentFields() const;
+ TDEABC::Field::List currentFields() const;
void setCurrentItem( int pos );
int currentItem() const;
@@ -67,7 +67,7 @@ class IncSearchWidget : public TQWidget
void scrollDown();
public slots:
- void setViewFields( const KABC::Field::List& );
+ void setViewFields( const TDEABC::Field::List& );
private slots:
void announceDoSearch();
@@ -81,8 +81,8 @@ class IncSearchWidget : public TQWidget
TQComboBox* mFieldCombo;
KLineEdit* mSearchText;
- KABC::Field::List mFieldList;
- KABC::Field::List mViewFields;
+ TDEABC::Field::List mFieldList;
+ TDEABC::Field::List mViewFields;
TQTimer* mInputTimer;
};
diff --git a/kaddressbook/interfaces/Makefile.am b/kaddressbook/interfaces/Makefile.am
index 7b4373643..a857dddb2 100644
--- a/kaddressbook/interfaces/Makefile.am
+++ b/kaddressbook/interfaces/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libkabinterfaces.la
libkabinterfaces_la_SOURCES = configurewidget.cpp contacteditorwidget.cpp \
core.cpp extensionwidget.cpp xxport.cpp
libkabinterfaces_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabinterfaces_la_LIBADD = $(LIB_KABC)
+libkabinterfaces_la_LIBADD = $(LIB_TDEABC)
kabincludedir = $(includedir)/kaddressbook
kabinclude_HEADERS = configurewidget.h contacteditorwidget.h core.h \
diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp
index bcb7a1764..bce8136c1 100644
--- a/kaddressbook/interfaces/configurewidget.cpp
+++ b/kaddressbook/interfaces/configurewidget.cpp
@@ -27,7 +27,7 @@
using namespace KAB;
-ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent,
+ConfigureWidget::ConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent,
const char *name )
: TQWidget( parent, name ), mAddressBook( ab )
{
@@ -47,7 +47,7 @@ void ConfigureWidget::saveSettings( TDEConfig* )
// should be reimplemented in the views, extensions etc.
}
-KABC::AddressBook *ConfigureWidget::addressBook() const
+TDEABC::AddressBook *ConfigureWidget::addressBook() const
{
return mAddressBook;
}
diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h
index e8df353df..33bc6f762 100644
--- a/kaddressbook/interfaces/configurewidget.h
+++ b/kaddressbook/interfaces/configurewidget.h
@@ -29,7 +29,7 @@
#include <tdeconfig.h>
#include <tdepimmacros.h>
-namespace KABC {
+namespace TDEABC {
class AddressBook;
}
@@ -38,7 +38,7 @@ namespace KAB {
class KDE_EXPORT ConfigureWidget : public TQWidget
{
public:
- ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ ConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~ConfigureWidget();
/**
@@ -61,10 +61,10 @@ class KDE_EXPORT ConfigureWidget : public TQWidget
/**
Returns a pointer to the address book of this widget.
*/
- KABC::AddressBook *addressBook() const;
+ TDEABC::AddressBook *addressBook() const;
private:
- KABC::AddressBook *mAddressBook;
+ TDEABC::AddressBook *mAddressBook;
};
}
diff --git a/kaddressbook/interfaces/contacteditorwidget.cpp b/kaddressbook/interfaces/contacteditorwidget.cpp
index 3059b7a40..91e388733 100644
--- a/kaddressbook/interfaces/contacteditorwidget.cpp
+++ b/kaddressbook/interfaces/contacteditorwidget.cpp
@@ -25,7 +25,7 @@
using namespace KAB;
-ContactEditorWidget::ContactEditorWidget( KABC::AddressBook *ab,
+ContactEditorWidget::ContactEditorWidget( TDEABC::AddressBook *ab,
TQWidget *parent, const char *name )
: TQWidget( parent, name ), mAddressBook( ab ), mModified( false )
{
@@ -35,7 +35,7 @@ ContactEditorWidget::~ContactEditorWidget()
{
}
-KABC::AddressBook *ContactEditorWidget::addressBook() const
+TDEABC::AddressBook *ContactEditorWidget::addressBook() const
{
return mAddressBook;
}
diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h
index c8efa56c1..85195dd84 100644
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.h
@@ -42,7 +42,7 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget
public:
typedef TQValueList<ContactEditorWidget*> List;
- ContactEditorWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ ContactEditorWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~ContactEditorWidget();
/**
@@ -62,13 +62,13 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget
/**
Load the contacts data into the GUI.
*/
- virtual void loadContact( KABC::Addressee *addr ) = 0;
+ virtual void loadContact( TDEABC::Addressee *addr ) = 0;
/**
Save the data from the GUI into the passed contact
object.
*/
- virtual void storeContact( KABC::Addressee *addr ) = 0;
+ virtual void storeContact( TDEABC::Addressee *addr ) = 0;
/**
Sets whether the contact should be presented as
@@ -104,10 +104,10 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget
/**
Returns a pointer to the address book object.
*/
- KABC::AddressBook *addressBook() const;
+ TDEABC::AddressBook *addressBook() const;
private:
- KABC::AddressBook *mAddressBook;
+ TDEABC::AddressBook *mAddressBook;
bool mModified;
class ContactEditorWidgetPrivate;
@@ -117,7 +117,7 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget
class ContactEditorWidgetFactory : public KLibFactory
{
public:
- virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent,
+ virtual ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent,
const char *name = 0 ) = 0;
/**
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index fcf41028f..0132399c1 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -37,7 +37,7 @@
#include <kxmlguiclient.h>
#include <tdepimmacros.h>
-namespace KABC {
+namespace TDEABC {
class AddressBook;
class Resource;
}
@@ -63,7 +63,7 @@ class KDE_EXPORT Core : public TQObject
/**
Returns a pointer to the StdAddressBook of the application.
*/
- virtual KABC::AddressBook *addressBook() const = 0;
+ virtual TDEABC::AddressBook *addressBook() const = 0;
/**
Returns a pointer to the TDEConfig object of the application.
@@ -84,7 +84,7 @@ class KDE_EXPORT Core : public TQObject
/**
Returns the current sort field.
*/
- virtual KABC::Field *currentSortField() const = 0;
+ virtual TDEABC::Field *currentSortField() const = 0;
/**
Returns the uid list of the currently selected contacts.
@@ -96,7 +96,7 @@ class KDE_EXPORT Core : public TQObject
resource or a null pointer if no resource was selected by
the user.
*/
- virtual KABC::Resource *requestResource( TQWidget *parent ) = 0;
+ virtual TDEABC::Resource *requestResource( TQWidget *parent ) = 0;
/**
Returns the parent widget.
diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp
index 63f90200b..da4fcc7d8 100644
--- a/kaddressbook/interfaces/extensionwidget.cpp
+++ b/kaddressbook/interfaces/extensionwidget.cpp
@@ -47,9 +47,9 @@ bool ExtensionWidget::contactsSelected() const
return mCore->selectedUIDs().count() != 0;
}
-KABC::Addressee::List ExtensionWidget::selectedContacts()
+TDEABC::Addressee::List ExtensionWidget::selectedContacts()
{
- KABC::Addressee::List list;
+ TDEABC::Addressee::List list;
const TQStringList uids = mCore->selectedUIDs();
TQStringList::ConstIterator it;
diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h
index 265484a4d..3de00edde 100644
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.h
@@ -60,7 +60,7 @@ class KDE_EXPORT ExtensionWidget : public TQWidget
Use @ref addresseesSelected() to test if there exists selected
contacts.
*/
- KABC::Addressee::List selectedContacts();
+ TDEABC::Addressee::List selectedContacts();
/**
This method is called whenever the selection in the view changed.
@@ -79,7 +79,7 @@ class KDE_EXPORT ExtensionWidget : public TQWidget
virtual TQString identifier() const = 0;
signals:
- void modified( const KABC::Addressee::List &list );
+ void modified( const TDEABC::Addressee::List &list );
void deleted( const TQStringList& uidList );
private:
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index d0790ccfa..a2874e8c6 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -40,7 +40,7 @@ class XXPort::XXPortPrivate
TDEApplication *mKApp;
};
-XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent,
+XXPort::XXPort( TDEABC::AddressBook *ab, TQWidget *parent,
const char *name )
: TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ),
d( new XXPortPrivate )
@@ -62,16 +62,16 @@ XXPort::~XXPort()
d = 0;
}
-bool XXPort::exportContacts( const KABC::AddresseeList&, const TQString& )
+bool XXPort::exportContacts( const TDEABC::AddresseeList&, const TQString& )
{
// do nothing
return false;
}
-KABC::AddresseeList XXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList XXPort::importContacts( const TQString& ) const
{
// do nothing
- return KABC::AddresseeList();
+ return TDEABC::AddresseeList();
}
void XXPort::createImportAction( const TQString &label, const TQString &data )
@@ -94,7 +94,7 @@ void XXPort::createExportAction( const TQString &label, const TQString &data )
setXMLFile( identifier() + "_xxportui.rc" );
}
-KABC::AddressBook *XXPort::addressBook() const
+TDEABC::AddressBook *XXPort::addressBook() const
{
return mAddressBook;
}
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index 515470c55..b0dd43e74 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -45,7 +45,7 @@ class TDEApplication;
*/
#define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \
class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \
- KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name ) \
+ KAB::XXPort *xxportObject( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) \
{ const char *cat = catalog; \
if (cat) TDEGlobal::locale()->insertCatalogue(cat); \
return new XXPortClass( ab, parent, name ); \
@@ -71,7 +71,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
public:
- XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~XXPort();
/**
@@ -104,12 +104,12 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
/**
Reimplement this method for exporting the contacts.
*/
- virtual bool exportContacts( const KABC::AddresseeList &list, const TQString& identifier );
+ virtual bool exportContacts( const TDEABC::AddresseeList &list, const TQString& identifier );
/**
Reimplement this method for importing the contacts.
*/
- virtual KABC::AddresseeList importContacts( const TQString& identifier ) const;
+ virtual TDEABC::AddresseeList importContacts( const TQString& identifier ) const;
signals:
/**
@@ -140,7 +140,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
/**
Returns a pointer to the address book object.
*/
- KABC::AddressBook *addressBook() const;
+ TDEABC::AddressBook *addressBook() const;
/**
Returns a pointer to the parent widget. It can be used as parent for
@@ -153,7 +153,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
void slotExportActivated( const TQString& );
private:
- KABC::AddressBook *mAddressBook;
+ TDEABC::AddressBook *mAddressBook;
TQWidget *mParentWidget;
class XXPortPrivate;
@@ -163,7 +163,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
class XXPortFactory : public KLibFactory
{
public:
- virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent,
+ virtual XXPort *xxportObject( TDEABC::AddressBook *ab, TQWidget *parent,
const char *name = 0 ) = 0;
protected:
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index b1be78eea..878fff5d7 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -107,10 +107,10 @@ void JumpButtonBar::updateButtons()
uint possibleButtons = (height() / buttonHeight) - 1;
TQString character;
- KABC::AddressBook *ab = mCore->addressBook();
- KABC::AddressBook::Iterator it;
+ TDEABC::AddressBook *ab = mCore->addressBook();
+ TDEABC::AddressBook::Iterator it;
for ( it = ab->begin(); it != ab->end(); ++it ) {
- KABC::Field *field = 0;
+ TDEABC::Field *field = 0;
field = mCore->currentSortField();
if ( field ) {
setEnabled( true );
diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h
index 620c737be..48a520184 100644
--- a/kaddressbook/jumpbuttonbar.h
+++ b/kaddressbook/jumpbuttonbar.h
@@ -37,7 +37,7 @@ namespace KAB {
class Core;
}
-namespace KABC {
+namespace TDEABC {
class Field;
}
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 142f03c44..6a7ece0e8 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -108,36 +108,36 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
this, TQT_SLOT( addressBookChanged() ) );
if ( file.isEmpty() ) {
- mAddressBook = KABC::StdAddressBook::self( true );
+ mAddressBook = TDEABC::StdAddressBook::self( true );
} else {
kdDebug(5720) << "KABCore(): document '" << file << "'" << endl;
- mAddressBook = new KABC::AddressBook;
- mAddressBook->addResource( new KABC::ResourceFile( file ) );
+ mAddressBook = new TDEABC::AddressBook;
+ mAddressBook->addResource( new TDEABC::ResourceFile( file ) );
if ( !mAddressBook->load() ) {
KMessageBox::error( parent, i18n("Unable to load '%1'.").arg( file ) );
}
}
- mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) );
+ mAddressBook->setErrorHandler( new TDEABC::GuiErrorHandler( mWidget ) );
#if ! KDE_IS_VERSION(3,5,8)
- mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization,
+ mAddressBook->addCustomField( i18n( "Department" ), TDEABC::Field::Organization,
"X-Department", "KADDRESSBOOK" );
#endif
- mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization,
+ mAddressBook->addCustomField( i18n( "Profession" ), TDEABC::Field::Organization,
"X-Profession", "KADDRESSBOOK" );
- mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
+ mAddressBook->addCustomField( i18n( "Assistant's Name" ), TDEABC::Field::Organization,
"X-AssistantsName", "KADDRESSBOOK" );
- mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
+ mAddressBook->addCustomField( i18n( "Manager's Name" ), TDEABC::Field::Organization,
"X-ManagersName", "KADDRESSBOOK" );
- mAddressBook->addCustomField( i18n( "Partner's Name" ), KABC::Field::Personal,
+ mAddressBook->addCustomField( i18n( "Partner's Name" ), TDEABC::Field::Personal,
"X-SpousesName", "KADDRESSBOOK" );
- mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal,
+ mAddressBook->addCustomField( i18n( "Office" ), TDEABC::Field::Personal,
"X-Office", "KADDRESSBOOK" );
- mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
+ mAddressBook->addCustomField( i18n( "IM Address" ), TDEABC::Field::Personal,
"X-IMAddress", "KADDRESSBOOK" );
- mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
+ mAddressBook->addCustomField( i18n( "Anniversary" ), TDEABC::Field::Personal,
"X-Anniversary", "KADDRESSBOOK" );
- mAddressBook->addCustomField( i18n( "Blog" ), KABC::Field::Personal,
+ mAddressBook->addCustomField( i18n( "Blog" ), TDEABC::Field::Personal,
"BlogFeed", "KADDRESSBOOK" );
mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(parent) );
@@ -164,8 +164,8 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
mXXPortManager, TQT_SLOT( importVCard( const KURL& ) ) );
connect( mViewManager, TQT_SIGNAL( viewFieldsChanged() ),
TQT_SLOT( updateIncSearchWidget() ) );
- connect( mExtensionManager, TQT_SIGNAL( modified( const KABC::Addressee::List& ) ),
- this, TQT_SLOT( extensionModified( const KABC::Addressee::List& ) ) );
+ connect( mExtensionManager, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ),
+ this, TQT_SLOT( extensionModified( const TDEABC::Addressee::List& ) ) );
connect( mExtensionManager, TQT_SIGNAL( deleted( const TQStringList& ) ),
this, TQT_SLOT( extensionDeleted( const TQStringList& ) ) );
@@ -200,7 +200,7 @@ KABCore::~KABCore()
mAddressBook->disconnect();
mAddressBook = 0;
- KABC::StdAddressBook::close();
+ TDEABC::StdAddressBook::close();
mKIMProxy = 0;
}
@@ -245,7 +245,7 @@ void KABCore::saveSettings()
KABPrefs::instance()->setCurrentIncSearchField( mIncSearchWidget->currentItem() );
}
-KABC::AddressBook *KABCore::addressBook() const
+TDEABC::AddressBook *KABCore::addressBook() const
{
return mAddressBook;
}
@@ -260,7 +260,7 @@ TDEActionCollection *KABCore::actionCollection() const
return guiClient()->actionCollection();
}
-KABC::Field *KABCore::currentSortField() const
+TDEABC::Field *KABCore::currentSortField() const
{
return mViewManager->currentSortField();
}
@@ -270,13 +270,13 @@ TQStringList KABCore::selectedUIDs() const
return mViewManager->selectedUids();
}
-KABC::Resource *KABCore::requestResource( TQWidget *parent )
+TDEABC::Resource *KABCore::requestResource( TQWidget *parent )
{
- TQPtrList<KABC::Resource> kabcResources = addressBook()->resources();
+ TQPtrList<TDEABC::Resource> kabcResources = addressBook()->resources();
TQPtrList<KRES::Resource> kresResources;
- TQPtrListIterator<KABC::Resource> resIt( kabcResources );
- KABC::Resource *resource;
+ TQPtrListIterator<TDEABC::Resource> resIt( kabcResources );
+ TDEABC::Resource *resource;
while ( ( resource = resIt.current() ) != 0 ) {
++resIt;
bool writable = false;
@@ -302,7 +302,7 @@ KABC::Resource *KABCore::requestResource( TQWidget *parent )
}
KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
- return static_cast<KABC::Resource*>( res ); // upcast
+ return static_cast<TDEABC::Resource*>( res ); // upcast
}
TQWidget *KABCore::widget() const
@@ -351,7 +351,7 @@ void KABCore::setContactSelected( const TQString &uid )
return;
}
- KABC::Addressee addr = mAddressBook->findByUid( uid );
+ TDEABC::Addressee addr = mAddressBook->findByUid( uid );
if ( !mDetailsViewer->isHidden() )
mDetailsViewer->setAddressee( addr );
#ifdef TDEPIM_NEW_DISTRLISTS
@@ -361,7 +361,7 @@ void KABCore::setContactSelected( const TQString &uid )
#endif
mExtensionManager->setSelectionChanged();
- KABC::Addressee::List list = mViewManager->selectedAddressees();
+ TDEABC::Addressee::List list = mViewManager->selectedAddressees();
const bool someSelected = list.size() > 0;
const bool singleSelected = list.size() == 1;
bool writable = mReadWrite;
@@ -371,9 +371,9 @@ void KABCore::setContactSelected( const TQString &uid )
//### We have a performance problem here - everytime *one* item is added or
// removed we re-check *all* items. If this turns out to be a bottleneck
// we need to keep some state and check new items only.
- KABC::Addressee::List::ConstIterator addrIt = list.constBegin();
+ TDEABC::Addressee::List::ConstIterator addrIt = list.constBegin();
for ( ; addrIt != list.constEnd(); ++addrIt ) {
- KABC::Resource *res = ( *addrIt ).resource();
+ TDEABC::Resource *res = ( *addrIt ).resource();
if ( !res ) {
kdDebug() << "KABCore::setContactSelected: this addressee has no resource!" << endl;
writable = false;
@@ -398,7 +398,7 @@ void KABCore::setContactSelected( const TQString &uid )
bool moreThanOneResource = mAddressBook->resources().count() > 1;
if ( !moreThanOneResource && !mAddressBook->resources().isEmpty() ) {
- KABC::Resource *res = mAddressBook->resources().first();
+ TDEABC::Resource *res = mAddressBook->resources().first();
if ( res->inherits( "KPIM::ResourceABC" ) ) {
KPIM::ResourceABC *resAbc = static_cast<KPIM::ResourceABC *>( res );
const TQStringList subresources = resAbc->subresources();
@@ -517,7 +517,7 @@ void KABCore::deleteContacts( const TQStringList &uids )
TQStringList::ConstIterator it = uids.begin();
const TQStringList::ConstIterator endIt( uids.end() );
while ( it != endIt ) {
- KABC::Addressee addr = mAddressBook->findByUid( *it );
+ TDEABC::Addressee addr = mAddressBook->findByUid( *it );
names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() );
++it;
}
@@ -548,7 +548,7 @@ void KABCore::deleteContacts( const TQStringList &uids )
void KABCore::copyContacts()
{
- KABC::Addressee::List addrList = mViewManager->selectedAddressees();
+ TDEABC::Addressee::List addrList = mViewManager->selectedAddressees();
#if defined(KABC_VCARD_ENCODING_FIX)
TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList );
@@ -578,21 +578,21 @@ void KABCore::pasteContacts()
TQClipboard *cb = TQApplication::clipboard();
#if defined(KABC_VCARD_ENCODING_FIX)
const TQMimeSource *data = cb->data( TQClipboard::Clipboard );
- KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
+ TDEABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) );
#else
- KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
+ TDEABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
#endif
pasteContacts( list );
}
-void KABCore::pasteContacts( KABC::Addressee::List &list )
+void KABCore::pasteContacts( TDEABC::Addressee::List &list )
{
- KABC::Resource *resource = requestResource( mWidget );
+ TDEABC::Resource *resource = requestResource( mWidget );
if ( !resource )
return;
- KABC::Addressee::List::Iterator it;
- const KABC::Addressee::List::Iterator endIt( list.end() );
+ TDEABC::Addressee::List::Iterator it;
+ const TDEABC::Addressee::List::Iterator endIt( list.end() );
for ( it = list.begin(); it != endIt; ++it )
(*it).setResource( resource );
@@ -604,15 +604,15 @@ void KABCore::pasteContacts( KABC::Addressee::List &list )
void KABCore::mergeContacts()
{
- KABC::Addressee::List list = mViewManager->selectedAddressees();
+ TDEABC::Addressee::List list = mViewManager->selectedAddressees();
if ( list.count() < 2 )
return;
- KABC::Addressee addr = KABTools::mergeContacts( list );
+ TDEABC::Addressee addr = KABTools::mergeContacts( list );
- KABC::Addressee::List::Iterator it = list.begin();
- const KABC::Addressee::List::Iterator endIt( list.end() );
- KABC::Addressee origAddr = *it;
+ TDEABC::Addressee::List::Iterator it = list.begin();
+ const TDEABC::Addressee::List::Iterator endIt( list.end() );
+ TDEABC::Addressee origAddr = *it;
TQStringList uids;
++it;
while ( it != endIt ) {
@@ -631,7 +631,7 @@ void KABCore::mergeContacts()
void KABCore::setWhoAmI()
{
- KABC::Addressee::List addrList = mViewManager->selectedAddressees();
+ TDEABC::Addressee::List addrList = mViewManager->selectedAddressees();
if ( addrList.count() > 1 ) {
// can probably be removed because we now check the selection in setContactSelected().
@@ -641,7 +641,7 @@ void KABCore::setWhoAmI()
TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) );
if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes )
- static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] );
+ static_cast<TDEABC::StdAddressBook*>( TDEABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] );
}
void KABCore::incrementalTextSearch( const TQString& text )
@@ -654,12 +654,12 @@ void KABCore::incrementalJumpButtonSearch( const TQString& character )
{
mViewManager->setSelected( TQString(), false );
- KABC::AddresseeList list = mSearchManager->contacts();
- KABC::Field *field = mViewManager->currentSortField();
+ TDEABC::AddresseeList list = mSearchManager->contacts();
+ TDEABC::Field *field = mViewManager->currentSortField();
if ( field ) {
list.sortByField( field );
- KABC::AddresseeList::ConstIterator it;
- const KABC::AddresseeList::ConstIterator endIt( list.end() );
+ TDEABC::AddresseeList::ConstIterator it;
+ const TDEABC::AddresseeList::ConstIterator endIt( list.end() );
for ( it = list.begin(); it != endIt; ++it ) {
if ( field->value( *it ).startsWith( character, false ) ) {
mViewManager->setSelected( (*it).uid(), true );
@@ -687,14 +687,14 @@ bool KABCore::modified() const
return mModified;
}
-void KABCore::contactModified( const KABC::Addressee &addr )
+void KABCore::contactModified( const TDEABC::Addressee &addr )
{
Command *command = 0;
// check if it exists already
- KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() );
+ TDEABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() );
if ( origAddr.isEmpty() ) {
- KABC::Addressee::List addressees;
+ TDEABC::Addressee::List addressees;
addressees.append( addr );
command = new NewCommand( mAddressBook, addressees );
} else {
@@ -710,7 +710,7 @@ void KABCore::contactModified( const KABC::Addressee &addr )
void KABCore::newDistributionList()
{
#ifdef TDEPIM_NEW_DISTRLISTS
- KABC::Resource *resource = requestResource( mWidget );
+ TDEABC::Resource *resource = requestResource( mWidget );
if ( !resource )
return;
@@ -736,10 +736,10 @@ void KABCore::newContact()
{
AddresseeEditorDialog *dialog = 0;
- KABC::Resource* resource = requestResource( mWidget );
+ TDEABC::Resource* resource = requestResource( mWidget );
if ( resource ) {
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
addr.setResource( resource );
if ( !KABLock::self( mAddressBook )->lock( addr.resource() ) )
@@ -759,7 +759,7 @@ void KABCore::addEmail( const TQString &aStr )
{
TQString fullName, email;
- KABC::Addressee::parseEmailAddress( aStr, fullName, email );
+ TDEABC::Addressee::parseEmailAddress( aStr, fullName, email );
#if KDE_IS_VERSION(3,4,89)
// This ugly hack will be removed in 4.0
@@ -774,8 +774,8 @@ void KABCore::addEmail( const TQString &aStr )
// Try to lookup the addressee matching the email address
bool found = false;
TQStringList emailList;
- KABC::AddressBook::Iterator it;
- const KABC::AddressBook::Iterator endIt( mAddressBook->end() );
+ TDEABC::AddressBook::Iterator it;
+ const TDEABC::AddressBook::Iterator endIt( mAddressBook->end() );
for ( it = mAddressBook->begin(); !found && (it != endIt); ++it ) {
emailList = (*it).emails();
if ( emailList.contains( email ) > 0 ) {
@@ -786,7 +786,7 @@ void KABCore::addEmail( const TQString &aStr )
}
if ( !found ) {
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
addr.setNameFromString( fullName );
addr.insertEmail( email, true );
@@ -829,7 +829,7 @@ void KABCore::editContact( const TQString &uid )
}
#endif
- KABC::Addressee addr = mAddressBook->findByUid( localUID );
+ TDEABC::Addressee addr = mAddressBook->findByUid( localUID );
if ( !addr.isEmpty() ) {
AddresseeEditorDialog *dialog = mEditorDict.find( addr.uid() );
if ( !dialog ) {
@@ -871,7 +871,7 @@ void KABCore::storeContactIn( const TQString &uid, bool copy /*false*/ )
} else {
uidList << uid;
}
- KABC::Resource *resource = requestResource( mWidget );
+ TDEABC::Resource *resource = requestResource( mWidget );
if ( !resource )
return;
@@ -890,10 +890,10 @@ void KABCore::storeContactIn( const TQString &uid, bool copy /*false*/ )
void KABCore::save()
{
- TQPtrList<KABC::Resource> resources = mAddressBook->resources();
- TQPtrListIterator<KABC::Resource> it( resources );
+ TQPtrList<TDEABC::Resource> resources = mAddressBook->resources();
+ TQPtrListIterator<TDEABC::Resource> it( resources );
while ( it.current() && !it.current()->readOnly() ) {
- KABC::Ticket *ticket = mAddressBook->requestSaveTicket( it.current() );
+ TDEABC::Ticket *ticket = mAddressBook->requestSaveTicket( it.current() );
if ( ticket ) {
if ( !mAddressBook->save( ticket ) ) {
KMessageBox::error( mWidget,
@@ -914,8 +914,8 @@ void KABCore::save()
void KABCore::load()
{
- TQPtrList<KABC::Resource> resources = mAddressBook->resources();
- TQPtrListIterator<KABC::Resource> it( resources );
+ TQPtrList<TDEABC::Resource> resources = mAddressBook->resources();
+ TQPtrListIterator<TDEABC::Resource> it( resources );
while ( it.current() ) {
mAddressBook->load();
++it;
@@ -941,18 +941,18 @@ void KABCore::setDetailsVisible( bool visible )
mDetailsPage->hide();
}
-void KABCore::extensionModified( const KABC::Addressee::List &list )
+void KABCore::extensionModified( const TDEABC::Addressee::List &list )
{
if ( list.count() != 0 ) {
- KABC::Addressee::List::ConstIterator it;
- const KABC::Addressee::List::ConstIterator endIt( list.end() );
+ TDEABC::Addressee::List::ConstIterator it;
+ const TDEABC::Addressee::List::ConstIterator endIt( list.end() );
for ( it = list.begin(); it != endIt; ++it ) {
Command *command = 0;
// check if it exists already
- KABC::Addressee origAddr = mAddressBook->findByUid( (*it).uid() );
+ TDEABC::Addressee origAddr = mAddressBook->findByUid( (*it).uid() );
if ( origAddr.isEmpty() ) {
- KABC::Addressee::List addressees;
+ TDEABC::Addressee::List addressees;
addressees.append( *it );
command = new NewCommand( mAddressBook, addressees );
} else
@@ -994,15 +994,15 @@ TQString KABCore::getNameByPhone( const TQString &phone )
bool found = false;
TQString ownerName = "";
- KABC::PhoneNumber::List phoneList;
+ TDEABC::PhoneNumber::List phoneList;
- KABC::AddressBook::ConstIterator iter;
- const KABC::AddressBook::ConstIterator endIter( mAddressBook->end() );
+ TDEABC::AddressBook::ConstIterator iter;
+ const TDEABC::AddressBook::ConstIterator endIter( mAddressBook->end() );
for ( iter = mAddressBook->begin(); !found && ( iter != endIter ); ++iter ) {
phoneList = (*iter).phoneNumbers();
- KABC::PhoneNumber::List::Iterator phoneIter( phoneList.begin() );
- const KABC::PhoneNumber::List::Iterator phoneEndIter( phoneList.end() );
+ TDEABC::PhoneNumber::List::Iterator phoneIter( phoneList.begin() );
+ const TDEABC::PhoneNumber::List::Iterator phoneEndIter( phoneList.end() );
for ( ; !found && ( phoneIter != phoneEndIter ); ++phoneIter) {
// Get rid of separator chars so just the numbers are compared.
if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
@@ -1084,13 +1084,13 @@ void KABCore::showContactsAddress( const TQString &addrUid )
if ( uidList.isEmpty() )
return;
- KABC::Addressee addr = mAddressBook->findByUid( uidList.first() );
+ TDEABC::Addressee addr = mAddressBook->findByUid( uidList.first() );
if ( addr.isEmpty() )
return;
- const KABC::Address::List list = addr.addresses();
- KABC::Address::List::ConstIterator it;
- const KABC::Address::List::ConstIterator endIt( list.end() );
+ const TDEABC::Address::List list = addr.addresses();
+ TDEABC::Address::List::ConstIterator it;
+ const TDEABC::Address::List::ConstIterator endIt( list.end() );
for ( it = list.begin(); it != endIt; ++it )
if ( (*it).id() == addrUid ) {
LocationMap::instance()->showAddress( *it );
@@ -1109,8 +1109,8 @@ bool KABCore::queryClose()
saveSettings();
KABPrefs::instance()->writeConfig();
- TQPtrList<KABC::Resource> resources = mAddressBook->resources();
- TQPtrListIterator<KABC::Resource> it( resources );
+ TQPtrList<TDEABC::Resource> resources = mAddressBook->resources();
+ TQPtrListIterator<TDEABC::Resource> it( resources );
while ( it.current() ) {
it.current()->close();
++it;
@@ -1157,8 +1157,8 @@ AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *parent,
{
AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent,
name ? name : "editorDialog" );
- connect( dialog, TQT_SIGNAL( contactModified( const KABC::Addressee& ) ),
- TQT_SLOT( contactModified( const KABC::Addressee& ) ) );
+ connect( dialog, TQT_SIGNAL( contactModified( const TDEABC::Addressee& ) ),
+ TQT_SLOT( contactModified( const TDEABC::Addressee& ) ) );
connect( dialog, TQT_SIGNAL( editorDestroyed( const TQString& ) ),
TQT_SLOT( slotEditorDestroyed( const TQString& ) ) );
@@ -1183,7 +1183,7 @@ void KABCore::slotEditorDestroyed( const TQString &uid )
{
AddresseeEditorDialog *dialog = mEditorDict.take( uid );
- KABC::Addressee addr = dialog->addressee();
+ TDEABC::Addressee addr = dialog->addressee();
if ( !addr.resource()->readOnly() ) {
TQApplication::setOverrideCursor( TQt::waitCursor );
@@ -1471,8 +1471,8 @@ TQStringList KABCore::allCategories() const
return allCategories;
}
- KABC::AddressBook::ConstIterator it;
- const KABC::AddressBook::ConstIterator endIt( mAddressBook->end() );
+ TDEABC::AddressBook::ConstIterator it;
+ const TDEABC::AddressBook::ConstIterator endIt( mAddressBook->end() );
for ( it = mAddressBook->begin(); it != endIt; ++it ) {
categories = (*it).categories();
const TQStringList::ConstIterator catEndIt( categories.end() );
@@ -1510,7 +1510,7 @@ void KABCore::categoriesSelected( const TQStringList &categories )
TQStringList::ConstIterator it;
const TQStringList::ConstIterator endIt( uids.end() );
for ( it = uids.begin(); it != endIt; ++it ) {
- KABC::Addressee addr = mAddressBook->findByUid( *it );
+ TDEABC::Addressee addr = mAddressBook->findByUid( *it );
if ( !addr.isEmpty() ) {
if ( !merge )
addr.setCategories( categories );
@@ -1617,7 +1617,7 @@ void KABCore::removeSelectedContactsFromDistList()
TQStringList::ConstIterator it = uids.begin();
const TQStringList::ConstIterator endIt( uids.end() );
while ( it != endIt ) {
- KABC::Addressee addr = mAddressBook->findByUid( *it );
+ TDEABC::Addressee addr = mAddressBook->findByUid( *it );
names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() );
++it;
}
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index f9a7fbf10..2a4bb2f4a 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -35,7 +35,7 @@
#include "core.h"
#include <tdepimmacros.h>
-namespace KABC {
+namespace TDEABC {
class AddressBook;
class Ticket;
}
@@ -76,7 +76,7 @@ namespace KAB {
}
typedef struct {
- KABC::Ticket *ticket;
+ TDEABC::Ticket *ticket;
int counter;
} ResourceMapEntry;
@@ -103,7 +103,7 @@ class KDE_EXPORT KABCore : public KAB::Core
/**
Returns a pointer to the StdAddressBook of the application.
*/
- KABC::AddressBook *addressBook() const;
+ TDEABC::AddressBook *addressBook() const;
/**
Returns a pointer to the TDEConfig object of the application.
@@ -119,7 +119,7 @@ class KDE_EXPORT KABCore : public KAB::Core
/**
Returns the current sort field of the view.
*/
- KABC::Field *currentSortField() const;
+ TDEABC::Field *currentSortField() const;
/**
Returns the uid list of the currently selected contacts.
@@ -131,7 +131,7 @@ class KDE_EXPORT KABCore : public KAB::Core
resource or a null pointer if no resource was selected by
the user.
*/
- KABC::Resource *requestResource( TQWidget *parent );
+ TDEABC::Resource *requestResource( TQWidget *parent );
/**
Returns the parent widget.
@@ -243,7 +243,7 @@ class KDE_EXPORT KABCore : public KAB::Core
@param list The list of addressee, which shall be pasted.
*/
- void pasteContacts( KABC::Addressee::List &list );
+ void pasteContacts( TDEABC::Addressee::List &list );
/**
@@ -290,7 +290,7 @@ class KDE_EXPORT KABCore : public KAB::Core
Called whenever an contact is modified in the contact editor
dialog or the quick edit.
*/
- void contactModified( const KABC::Addressee &addr );
+ void contactModified( const TDEABC::Addressee &addr );
/**
DCOP METHOD: Adds the given email address to address book.
@@ -404,7 +404,7 @@ class KDE_EXPORT KABCore : public KAB::Core
void setJumpButtonBarVisible( bool visible );
void setDetailsVisible( bool visible );
- void extensionModified( const KABC::Addressee::List &list );
+ void extensionModified( const TDEABC::Addressee::List &list );
void extensionDeleted( const TQStringList &uidList );
void clipboardDataChanged();
void updateIncSearchWidget();
@@ -439,7 +439,7 @@ class KDE_EXPORT KABCore : public KAB::Core
const char *name = 0 );
TQWidget *mWidget;
- KABC::AddressBook *mAddressBook;
+ TDEABC::AddressBook *mAddressBook;
KStatusBar *mStatusBar;
ViewManager *mViewManager;
diff --git a/kaddressbook/kablock.cpp b/kaddressbook/kablock.cpp
index 8d36977fe..58fa19f14 100644
--- a/kaddressbook/kablock.cpp
+++ b/kaddressbook/kablock.cpp
@@ -29,12 +29,12 @@
#include "kablock.h"
-class AddressBookWrapper : public KABC::AddressBook
+class AddressBookWrapper : public TDEABC::AddressBook
{
public:
- AddressBookWrapper( KABC::AddressBook* );
+ AddressBookWrapper( TDEABC::AddressBook* );
- KABC::Resource* getStandardResource()
+ TDEABC::Resource* getStandardResource()
{
return standardResource();
}
@@ -44,7 +44,7 @@ KABLock *KABLock::mSelf = 0;
static KStaticDeleter<KABLock> kabLockDeleter;
-KABLock::KABLock( KABC::AddressBook *ab )
+KABLock::KABLock( TDEABC::AddressBook *ab )
: mAddressBook( ab )
{
}
@@ -53,7 +53,7 @@ KABLock::~KABLock()
{
}
-KABLock *KABLock::self( KABC::AddressBook *ab )
+KABLock *KABLock::self( TDEABC::AddressBook *ab )
{
if ( !mSelf )
kabLockDeleter.setObject( mSelf, new KABLock( ab ) );
@@ -63,10 +63,10 @@ KABLock *KABLock::self( KABC::AddressBook *ab )
return mSelf;
}
-bool KABLock::lock( KABC::Resource *resource )
+bool KABLock::lock( TDEABC::Resource *resource )
{
if ( mLocks.find( resource ) == mLocks.end() ) { // not locked yet
- KABC::Ticket *ticket = mAddressBook->requestSaveTicket( resource );
+ TDEABC::Ticket *ticket = mAddressBook->requestSaveTicket( resource );
if ( !ticket ) {
return false;
} else {
@@ -83,7 +83,7 @@ bool KABLock::lock( KABC::Resource *resource )
return true;
}
-bool KABLock::unlock( KABC::Resource *resource )
+bool KABLock::unlock( TDEABC::Resource *resource )
{
AddressBookWrapper *wrapper = static_cast<AddressBookWrapper*>( mAddressBook );
if ( resource == 0 )
diff --git a/kaddressbook/kablock.h b/kaddressbook/kablock.h
index a706d88fd..110a1cf2a 100644
--- a/kaddressbook/kablock.h
+++ b/kaddressbook/kablock.h
@@ -24,14 +24,14 @@
#ifndef KABLOCK_H
#define KABLOCK_H
-namespace KABC {
+namespace TDEABC {
class AddressBook;
class Resource;
class Ticket;
}
typedef struct {
- KABC::Ticket *ticket;
+ TDEABC::Ticket *ticket;
uint counter;
} LockEntry;
@@ -40,19 +40,19 @@ class KABLock
public:
~KABLock();
- static KABLock *self( KABC::AddressBook *ab );
+ static KABLock *self( TDEABC::AddressBook *ab );
- bool lock( KABC::Resource* );
- bool unlock( KABC::Resource* );
+ bool lock( TDEABC::Resource* );
+ bool unlock( TDEABC::Resource* );
protected:
- KABLock( KABC::AddressBook *ab );
+ KABLock( TDEABC::AddressBook *ab );
private:
static KABLock *mSelf;
- TQMap<KABC::Resource*, LockEntry> mLocks;
- KABC::AddressBook *mAddressBook;
+ TQMap<TDEABC::Resource*, LockEntry> mLocks;
+ TDEABC::AddressBook *mAddressBook;
};
#endif
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index cfa16df81..ddebac13e 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -31,7 +31,7 @@
#include "kabtools.h"
-static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList &existingFiles )
+static TQString uniqueFileName( const TDEABC::Addressee &addressee, TQStringList &existingFiles )
{
TQString name;
TQString uniquePart;
@@ -51,7 +51,7 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList &
return name;
}
-void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab )
+void KABTools::mailVCards( const TQStringList &uids, TDEABC::AddressBook *ab )
{
KURL::List urls;
@@ -65,7 +65,7 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab )
TQStringList::ConstIterator it( uids.begin() );
const TQStringList::ConstIterator endIt( uids.end() );
for ( ; it != endIt; ++it ) {
- KABC::Addressee addressee = ab->findByUid( *it );
+ TDEABC::Addressee addressee = ab->findByUid( *it );
if ( addressee.isEmpty() )
continue;
@@ -77,14 +77,14 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab )
TQFile file( path );
if ( file.open( IO_WriteOnly ) ) {
- KABC::VCardConverter converter;
- KABC::Addressee::List list;
+ TDEABC::VCardConverter converter;
+ TDEABC::Addressee::List list;
list.append( addressee );
#if defined(KABC_VCARD_ENCODING_FIX)
- const TQCString vcard = converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 );
+ const TQCString vcard = converter.createVCardsRaw( list, TDEABC::VCardConverter::v3_0 );
file.writeBlock( vcard, vcard.length() );
#else
- TQString vcard = converter.createVCards( list, KABC::VCardConverter::v3_0 );
+ TQString vcard = converter.createVCards( list, TDEABC::VCardConverter::v3_0 );
TQTextStream t( &file );
t.setEncoding( TQTextStream::UnicodeUTF8 );
t << vcard;
@@ -104,7 +104,7 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab )
urls.toStringList() );
}
-static void mergePictures( KABC::Picture &master, const KABC::Picture &slave )
+static void mergePictures( TDEABC::Picture &master, const TDEABC::Picture &slave )
{
if ( master.isIntern() ) {
if ( master.data().isNull() ) {
@@ -123,23 +123,23 @@ static void mergePictures( KABC::Picture &master, const KABC::Picture &slave )
}
}
-KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
+TDEABC::Addressee KABTools::mergeContacts( const TDEABC::Addressee::List &list )
{
if ( list.count() == 0 ) //emtpy
- return KABC::Addressee();
+ return TDEABC::Addressee();
else if ( list.count() == 1 ) // nothing to merge
return list.first();
- KABC::Addressee masterAddressee = list.first();
+ TDEABC::Addressee masterAddressee = list.first();
- KABC::Addressee::List::ConstIterator contactIt( list.begin() );
- const KABC::Addressee::List::ConstIterator contactEndIt( list.end() );
+ TDEABC::Addressee::List::ConstIterator contactIt( list.begin() );
+ const TDEABC::Addressee::List::ConstIterator contactEndIt( list.end() );
for ( ++contactIt; contactIt != contactEndIt; ++contactIt ) {
// ADR + LABEL
- const KABC::Address::List addresses = (*contactIt).addresses();
- KABC::Address::List masterAddresses = masterAddressee.addresses();
- KABC::Address::List::ConstIterator addrIt( addresses.begin() );
- const KABC::Address::List::ConstIterator addrEndIt( addresses.end() );
+ const TDEABC::Address::List addresses = (*contactIt).addresses();
+ TDEABC::Address::List masterAddresses = masterAddressee.addresses();
+ TDEABC::Address::List::ConstIterator addrIt( addresses.begin() );
+ const TDEABC::Address::List::ConstIterator addrEndIt( addresses.end() );
for ( ; addrIt != addrEndIt; ++addrIt ) {
if ( !masterAddresses.contains( *addrIt ) )
masterAddressee.insertAddress( *addrIt );
@@ -184,7 +184,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
// KEY
*/
// LOGO
- KABC::Picture logo = masterAddressee.logo();
+ TDEABC::Picture logo = masterAddressee.logo();
mergePictures( logo, (*contactIt).logo() );
masterAddressee.setLogo( logo );
@@ -209,7 +209,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
masterAddressee.setOrganization( (*contactIt).organization() );
// PHOTO
- KABC::Picture photo = masterAddressee.photo();
+ TDEABC::Picture photo = masterAddressee.photo();
mergePictures( photo, (*contactIt).photo() );
masterAddressee.setPhoto( photo );
@@ -234,10 +234,10 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
*/
// TEL
- const KABC::PhoneNumber::List phones = (*contactIt).phoneNumbers();
- const KABC::PhoneNumber::List masterPhones = masterAddressee.phoneNumbers();
- KABC::PhoneNumber::List::ConstIterator phoneIt( phones.begin() );
- const KABC::PhoneNumber::List::ConstIterator phoneEndIt( phones.end() );
+ const TDEABC::PhoneNumber::List phones = (*contactIt).phoneNumbers();
+ const TDEABC::PhoneNumber::List masterPhones = masterAddressee.phoneNumbers();
+ TDEABC::PhoneNumber::List::ConstIterator phoneIt( phones.begin() );
+ const TDEABC::PhoneNumber::List::ConstIterator phoneEndIt( phones.end() );
for ( ; phoneIt != phoneEndIt; ++phoneIt )
if ( !masterPhones.contains( *phoneIt ) )
masterAddressee.insertPhoneNumber( *phoneIt );
diff --git a/kaddressbook/kabtools.h b/kaddressbook/kabtools.h
index 504540e9b..8061bfe1d 100644
--- a/kaddressbook/kabtools.h
+++ b/kaddressbook/kabtools.h
@@ -24,7 +24,7 @@
#ifndef KABTOOLS_H
#define KABTOOLS_H
-namespace KABC {
+namespace TDEABC {
class AddressBook;
}
@@ -34,12 +34,12 @@ class KABTools
/**
Sends a mail with vCards as attachments for all given UIDs.
*/
- static void mailVCards( const TQStringList &uids, KABC::AddressBook *ab );
+ static void mailVCards( const TQStringList &uids, TDEABC::AddressBook *ab );
/**
Merges all passed contacts to a single one.
*/
- static KABC::Addressee mergeContacts( const KABC::Addressee::List &list );
+ static TDEABC::Addressee mergeContacts( const TDEABC::Addressee::List &list );
};
#endif
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 09b713f26..d86103db8 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -55,10 +55,10 @@ KAddressBookView::~KAddressBookView()
void KAddressBookView::readConfig( TDEConfig *config )
{
- mFieldList = KABC::Field::restoreFields( config, "KABCFields" );
+ mFieldList = TDEABC::Field::restoreFields( config, "KABCFields" );
if ( mFieldList.isEmpty() )
- mFieldList = KABC::Field::defaultFields();
+ mFieldList = TDEABC::Field::defaultFields();
mDefaultFilterType = (DefaultFilterType)config->readNumEntry( "DefaultFilterType", 1 );
mDefaultFilterName = config->readEntry( "DefaultFilterName" );
@@ -74,7 +74,7 @@ TQString KAddressBookView::selectedEmails()
bool first = true;
TQString emailAddrs;
const TQStringList uidList = selectedUids();
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
TQString email;
TQStringList::ConstIterator it;
@@ -85,7 +85,7 @@ TQString KAddressBookView::selectedEmails()
TQString m = TQString();
if ( addr.emails().count() > 1 )
- m = KABC::EmailSelector::getEmail( addr.emails(), addr.preferredEmail(), this );
+ m = TDEABC::EmailSelector::getEmail( addr.emails(), addr.preferredEmail(), this );
email = addr.fullEmail( m );
@@ -101,16 +101,16 @@ TQString KAddressBookView::selectedEmails()
return emailAddrs;
}
-KABC::Addressee::List KAddressBookView::addressees()
+TDEABC::Addressee::List KAddressBookView::addressees()
{
if ( mFilter.isEmpty() )
return mCore->searchManager()->contacts();
- KABC::Addressee::List addresseeList;
- const KABC::Addressee::List contacts = mCore->searchManager()->contacts();
+ TDEABC::Addressee::List addresseeList;
+ const TDEABC::Addressee::List contacts = mCore->searchManager()->contacts();
- KABC::Addressee::List::ConstIterator it;
- KABC::Addressee::List::ConstIterator contactsEnd( contacts.end() );
+ TDEABC::Addressee::List::ConstIterator it;
+ TDEABC::Addressee::List::ConstIterator contactsEnd( contacts.end() );
for ( it = contacts.begin(); it != contactsEnd; ++it ) {
if ( mFilter.filterAddressee( *it ) )
addresseeList.append( *it );
@@ -129,7 +129,7 @@ void KAddressBookView::initGUI()
layout->addWidget( mViewWidget );
}
-KABC::Field::List KAddressBookView::fields() const
+TDEABC::Field::List KAddressBookView::fields() const
{
return mFieldList;
}
@@ -185,7 +185,7 @@ void KAddressBookView::updateView()
setSelected( *it, true );
} else {
- const KABC::Addressee::List contacts = mCore->searchManager()->contacts();
+ const TDEABC::Addressee::List contacts = mCore->searchManager()->contacts();
if ( !contacts.isEmpty() )
setFirstSelected( true );
else
@@ -193,7 +193,7 @@ void KAddressBookView::updateView()
}
}
-ViewConfigureWidget *ViewFactory::configureWidget( KABC::AddressBook *ab,
+ViewConfigureWidget *ViewFactory::configureWidget( TDEABC::AddressBook *ab,
TQWidget *parent,
const char *name )
{
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 44e82a572..8090408dc 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -42,7 +42,7 @@ class KXMLGUIClient;
class TQDropEvent;
namespace KAB { class Core; }
-namespace KABC { class AddressBook; }
+namespace TDEABC { class AddressBook; }
/**
Base class for all views in kaddressbook. This class implements
@@ -121,7 +121,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget
this method whenever a readConfig() is called in order to get the newest
list of fields.
*/
- KABC::Field::List fields() const;
+ TDEABC::Field::List fields() const;
/**
Sets the active filter. This filter will be used for filtering
@@ -152,7 +152,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget
/**
@return The current sort field.
*/
- virtual KABC::Field *sortField() const = 0;
+ virtual TDEABC::Field *sortField() const = 0;
virtual void scrollUp() = 0;
virtual void scrollDown() = 0;
@@ -248,7 +248,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget
method internally takes many factors into account, including the current
filter.
*/
- KABC::Addressee::List addressees();
+ TDEABC::Addressee::List addressees();
/**
This method returns the widget that should be used as the parent for
@@ -268,7 +268,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget
Filter mFilter;
TQString mDefaultFilterName;
KAB::Core *mCore;
- KABC::Field::List mFieldList;
+ TDEABC::Field::List mFieldList;
TQWidget *mViewWidget;
};
@@ -300,7 +300,7 @@ class KDE_EXPORT ViewFactory : public KLibFactory
If this method is over loaded the base classes method should
<B>not</B> be called.
*/
- virtual ViewConfigureWidget *configureWidget( KABC::AddressBook *ab,
+ virtual ViewConfigureWidget *configureWidget( TDEABC::AddressBook *ab,
TQWidget *parent,
const char *name = 0 );
diff --git a/kaddressbook/kcmconfigs/Makefile.am b/kaddressbook/kcmconfigs/Makefile.am
index 62fb7612f..d066dfed4 100644
--- a/kaddressbook/kcmconfigs/Makefile.am
+++ b/kaddressbook/kcmconfigs/Makefile.am
@@ -20,7 +20,7 @@ kcm_kabldapconfig_la_SOURCES = addhostdialog.cpp kcmkabldapconfig.cpp \
ldapoptionswidget.cpp
kcm_kabldapconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-avoid-version -no-undefined
-kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la
+kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp
kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp
index 44a51680e..7cf7a77fd 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.cpp
+++ b/kaddressbook/kcmconfigs/addhostdialog.cpp
@@ -41,19 +41,19 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const
TQWidget *page = plainPage();
TQHBoxLayout *layout = new TQHBoxLayout( page, marginHint(), spacingHint() );
- mCfg = new KABC::LdapConfigWidget(
- KABC::LdapConfigWidget::W_USER |
- KABC::LdapConfigWidget::W_PASS |
- KABC::LdapConfigWidget::W_BINDDN |
- KABC::LdapConfigWidget::W_REALM |
- KABC::LdapConfigWidget::W_HOST |
- KABC::LdapConfigWidget::W_PORT |
- KABC::LdapConfigWidget::W_VER |
- KABC::LdapConfigWidget::W_TIMELIMIT |
- KABC::LdapConfigWidget::W_SIZELIMIT |
- KABC::LdapConfigWidget::W_DN |
- KABC::LdapConfigWidget::W_SECBOX |
- KABC::LdapConfigWidget::W_AUTHBOX,
+ mCfg = new TDEABC::LdapConfigWidget(
+ TDEABC::LdapConfigWidget::W_USER |
+ TDEABC::LdapConfigWidget::W_PASS |
+ TDEABC::LdapConfigWidget::W_BINDDN |
+ TDEABC::LdapConfigWidget::W_REALM |
+ TDEABC::LdapConfigWidget::W_HOST |
+ TDEABC::LdapConfigWidget::W_PORT |
+ TDEABC::LdapConfigWidget::W_VER |
+ TDEABC::LdapConfigWidget::W_TIMELIMIT |
+ TDEABC::LdapConfigWidget::W_SIZELIMIT |
+ TDEABC::LdapConfigWidget::W_DN |
+ TDEABC::LdapConfigWidget::W_SECBOX |
+ TDEABC::LdapConfigWidget::W_AUTHBOX,
page );
layout->addWidget( mCfg );
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index 1ea1865fd..5c900c07b 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -48,7 +48,7 @@ class AddHostDialog : public KDialogBase
void slotHostEditChanged( const TQString& );
virtual void slotOk();
private:
- KABC::LdapConfigWidget *mCfg;
+ TDEABC::LdapConfigWidget *mCfg;
KPIM::LdapServer *mServer;
};
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 6d8522f6f..226bb3095 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -196,7 +196,7 @@ void AddresseeWidget::saveSettings()
DCOPClient *client = DCOPClient::mainClient();
if ( client )
- client->emitDCOPSignal( "KABC::AddressBookConfig", "changed()", TQByteArray() );
+ client->emitDCOPSignal( "TDEABC::AddressBookConfig", "changed()", TQByteArray() );
}
#include "addresseewidget.moc"
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 671d07298..8af9f2618 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -70,14 +70,14 @@ KeyWidget::~KeyWidget()
{
}
-void KeyWidget::setKeys( const KABC::Key::List &list )
+void KeyWidget::setKeys( const TDEABC::Key::List &list )
{
mKeyList = list;
updateKeyCombo();
}
-KABC::Key::List KeyWidget::keys() const
+TDEABC::Key::List KeyWidget::keys() const
{
return mKeyList;
}
@@ -88,19 +88,19 @@ void KeyWidget::addKey()
TQStringList keyTypeNames;
TQStringList existingKeyTypes;
- KABC::Key::List::ConstIterator listIt;
+ TDEABC::Key::List::ConstIterator listIt;
for ( listIt = mKeyList.begin(); listIt != mKeyList.end(); ++listIt ) {
- if ( (*listIt).type() != KABC::Key::Custom )
- existingKeyTypes.append( KABC::Key::typeLabel( (*listIt).type() ) );
+ if ( (*listIt).type() != TDEABC::Key::Custom )
+ existingKeyTypes.append( TDEABC::Key::typeLabel( (*listIt).type() ) );
}
- KABC::Key::TypeList typeList = KABC::Key::typeList();
- KABC::Key::TypeList::ConstIterator it;
+ TDEABC::Key::TypeList typeList = TDEABC::Key::typeList();
+ TDEABC::Key::TypeList::ConstIterator it;
for ( it = typeList.begin(); it != typeList.end(); ++it ) {
- if ( (*it) != KABC::Key::Custom &&
- !existingKeyTypes.contains( KABC::Key::typeLabel( *it ) ) ) {
- keyMap.insert( KABC::Key::typeLabel( *it ), *it );
- keyTypeNames.append( KABC::Key::typeLabel( *it ) );
+ if ( (*it) != TDEABC::Key::Custom &&
+ !existingKeyTypes.contains( TDEABC::Key::typeLabel( *it ) ) ) {
+ keyMap.insert( TDEABC::Key::typeLabel( *it ), *it );
+ keyTypeNames.append( TDEABC::Key::typeLabel( *it ) );
}
}
@@ -111,7 +111,7 @@ void KeyWidget::addKey()
int type = keyMap[ name ];
if ( !keyTypeNames.contains( name ) )
- type = KABC::Key::Custom;
+ type = TDEABC::Key::Custom;
KURL url = KFileDialog::getOpenURL();
if ( url.isEmpty() )
@@ -133,8 +133,8 @@ void KeyWidget::addKey()
s >> data;
file.close();
- KABC::Key key( data, type );
- if ( type == KABC::Key::Custom )
+ TDEABC::Key key( data, type );
+ if ( type == TDEABC::Key::Custom )
key.setCustomTypeString( name );
mKeyList.append( key );
@@ -165,7 +165,7 @@ void KeyWidget::removeKey()
void KeyWidget::exportKey()
{
- KABC::Key key = (*mKeyList.at( mKeyCombo->currentItem() ) );
+ TDEABC::Key key = (*mKeyList.at( mKeyCombo->currentItem() ) );
KURL url = KFileDialog::getSaveURL();
@@ -183,12 +183,12 @@ void KeyWidget::updateKeyCombo()
int pos = mKeyCombo->currentItem();
mKeyCombo->clear();
- KABC::Key::List::ConstIterator it;
+ TDEABC::Key::List::ConstIterator it;
for ( it = mKeyList.begin(); it != mKeyList.end(); ++it ) {
- if ( (*it).type() == KABC::Key::Custom )
+ if ( (*it).type() == TDEABC::Key::Custom )
mKeyCombo->insertItem( (*it).customTypeString() );
else
- mKeyCombo->insertItem( KABC::Key::typeLabel( (*it).type() ) );
+ mKeyCombo->insertItem( TDEABC::Key::typeLabel( (*it).type() ) );
}
mKeyCombo->setCurrentItem( pos );
diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h
index 3e437fa00..3507af804 100644
--- a/kaddressbook/keywidget.h
+++ b/kaddressbook/keywidget.h
@@ -40,8 +40,8 @@ class KeyWidget : public TQWidget
KeyWidget( TQWidget *parent, const char *name = 0 );
~KeyWidget();
- void setKeys( const KABC::Key::List &list );
- KABC::Key::List keys() const;
+ void setKeys( const TDEABC::Key::List &list );
+ TDEABC::Key::List keys() const;
signals:
void changed();
@@ -60,7 +60,7 @@ class KeyWidget : public TQWidget
TQPushButton *mRemoveButton;
TQPushButton *mExportButton;
- KABC::Key::List mKeyList;
+ TDEABC::Key::List mKeyList;
};
#endif
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 3ed815046..0dc741253 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -138,7 +138,7 @@ TQValueList<ContactListItem*> LDAPSearchDialog::Private::selectedItems( TQListVi
return selected;
}
-LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
+LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core,
TQWidget* parent, const char* name )
: KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | User2 |
Cancel, Default, parent, name, false, true ),
@@ -481,9 +481,9 @@ void LDAPSearchDialog::slotSelectAll()
mResultListView->selectAll( true );
}
-KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs )
+TDEABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs )
{
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
// name
addr.setNameFromString( asUtf8( attrs["cn"].first() ) );
@@ -509,7 +509,7 @@ KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::
#endif
// Address
- KABC::Address workAddr( KABC::Address::Work );
+ TDEABC::Address workAddr( TDEABC::Address::Work );
workAddr.setStreet( asUtf8( attrs[ "street" ].first()) );
workAddr.setLocality( asUtf8( attrs[ "l" ].first()) );
@@ -521,24 +521,24 @@ KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::
addr.insertAddress( workAddr );
// phone
- KABC::PhoneNumber homeNr = asUtf8( attrs[ "homePhone" ].first() );
- homeNr.setType( KABC::PhoneNumber::Home );
+ TDEABC::PhoneNumber homeNr = asUtf8( attrs[ "homePhone" ].first() );
+ homeNr.setType( TDEABC::PhoneNumber::Home );
addr.insertPhoneNumber( homeNr );
- KABC::PhoneNumber workNr = asUtf8( attrs[ "telephoneNumber" ].first() );
- workNr.setType( KABC::PhoneNumber::Work );
+ TDEABC::PhoneNumber workNr = asUtf8( attrs[ "telephoneNumber" ].first() );
+ workNr.setType( TDEABC::PhoneNumber::Work );
addr.insertPhoneNumber( workNr );
- KABC::PhoneNumber faxNr = asUtf8( attrs[ "facsimileTelephoneNumber" ].first() );
- faxNr.setType( KABC::PhoneNumber::Fax );
+ TDEABC::PhoneNumber faxNr = asUtf8( attrs[ "facsimileTelephoneNumber" ].first() );
+ faxNr.setType( TDEABC::PhoneNumber::Fax );
addr.insertPhoneNumber( faxNr );
- KABC::PhoneNumber cellNr = asUtf8( attrs[ "mobile" ].first() );
- cellNr.setType( KABC::PhoneNumber::Cell );
+ TDEABC::PhoneNumber cellNr = asUtf8( attrs[ "mobile" ].first() );
+ cellNr.setType( TDEABC::PhoneNumber::Cell );
addr.insertPhoneNumber( cellNr );
- KABC::PhoneNumber pagerNr = asUtf8( attrs[ "pager" ].first() );
- pagerNr.setType( KABC::PhoneNumber::Pager );
+ TDEABC::PhoneNumber pagerNr = asUtf8( attrs[ "pager" ].first() );
+ pagerNr.setType( TDEABC::PhoneNumber::Pager );
addr.insertPhoneNumber( pagerNr );
return addr;
}
@@ -557,19 +557,19 @@ KPIM::DistributionList LDAPSearchDialog::selectDistributionList()
}
#endif
-KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems,
- KABC::Resource * const resource )
+TDEABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems,
+ TDEABC::Resource * const resource )
{
const TQDateTime now = TQDateTime::currentDateTime();
TQStringList importedAddrs;
- KABC::Addressee::List localAddrs;
+ TDEABC::Addressee::List localAddrs;
KABLock::self( mCore->addressBook() )->lock( resource );
for ( TQValueList<ContactListItem*>::ConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) {
const ContactListItem * const cli = *it;
- KABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs );
- const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() );
+ TDEABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs );
+ const TDEABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() );
if ( existing.isEmpty() ) {
addr.setUid( TDEApplication::randomString( 10 ) );
@@ -608,7 +608,7 @@ void LDAPSearchDialog::slotUser2()
return;
}
- KABC::Resource *resource = mCore->requestResource( this );
+ TDEABC::Resource *resource = mCore->requestResource( this );
if ( !resource ) return;
KPIM::DistributionList dist = selectDistributionList();
@@ -616,12 +616,12 @@ void LDAPSearchDialog::slotUser2()
return;
- KABC::Addressee::List localAddrs = importContactsUnlessTheyExist( selectedItems, resource );
+ TDEABC::Addressee::List localAddrs = importContactsUnlessTheyExist( selectedItems, resource );
if ( localAddrs.isEmpty() )
return;
- for ( KABC::Addressee::List::ConstIterator it = localAddrs.begin(); it != localAddrs.end(); ++it ) {
+ for ( TDEABC::Addressee::List::ConstIterator it = localAddrs.begin(); it != localAddrs.end(); ++it ) {
dist.insertEntry( *it, TQString() );
}
KABLock::self( mCore->addressBook() )->lock( resource );
@@ -633,7 +633,7 @@ void LDAPSearchDialog::slotUser2()
void LDAPSearchDialog::slotUser1()
{
- KABC::Resource *resource = mCore->requestResource( this );
+ TDEABC::Resource *resource = mCore->requestResource( this );
if ( !resource ) return;
const TQValueList<ContactListItem*> selectedItems = d->selectedItems( mResultListView );
if( selectedItems.isEmpty() )
diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h
index dde2bc955..1f3a5c3b0 100644
--- a/kaddressbook/ldapsearchdialog.h
+++ b/kaddressbook/ldapsearchdialog.h
@@ -43,7 +43,7 @@ class TQPushButton;
class KABCore;
class ContactListItem;
-namespace KABC {
+namespace TDEABC {
class Resource;
}
@@ -53,7 +53,7 @@ class LDAPSearchDialog : public KDialogBase
public:
- LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name = 0 );
+ LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name = 0 );
~LDAPSearchDialog();
bool isOK() const { return mIsOK; }
@@ -80,7 +80,7 @@ class LDAPSearchDialog : public KDialogBase
* unless they already exist. Returns the list of both the added
* and the existing contacts.
*/
- KABC::Addressee::List importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& items, KABC::Resource * const resource );
+ TDEABC::Addressee::List importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& items, TDEABC::Resource * const resource );
protected:
TQString selectedEMails() const;
@@ -89,7 +89,7 @@ class LDAPSearchDialog : public KDialogBase
private:
void saveSettings();
- static KABC::Addressee convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs );
+ static TDEABC::Addressee convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs );
#ifdef TDEPIM_NEW_DISTRLISTS
KPIM::DistributionList selectDistributionList();
#endif
@@ -101,7 +101,7 @@ class LDAPSearchDialog : public KDialogBase
int mNumHosts;
TQPtrList<KPIM::LdapClient> mLdapClientList;
bool mIsOK;
- KABC::AddressBook *mAddressBook;
+ TDEABC::AddressBook *mAddressBook;
KABCore *mCore;
KComboBox* mFilterCombo;
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 91c018a7d..7724dd875 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -45,7 +45,7 @@
#include "nameeditdialog.h"
-NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
+NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type,
bool readOnly, TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Edit Contact Name" ), Help | Ok | Cancel,
Ok, parent, name, true ), mAddressee( addr )
@@ -235,7 +235,7 @@ void NameEditDialog::formattedNameTypeChanged()
if ( formattedNameType() == CustomName )
name = mCustomFormattedName;
else {
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
addr.setPrefix( prefix() );
addr.setFamilyName( familyName() );
addr.setAdditionalName( additionalName() );
@@ -249,7 +249,7 @@ void NameEditDialog::formattedNameTypeChanged()
mFormattedNameEdit->setText( name );
}
-TQString NameEditDialog::formattedName( const KABC::Addressee &addr, int type )
+TQString NameEditDialog::formattedName( const TDEABC::Addressee &addr, int type )
{
TQString name;
diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h
index 855cd04c2..277031d97 100644
--- a/kaddressbook/nameeditdialog.h
+++ b/kaddressbook/nameeditdialog.h
@@ -53,7 +53,7 @@ class NameEditDialog : public KDialogBase
Organization // the organization name
};
- NameEditDialog( const KABC::Addressee &addr, int type,
+ NameEditDialog( const TDEABC::Addressee &addr, int type,
bool readOnly, TQWidget *parent, const char *name = 0 );
~NameEditDialog();
@@ -67,7 +67,7 @@ class NameEditDialog : public KDialogBase
bool changed() const;
- static TQString formattedName( const KABC::Addressee &addr, int type );
+ static TQString formattedName( const TDEABC::Addressee &addr, int type );
protected slots:
void slotHelp();
@@ -91,7 +91,7 @@ class NameEditDialog : public KDialogBase
TQCheckBox *mParseBox;
AddresseeConfig mAddresseeConfig;
- KABC::Addressee mAddressee;
+ TDEABC::Addressee mAddressee;
TQString mCustomFormattedName;
bool mChanged;
};
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index 70381d8e7..80f45cff5 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -48,9 +48,9 @@
PhoneTypeCombo::PhoneTypeCombo( TQWidget *parent )
: KComboBox( parent, "TypeCombo" ),
- mType( KABC::PhoneNumber::Home ),
+ mType( TDEABC::PhoneNumber::Home ),
mLastSelected( 0 ),
- mTypeList( KABC::PhoneNumber::typeList() )
+ mTypeList( TDEABC::PhoneNumber::typeList() )
{
mTypeList.append( -1 ); // Others...
@@ -91,7 +91,7 @@ void PhoneTypeCombo::update()
if ( *it == -1 ) { // "Other..." entry
insertItem( i18n( "Other..." ) );
} else {
- KABC::PhoneNumber number;
+ TDEABC::PhoneNumber number;
number.setType( *it );
insertItem( number.typeLabel() );
}
@@ -141,7 +141,7 @@ PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent )
connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) );
}
-void PhoneNumberWidget::setNumber( const KABC::PhoneNumber &number )
+void PhoneNumberWidget::setNumber( const TDEABC::PhoneNumber &number )
{
mNumber = number;
@@ -149,9 +149,9 @@ void PhoneNumberWidget::setNumber( const KABC::PhoneNumber &number )
mNumberEdit->setText( number.number() );
}
-KABC::PhoneNumber PhoneNumberWidget::number() const
+TDEABC::PhoneNumber PhoneNumberWidget::number() const
{
- KABC::PhoneNumber number( mNumber );
+ TDEABC::PhoneNumber number( mNumber );
number.setType( mTypeCombo->type() );
number.setNumber( mNumberEdit->text() );
@@ -207,28 +207,28 @@ void PhoneEditWidget::setReadOnly( bool readOnly )
}
}
-void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &list )
+void PhoneEditWidget::setPhoneNumbers( const TDEABC::PhoneNumber::List &list )
{
mPhoneNumberList = list;
- KABC::PhoneNumber::TypeList types;
- types << KABC::PhoneNumber::Home;
- types << KABC::PhoneNumber::Work;
- types << KABC::PhoneNumber::Cell;
+ TDEABC::PhoneNumber::TypeList types;
+ types << TDEABC::PhoneNumber::Home;
+ types << TDEABC::PhoneNumber::Work;
+ types << TDEABC::PhoneNumber::Cell;
// add an empty entry per default
if ( mPhoneNumberList.count() < 3 )
for ( int i = mPhoneNumberList.count(); i < 3; ++i )
- mPhoneNumberList.append( KABC::PhoneNumber( "", types[ i ] ) );
+ mPhoneNumberList.append( TDEABC::PhoneNumber( "", types[ i ] ) );
recreateNumberWidgets();
}
-KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers() const
+TDEABC::PhoneNumber::List PhoneEditWidget::phoneNumbers() const
{
- KABC::PhoneNumber::List list;
+ TDEABC::PhoneNumber::List list;
- KABC::PhoneNumber::List::ConstIterator it;
+ TDEABC::PhoneNumber::List::ConstIterator it;
for ( it = mPhoneNumberList.begin(); it != mPhoneNumberList.end(); ++it )
if ( !(*it).number().isEmpty() )
list.append( *it );
@@ -244,7 +244,7 @@ void PhoneEditWidget::changed()
void PhoneEditWidget::add()
{
- mPhoneNumberList.append( KABC::PhoneNumber() );
+ mPhoneNumberList.append( TDEABC::PhoneNumber() );
recreateNumberWidgets();
}
@@ -265,7 +265,7 @@ void PhoneEditWidget::recreateNumberWidgets()
}
mWidgets.clear();
- KABC::PhoneNumber::List::ConstIterator it;
+ TDEABC::PhoneNumber::List::ConstIterator it;
int counter = 0;
for ( it = mPhoneNumberList.begin(); it != mPhoneNumberList.end(); ++it ) {
PhoneNumberWidget *wdg = new PhoneNumberWidget( this );
@@ -307,19 +307,19 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent )
layout->addWidget( mGroup );
// fill widgets
- mTypeList = KABC::PhoneNumber::typeList();
- mTypeList.remove( KABC::PhoneNumber::Pref );
+ mTypeList = TDEABC::PhoneNumber::typeList();
+ mTypeList.remove( TDEABC::PhoneNumber::Pref );
- KABC::PhoneNumber::TypeList::ConstIterator it;
+ TDEABC::PhoneNumber::TypeList::ConstIterator it;
for ( it = mTypeList.begin(); it != mTypeList.end(); ++it )
- new TQCheckBox( KABC::PhoneNumber::typeLabel( *it ), mGroup );
+ new TQCheckBox( TDEABC::PhoneNumber::typeLabel( *it ), mGroup );
for ( int i = 0; i < mGroup->count(); ++i ) {
TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
box->setChecked( mType & mTypeList[ i ] );
}
- mPreferredBox->setChecked( mType & KABC::PhoneNumber::Pref );
+ mPreferredBox->setChecked( mType & TDEABC::PhoneNumber::Pref );
}
int PhoneTypeDialog::type() const
@@ -333,9 +333,9 @@ int PhoneTypeDialog::type() const
}
if ( mPreferredBox->isChecked() )
- type = type | KABC::PhoneNumber::Pref;
+ type = type | TDEABC::PhoneNumber::Pref;
else
- type = type & ~KABC::PhoneNumber::Pref;
+ type = type & ~TDEABC::PhoneNumber::Pref;
return type;
}
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index f9ca8ed4c..13c088916 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -71,8 +71,8 @@ class PhoneNumberWidget : public TQWidget
public:
PhoneNumberWidget( TQWidget *parent );
- void setNumber( const KABC::PhoneNumber &number );
- KABC::PhoneNumber number() const;
+ void setNumber( const TDEABC::PhoneNumber &number );
+ TDEABC::PhoneNumber number() const;
void setReadOnly( bool readOnly );
@@ -82,7 +82,7 @@ class PhoneNumberWidget : public TQWidget
private:
PhoneTypeCombo *mTypeCombo;
KLineEdit *mNumberEdit;
- KABC::PhoneNumber mNumber;
+ TDEABC::PhoneNumber mNumber;
};
/**
@@ -97,8 +97,8 @@ class PhoneEditWidget : public TQWidget
PhoneEditWidget( TQWidget *parent, const char *name = 0 );
~PhoneEditWidget();
- void setPhoneNumbers( const KABC::PhoneNumber::List &list );
- KABC::PhoneNumber::List phoneNumbers() const;
+ void setPhoneNumbers( const TDEABC::PhoneNumber::List &list );
+ TDEABC::PhoneNumber::List phoneNumbers() const;
void setReadOnly( bool readOnly );
@@ -114,7 +114,7 @@ class PhoneEditWidget : public TQWidget
private:
void recreateNumberWidgets();
- KABC::PhoneNumber::List mPhoneNumberList;
+ TDEABC::PhoneNumber::List mPhoneNumberList;
TQPtrList<PhoneNumberWidget> mWidgets;
TQPushButton *mAddButton;
@@ -139,7 +139,7 @@ class PhoneTypeDialog : public KDialogBase
private:
int mType;
- KABC::PhoneNumber::TypeList mTypeList;
+ TDEABC::PhoneNumber::TypeList mTypeList;
TQButtonGroup *mGroup;
TQCheckBox *mPreferredBox;
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index e1d48db56..41d6231e9 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -122,7 +122,7 @@ DetailledPrintStyle::~DetailledPrintStyle()
mPainter = 0;
}
-void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintProgress *progress )
+void DetailledPrintStyle::print( const TDEABC::Addressee::List &contacts, PrintProgress *progress )
{
mPrintProgress = progress;
@@ -239,7 +239,7 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro
config->sync();
}
-bool DetailledPrintStyle::printEntries( const KABC::Addressee::List &contacts,
+bool DetailledPrintStyle::printEntries( const TDEABC::Addressee::List &contacts,
KPrinter *printer,
TQPainter *painter,
const TQRect &window)
@@ -247,7 +247,7 @@ bool DetailledPrintStyle::printEntries( const KABC::Addressee::List &contacts,
TQRect brect;
int ypos = 0, count = 0;
- KABC::Addressee::List::ConstIterator it;
+ TDEABC::Addressee::List::ConstIterator it;
for ( it = contacts.begin(); it != contacts.end(); ++it ) {
if ( !(*it).isEmpty() ) {
// do a faked print to get the bounding rect:
diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h
index c68568aa1..05f30bae4 100644
--- a/kaddressbook/printing/detailledstyle.h
+++ b/kaddressbook/printing/detailledstyle.h
@@ -42,12 +42,12 @@ class DetailledPrintStyle : public PrintStyle
DetailledPrintStyle( PrintingWizard *parent, const char *name = 0 );
~DetailledPrintStyle();
- void print( const KABC::Addressee::List &contacts, PrintProgress* );
+ void print( const TDEABC::Addressee::List &contacts, PrintProgress* );
protected:
- bool printEntries( const KABC::Addressee::List &contacts, KPrinter *printer,
+ bool printEntries( const TDEABC::Addressee::List &contacts, KPrinter *printer,
TQPainter *painter, const TQRect &window );
- bool printEntry( const KABC::Addressee &contact, const TQRect &window,
+ bool printEntry( const TDEABC::Addressee &contact, const TQRect &window,
TQPainter *painter, int top, bool fake, TQRect *brect );
private:
AppearancePage *mPageAppearance;
diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp
index d973f810c..49247ce8a 100644
--- a/kaddressbook/printing/kabentrypainter.cpp
+++ b/kaddressbook/printing/kabentrypainter.cpp
@@ -148,7 +148,7 @@ int KABEntryPainter::hits( const TQRectList& list, const TQPoint &p )
return -1;
}
-bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
+bool KABEntryPainter::printAddressee( const TDEABC::Addressee &addr,
const TQRect &window, TQPainter *painter,
int top, bool fake, TQRect *brect )
{
@@ -169,7 +169,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
TQFontMetrics fmComment( mCommentFont );
int y = top;
- KABC::Address address;
+ TDEABC::Address address;
// this is used to prepare some fields for printing and decide about
// the layout later:
@@ -255,7 +255,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
}
// Telephones:
- const KABC::PhoneNumber::List phoneNumbers( addr.phoneNumbers() );
+ const TDEABC::PhoneNumber::List phoneNumbers( addr.phoneNumbers() );
if ( !phoneNumbers.isEmpty() && mShowPhones ) {
contents.push_back( &mPhoneRects );
TQStringList list;
@@ -264,7 +264,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
list.append( phoneNumbers.count() == 1 ? i18n( "Telephone:" )
: i18n( "Telephones:" ) );
- KABC::PhoneNumber::List::ConstIterator it;
+ TDEABC::PhoneNumber::List::ConstIterator it;
for ( it = phoneNumbers.begin(); it != phoneNumbers.end(); ++it ) {
line = (*it).typeLabel();
line += ": " + (*it).number();
@@ -354,7 +354,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
// ^^^^^ done with emails, telephone, URLs and talk addresses
// now print the addresses:
- KABC::Address::List addresses = addr.addresses();
+ TDEABC::Address::List addresses = addr.addresses();
if ( addresses.count() > 0 && mShowAddresses ) {
y += fmBody.lineSpacing() / 2;
painter->setFont( mHeadLineFont );
@@ -372,29 +372,29 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
y += fmBody.lineSpacing() / 4;
painter->setFont( mBodyFont );
- KABC::Address::List::ConstIterator it;
+ TDEABC::Address::List::ConstIterator it;
for ( it = addresses.begin(); it != addresses.end(); ++it ) {
address = *it;
switch ( address.type() ) {
- case KABC::Address::Dom:
+ case TDEABC::Address::Dom:
line1 = i18n( "Domestic Address" );
break;
- case KABC::Address::Intl:
+ case TDEABC::Address::Intl:
line1 = i18n( "International Address" );
break;
- case KABC::Address::Postal:
+ case TDEABC::Address::Postal:
line1 = i18n( "Postal Address" );
break;
- case KABC::Address::Parcel:
+ case TDEABC::Address::Parcel:
line1 = i18n( "Parcel Address" );
break;
- case KABC::Address::Home:
+ case TDEABC::Address::Home:
line1 = i18n( "Home Address" );
break;
- case KABC::Address::Work:
+ case TDEABC::Address::Work:
line1 = i18n( "Work Address" );
break;
- case KABC::Address::Pref:
+ case TDEABC::Address::Pref:
default:
line1 = i18n( "Preferred Address" );
}
diff --git a/kaddressbook/printing/kabentrypainter.h b/kaddressbook/printing/kabentrypainter.h
index f8fea4912..cd933b579 100644
--- a/kaddressbook/printing/kabentrypainter.h
+++ b/kaddressbook/printing/kabentrypainter.h
@@ -58,7 +58,7 @@ class KABEntryPainter
@returns false if some error happens, otherwise true.
*/
- bool printAddressee( const KABC::Addressee &addr, const TQRect &window,
+ bool printAddressee( const TDEABC::Addressee &addr, const TQRect &window,
TQPainter *p, int top = 0, bool fake = false,
TQRect *rect = 0 );
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index aa718dfd0..25b2e02e9 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -53,7 +53,7 @@ MikesStyle::~MikesStyle()
{
}
-void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *progress )
+void MikesStyle::print( const TDEABC::Addressee::List &contacts, PrintProgress *progress )
{
TQFont mFont;
TQFont mBoldFont;
@@ -71,7 +71,7 @@ void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *pr
TQPaintDeviceMetrics metrics( p.device() );
int height = 0;
- KABC::Addressee::List::ConstIterator it;
+ TDEABC::Addressee::List::ConstIterator it;
progress->addMessage( i18n( "Preparing" ) );
progress->addMessage( i18n( "Printing" ) );
@@ -136,7 +136,7 @@ TQString MikesStyle::trimString( const TQString &text, int width, TQFontMetrics
return trimmed;
}
-void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr,
+void MikesStyle::doPaint( TQPainter &painter, const TDEABC::Addressee &addr,
int maxHeight, const TQFont &font, const TQFont &bFont )
{
TQFontMetrics fm( font );
@@ -164,7 +164,7 @@ void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr,
// now the fields, in two halves
painter.setFont( font );
- KABC::Field::List fields = wizard()->addressBook()->fields();
+ TDEABC::Field::List fields = wizard()->addressBook()->fields();
int numFields = fields.count();
TQString label;
TQString value;
@@ -211,7 +211,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font )
p.drawText( 0, fm.height(), text );
}
-int MikesStyle::calcHeight( const KABC::Addressee &addr,
+int MikesStyle::calcHeight( const TDEABC::Addressee &addr,
const TQFont &font, const TQFont &bFont )
{
TQFontMetrics fm( font );
@@ -220,7 +220,7 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr,
int height = 0;
// get the fields
- KABC::Field::List fieldList = wizard()->addressBook()->fields();
+ TDEABC::Field::List fieldList = wizard()->addressBook()->fields();
int numFields = fieldList.count();
int halfHeight = 0;
diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h
index f94dce309..fe1be4224 100644
--- a/kaddressbook/printing/mikesstyle.h
+++ b/kaddressbook/printing/mikesstyle.h
@@ -42,12 +42,12 @@ class MikesStyle : public PrintStyle
MikesStyle( PrintingWizard *parent, const char *name );
~MikesStyle();
- void print( const KABC::Addressee::List&, PrintProgress* );
+ void print( const TDEABC::Addressee::List&, PrintProgress* );
protected:
- void doPaint( TQPainter &painter, const KABC::Addressee &addr, int maxHeight,
+ void doPaint( TQPainter &painter, const TDEABC::Addressee &addr, int maxHeight,
const TQFont &font, const TQFont &bFont );
- int calcHeight( const KABC::Addressee &addr, const TQFont &font, const TQFont &bFont);
+ int calcHeight( const TDEABC::Addressee &addr, const TQFont &font, const TQFont &bFont);
void paintTagLine( TQPainter &p, const TQFont &font);
TQString trimString( const TQString &text, int width, TQFontMetrics &fm);
};
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index 9ee8fe4a6..eecf434c3 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -52,7 +52,7 @@
using namespace KABPrinting;
-PrintingWizard::PrintingWizard( KPrinter *printer, KABC::AddressBook* ab,
+PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab,
const TQStringList& selection, TQWidget *parent,
const char* name )
: KWizard( parent, name ), mPrinter( printer ), mAddressBook( ab ),
@@ -137,7 +137,7 @@ void PrintingWizard::slotStyleSelected( int index )
}
}
-KABC::AddressBook* PrintingWizard::addressBook()
+TDEABC::AddressBook* PrintingWizard::addressBook()
{
return mAddressBook;
}
@@ -157,12 +157,12 @@ void PrintingWizard::print()
// prepare list of contacts to print:
- KABC::AddresseeList list;
+ TDEABC::AddresseeList list;
if ( mStyle != 0 ) {
if ( mSelectionPage->useSelection() ) {
TQStringList::ConstIterator it;
for ( it = mSelection.begin(); it != mSelection.end(); ++it ) {
- KABC::Addressee addr = addressBook()->findByUid( *it );
+ TDEABC::Addressee addr = addressBook()->findByUid( *it );
if ( !addr.isEmpty() )
list.append( addr );
}
@@ -173,7 +173,7 @@ void PrintingWizard::print()
if ( (*filterIt).name() == mSelectionPage->filter() )
break;
- KABC::AddressBook::ConstIterator it;
+ TDEABC::AddressBook::ConstIterator it;
for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
if ( (*filterIt).filterAddressee( *it ) )
list.append( *it );
@@ -181,7 +181,7 @@ void PrintingWizard::print()
} else if ( mSelectionPage->useCategories() ) {
TQStringList categories = mSelectionPage->categories();
- KABC::AddressBook::ConstIterator it;
+ TDEABC::AddressBook::ConstIterator it;
for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
const TQStringList tmp( (*it).categories() );
TQStringList::ConstIterator tmpIt;
@@ -193,7 +193,7 @@ void PrintingWizard::print()
}
} else {
// create a string list of all entries:
- KABC::AddressBook::ConstIterator it;
+ TDEABC::AddressBook::ConstIterator it;
for ( it = addressBook()->begin(); it != addressBook()->end(); ++it )
list.append( *it );
}
diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h
index 359b746fe..3d2d0b27e 100644
--- a/kaddressbook/printing/printingwizard.h
+++ b/kaddressbook/printing/printingwizard.h
@@ -57,7 +57,7 @@ class PrintingWizard : public KWizard
Construct a printing wizard. Give the addressbook instance to print.
*/
PrintingWizard( KPrinter *printer,
- KABC::AddressBook* ab,
+ TDEABC::AddressBook* ab,
const TQStringList& selection,
TQWidget *parent = 0, const char *name = 0 );
~PrintingWizard();
@@ -75,7 +75,7 @@ class PrintingWizard : public KWizard
/**
Retrieve the document object.
*/
- KABC::AddressBook *addressBook();
+ TDEABC::AddressBook *addressBook();
/**
Retrieve the printer to be used.
@@ -94,7 +94,7 @@ class PrintingWizard : public KWizard
TQPtrList<PrintStyle> mStyleList;
Filter::List mFilters;
KPrinter *mPrinter;
- KABC::AddressBook *mAddressBook;
+ TDEABC::AddressBook *mAddressBook;
TQStringList mSelection;
PrintStyle *mStyle;
diff --git a/kaddressbook/printing/printsortmode.cpp b/kaddressbook/printing/printsortmode.cpp
index 3e1af4203..edbb9acc9 100644
--- a/kaddressbook/printing/printsortmode.cpp
+++ b/kaddressbook/printing/printsortmode.cpp
@@ -27,23 +27,23 @@
#if KDE_IS_VERSION(3,3,91)
-PrintSortMode::PrintSortMode( KABC::Field *field, bool ascending )
+PrintSortMode::PrintSortMode( TDEABC::Field *field, bool ascending )
: mSortField( field ), mAscending( ascending )
{
- const KABC::Field::List fields = KABC::Field::allFields();
- KABC::Field::List::ConstIterator it;
+ const TDEABC::Field::List fields = TDEABC::Field::allFields();
+ TDEABC::Field::List::ConstIterator it;
for ( it = fields.begin(); it != fields.end(); ++it ) {
- if ( (*it)->label() == KABC::Addressee::givenNameLabel() )
+ if ( (*it)->label() == TDEABC::Addressee::givenNameLabel() )
mGivenNameField = *it;
- else if ( (*it)->label() == KABC::Addressee::familyNameLabel() )
+ else if ( (*it)->label() == TDEABC::Addressee::familyNameLabel() )
mFamilyNameField = *it;
- else if ( (*it)->label() == KABC::Addressee::formattedNameLabel() )
+ else if ( (*it)->label() == TDEABC::Addressee::formattedNameLabel() )
mFormattedNameField = *it;
}
}
-bool PrintSortMode::lesser( const KABC::Addressee &first,
- const KABC::Addressee &second ) const
+bool PrintSortMode::lesser( const TDEABC::Addressee &first,
+ const TDEABC::Addressee &second ) const
{
if ( !mSortField )
return false;
diff --git a/kaddressbook/printing/printsortmode.h b/kaddressbook/printing/printsortmode.h
index a764e6c74..fca9f6baf 100644
--- a/kaddressbook/printing/printsortmode.h
+++ b/kaddressbook/printing/printsortmode.h
@@ -30,18 +30,18 @@
#include <tdeabc/sortmode.h>
-class PrintSortMode : public KABC::SortMode
+class PrintSortMode : public TDEABC::SortMode
{
public:
- PrintSortMode( KABC::Field *field, bool ascending = true );
+ PrintSortMode( TDEABC::Field *field, bool ascending = true );
- virtual bool lesser( const KABC::Addressee&, const KABC::Addressee& ) const;
+ virtual bool lesser( const TDEABC::Addressee&, const TDEABC::Addressee& ) const;
private:
- KABC::Field *mSortField;
- KABC::Field *mGivenNameField;
- KABC::Field *mFamilyNameField;
- KABC::Field *mFormattedNameField;
+ TDEABC::Field *mSortField;
+ TDEABC::Field *mGivenNameField;
+ TDEABC::Field *mFamilyNameField;
+ TDEABC::Field *mFormattedNameField;
bool mAscending;
};
diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp
index 9387db325..33ef9ab54 100644
--- a/kaddressbook/printing/printstyle.cpp
+++ b/kaddressbook/printing/printstyle.cpp
@@ -102,13 +102,13 @@ void PrintStyle::hidePages()
mWizard->removePage( wdg );
}
-void PrintStyle::setPreferredSortOptions( KABC::Field *field, bool ascending )
+void PrintStyle::setPreferredSortOptions( TDEABC::Field *field, bool ascending )
{
mSortField = field;
mSortType = ascending;
}
-KABC::Field* PrintStyle::preferredSortField()
+TDEABC::Field* PrintStyle::preferredSortField()
{
return mSortField;
}
diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h
index 2c5ef51b5..9eeca876f 100644
--- a/kaddressbook/printing/printstyle.h
+++ b/kaddressbook/printing/printstyle.h
@@ -69,7 +69,7 @@ class PrintStyle : public TQObject
/**
Reimplement this method to actually print.
*/
- virtual void print( const KABC::Addressee::List &contacts, PrintProgress* ) = 0;
+ virtual void print( const TDEABC::Addressee::List &contacts, PrintProgress* ) = 0;
/**
Reimplement this method to provide a preview of what will
@@ -91,7 +91,7 @@ class PrintStyle : public TQObject
/**
Returns the preferred sort criterion field.
*/
- KABC::Field* preferredSortField();
+ TDEABC::Field* preferredSortField();
/**
Returns the preferred sort type.
@@ -118,7 +118,7 @@ class PrintStyle : public TQObject
/**
Set preferred sort options for this printing style.
*/
- void setPreferredSortOptions( KABC::Field *field, bool ascending = true );
+ void setPreferredSortOptions( TDEABC::Field *field, bool ascending = true );
/**
Return the wizard object.
@@ -137,7 +137,7 @@ class PrintStyle : public TQObject
TQPtrList<TQWidget> mPageList;
TQStringList mPageTitles;
- KABC::Field *mSortField;
+ TDEABC::Field *mSortField;
bool mSortType;
};
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index 0b67897d2..0df149315 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -34,7 +34,7 @@
#include "stylepage.h"
-StylePage::StylePage( KABC::AddressBook *ab, TQWidget* parent, const char* name )
+StylePage::StylePage( TDEABC::AddressBook *ab, TQWidget* parent, const char* name )
: TQWidget( parent, name ), mAddressBook( ab )
{
initGUI();
@@ -69,7 +69,7 @@ void StylePage::clearStyleNames()
mStyleCombo->clear();
}
-void StylePage::setSortField( KABC::Field *field )
+void StylePage::setSortField( TDEABC::Field *field )
{
mFieldCombo->setCurrentText( field->label() );
}
@@ -82,7 +82,7 @@ void StylePage::setSortAscending( bool value )
mSortTypeCombo->setCurrentItem( 1 );
}
-KABC::Field* StylePage::sortField()
+TDEABC::Field* StylePage::sortField()
{
if ( mFieldCombo->currentItem() == -1 )
return mFields[ 0 ];
@@ -102,8 +102,8 @@ void StylePage::initFieldCombo()
mFieldCombo->clear();
- mFields = mAddressBook->fields( KABC::Field::All );
- KABC::Field::List::ConstIterator it;
+ mFields = mAddressBook->fields( TDEABC::Field::All );
+ TDEABC::Field::List::ConstIterator it;
for ( it = mFields.begin(); it != mFields.end(); ++it )
mFieldCombo->insertItem( (*it)->label() );
}
diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h
index 46fbc2d6e..9b6958f71 100644
--- a/kaddressbook/printing/stylepage.h
+++ b/kaddressbook/printing/stylepage.h
@@ -41,7 +41,7 @@ class StylePage : public TQWidget
public:
- StylePage( KABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 );
+ StylePage( TDEABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 );
~StylePage();
/**
@@ -63,12 +63,12 @@ class StylePage : public TQWidget
/**
* Set the sort criterion field.
*/
- void setSortField( KABC::Field *field );
+ void setSortField( TDEABC::Field *field );
/**
* Returns the sort criterion field.
*/
- KABC::Field* sortField();
+ TDEABC::Field* sortField();
/**
* Set the sort type.
@@ -96,8 +96,8 @@ class StylePage : public TQWidget
KComboBox *mStyleCombo;
TQLabel *mPreview;
- KABC::AddressBook *mAddressBook;
- KABC::Field::List mFields;
+ TDEABC::AddressBook *mAddressBook;
+ TDEABC::Field::List mFields;
};
#endif // STYLEPAGE_H
diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp
index fef8f27db..350a4ffd8 100644
--- a/kaddressbook/searchmanager.cpp
+++ b/kaddressbook/searchmanager.cpp
@@ -29,30 +29,30 @@
using namespace KAB;
-SearchManager::SearchManager( KABC::AddressBook *ab,
+SearchManager::SearchManager( TDEABC::AddressBook *ab,
TQObject *parent, const char *name )
: TQObject( parent, name ), mAddressBook( ab )
{
}
-void SearchManager::search( const TQString &pattern, const KABC::Field::List &fields, Type type )
+void SearchManager::search( const TQString &pattern, const TDEABC::Field::List &fields, Type type )
{
mPattern = pattern;
mFields = fields;
mType = type;
- KABC::Addressee::List allContacts;
+ TDEABC::Addressee::List allContacts;
mContacts.clear();
#if TDE_VERSION >= 319
- KABC::AddresseeList list( mAddressBook->allAddressees() );
+ TDEABC::AddresseeList list( mAddressBook->allAddressees() );
if ( !fields.isEmpty() )
list.sortByField( fields.first() );
allContacts = list;
#else
- KABC::AddressBook::ConstIterator abIt( mAddressBook->begin() );
- const KABC::AddressBook::ConstIterator abEndIt( mAddressBook->end() );
+ TDEABC::AddressBook::ConstIterator abIt( mAddressBook->begin() );
+ const TDEABC::AddressBook::ConstIterator abEndIt( mAddressBook->end() );
for ( ; abIt != abEndIt; ++abIt )
allContacts.append( *abIt );
#endif
@@ -60,8 +60,8 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
#ifdef TDEPIM_NEW_DISTRLISTS
// Extract distribution lists from allContacts
mDistributionLists.clear();
- KABC::Addressee::List::Iterator rmIt( allContacts.begin() );
- const KABC::Addressee::List::Iterator rmEndIt( allContacts.end() );
+ TDEABC::Addressee::List::Iterator rmIt( allContacts.begin() );
+ const TDEABC::Addressee::List::Iterator rmEndIt( allContacts.end() );
while ( rmIt != rmEndIt ) {
if ( KPIM::DistributionList::isDistributionList( *rmIt ) ) {
mDistributionLists.append( static_cast<KPIM::DistributionList>( *rmIt ) );
@@ -93,10 +93,10 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
return;
}
- const KABC::Field::List fieldList = !mFields.isEmpty() ? mFields : KABC::Field::allFields();
+ const TDEABC::Field::List fieldList = !mFields.isEmpty() ? mFields : TDEABC::Field::allFields();
- KABC::Addressee::List::ConstIterator it( allContacts.begin() );
- const KABC::Addressee::List::ConstIterator endIt( allContacts.end() );
+ TDEABC::Addressee::List::ConstIterator it( allContacts.begin() );
+ const TDEABC::Addressee::List::ConstIterator endIt( allContacts.end() );
for ( ; it != endIt; ++it ) {
#ifdef TDEPIM_NEW_DISTRLISTS
if ( KPIM::DistributionList::isDistributionList( *it ) )
@@ -105,8 +105,8 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
bool found = false;
// search over all fields
- KABC::Field::List::ConstIterator fieldIt( fieldList.begin() );
- const KABC::Field::List::ConstIterator fieldEndIt( fieldList.end() );
+ TDEABC::Field::List::ConstIterator fieldIt( fieldList.begin() );
+ const TDEABC::Field::List::ConstIterator fieldEndIt( fieldList.end() );
for ( ; fieldIt != fieldEndIt; ++fieldIt ) {
if ( type == StartsWith && (*fieldIt)->value( *it ).startsWith( pattern, false ) ) {
@@ -159,7 +159,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi
emit contactsUpdated();
}
-KABC::Addressee::List SearchManager::contacts() const
+TDEABC::Addressee::List SearchManager::contacts() const
{
return mContacts;
}
diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h
index 9e1370320..3972110c3 100644
--- a/kaddressbook/searchmanager.h
+++ b/kaddressbook/searchmanager.h
@@ -47,7 +47,7 @@ class SearchManager : public TQObject
Equals
};
- SearchManager( KABC::AddressBook *ab,
+ SearchManager( TDEABC::AddressBook *ab,
TQObject *parent, const char *name = 0 );
/**
@@ -59,12 +59,12 @@ class SearchManager : public TQObject
@param field The field which shall be compared with the search string.
@param type The type for the matching.
*/
- void search( const TQString &pattern, const KABC::Field::List &fields, Type type = Contains );
+ void search( const TQString &pattern, const TDEABC::Field::List &fields, Type type = Contains );
/**
Returns the contacts which matched the last search query.
*/
- KABC::Addressee::List contacts() const;
+ TDEABC::Addressee::List contacts() const;
#ifdef TDEPIM_NEW_DISTRLISTS
@@ -94,15 +94,15 @@ class SearchManager : public TQObject
void reload();
private:
- KABC::Addressee::List mContacts;
+ TDEABC::Addressee::List mContacts;
#ifdef TDEPIM_NEW_DISTRLISTS
TQString mSelectedDistributionList;
KPIM::DistributionList::List mDistributionLists;
#endif
- KABC::AddressBook *mAddressBook;
+ TDEABC::AddressBook *mAddressBook;
TQString mPattern;
- KABC::Field::List mFields;
+ TDEABC::Field::List mFields;
Type mType;
};
diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp
index 62360196c..ae2b9c498 100644
--- a/kaddressbook/secrecywidget.cpp
+++ b/kaddressbook/secrecywidget.cpp
@@ -37,10 +37,10 @@ SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name )
mSecrecyCombo = new KComboBox( this );
layout->addWidget( mSecrecyCombo );
- const KABC::Secrecy::TypeList list = KABC::Secrecy::typeList();
- KABC::Secrecy::TypeList::ConstIterator it;
+ const TDEABC::Secrecy::TypeList list = TDEABC::Secrecy::typeList();
+ TDEABC::Secrecy::TypeList::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it )
- mSecrecyCombo->insertItem( KABC::Secrecy::typeLabel( *it ), *it );
+ mSecrecyCombo->insertItem( TDEABC::Secrecy::typeLabel( *it ), *it );
connect( mSecrecyCombo, TQT_SIGNAL( activated( const TQString& ) ),
TQT_SIGNAL( changed() ) );
@@ -55,15 +55,15 @@ void SecrecyWidget::setReadOnly( bool readOnly )
mSecrecyCombo->setEnabled( !readOnly );
}
-void SecrecyWidget::setSecrecy( const KABC::Secrecy &secrecy )
+void SecrecyWidget::setSecrecy( const TDEABC::Secrecy &secrecy )
{
- if ( secrecy.type() != KABC::Secrecy::Invalid )
+ if ( secrecy.type() != TDEABC::Secrecy::Invalid )
mSecrecyCombo->setCurrentItem( secrecy.type() );
}
-KABC::Secrecy SecrecyWidget::secrecy() const
+TDEABC::Secrecy SecrecyWidget::secrecy() const
{
- KABC::Secrecy secrecy;
+ TDEABC::Secrecy secrecy;
secrecy.setType( mSecrecyCombo->currentItem() );
return secrecy;
diff --git a/kaddressbook/secrecywidget.h b/kaddressbook/secrecywidget.h
index 46f76ba4d..1424d5e55 100644
--- a/kaddressbook/secrecywidget.h
+++ b/kaddressbook/secrecywidget.h
@@ -26,7 +26,7 @@
#include <tqwidget.h>
-namespace KABC { class Secrecy; }
+namespace TDEABC { class Secrecy; }
class KComboBox;
class SecrecyWidget : public TQWidget
@@ -38,8 +38,8 @@ class SecrecyWidget : public TQWidget
SecrecyWidget( TQWidget *parent, const char *name = 0 );
~SecrecyWidget();
- void setSecrecy( const KABC::Secrecy &secrecy );
- KABC::Secrecy secrecy() const;
+ void setSecrecy( const TDEABC::Secrecy &secrecy );
+ TDEABC::Secrecy secrecy() const;
void setReadOnly( bool readOnly );
diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp
index cabd98ba6..7d7914b98 100644
--- a/kaddressbook/simpleaddresseeeditor.cpp
+++ b/kaddressbook/simpleaddresseeeditor.cpp
@@ -45,14 +45,14 @@ SimpleAddresseeEditor::~SimpleAddresseeEditor()
kdDebug(5720) << "~SimpleAddresseeEditor()" << endl;
}
-void SimpleAddresseeEditor::setAddressee( const KABC::Addressee &addr )
+void SimpleAddresseeEditor::setAddressee( const TDEABC::Addressee &addr )
{
mAddressee = addr;
load();
}
-const KABC::Addressee &SimpleAddresseeEditor::addressee()
+const TDEABC::Addressee &SimpleAddresseeEditor::addressee()
{
return mAddressee;
}
diff --git a/kaddressbook/simpleaddresseeeditor.h b/kaddressbook/simpleaddresseeeditor.h
index 81280ca69..6f297edcf 100644
--- a/kaddressbook/simpleaddresseeeditor.h
+++ b/kaddressbook/simpleaddresseeeditor.h
@@ -37,8 +37,8 @@ class SimpleAddresseeEditor : public AddresseeEditorBase
SimpleAddresseeEditor( TQWidget *parent, const char *name = 0 );
~SimpleAddresseeEditor();
- void setAddressee( const KABC::Addressee& );
- const KABC::Addressee &addressee();
+ void setAddressee( const TDEABC::Addressee& );
+ const TDEABC::Addressee &addressee();
void load();
void save();
@@ -57,7 +57,7 @@ class SimpleAddresseeEditor : public AddresseeEditorBase
KLineEdit *mNameEdit;
KLineEdit *mEmailEdit;
- KABC::Addressee mAddressee;
+ TDEABC::Addressee mAddressee;
bool mDirty;
bool mBlockModified;
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index e26b3d3aa..dd10e2118 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -39,7 +39,7 @@
#include "soundwidget.h"
-SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+SoundWidget::SoundWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false )
{
TQGridLayout *topLayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
@@ -85,12 +85,12 @@ SoundWidget::~SoundWidget()
{
}
-void SoundWidget::loadContact( KABC::Addressee *addr )
+void SoundWidget::loadContact( TDEABC::Addressee *addr )
{
bool blocked = signalsBlocked();
blockSignals( true );
- KABC::Sound sound = addr->sound();
+ TDEABC::Sound sound = addr->sound();
if ( sound.isIntern() ) {
mSound.setData( sound.data() );
mPlayButton->setEnabled( true );
@@ -105,9 +105,9 @@ void SoundWidget::loadContact( KABC::Addressee *addr )
blockSignals( blocked );
}
-void SoundWidget::storeContact( KABC::Addressee *addr )
+void SoundWidget::storeContact( TDEABC::Addressee *addr )
{
- KABC::Sound sound;
+ TDEABC::Sound sound;
if ( mUseSoundUrl->isChecked() )
sound.setUrl( mSoundUrl->url() );
diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h
index f72a0181e..12283b4a3 100644
--- a/kaddressbook/soundwidget.h
+++ b/kaddressbook/soundwidget.h
@@ -39,11 +39,11 @@ class SoundWidget : public KAB::ContactEditorWidget
public:
- SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ SoundWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
~SoundWidget();
- void loadContact( KABC::Addressee *addr );
- void storeContact( KABC::Addressee *addr );
+ void loadContact( TDEABC::Addressee *addr );
+ void storeContact( TDEABC::Addressee *addr );
void setReadOnly( bool readOnly );
private slots:
@@ -58,14 +58,14 @@ class SoundWidget : public KAB::ContactEditorWidget
TQCheckBox *mUseSoundUrl;
TQPushButton *mPlayButton;
- KABC::Sound mSound;
+ TDEABC::Sound mSound;
bool mReadOnly;
};
class SoundWidgetFactory : public KAB::ContactEditorWidgetFactory
{
public:
- KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+ KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
{
return new SoundWidget( ab, parent, name );
}
diff --git a/kaddressbook/thumbnailcreator/Makefile.am b/kaddressbook/thumbnailcreator/Makefile.am
index 2f8ba9c84..06b763c03 100644
--- a/kaddressbook/thumbnailcreator/Makefile.am
+++ b/kaddressbook/thumbnailcreator/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = ldifvcardthumbnail.la
ldifvcardthumbnail_la_SOURCES = ldifvcardcreator.cpp
ldifvcardthumbnail_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-ldifvcardthumbnail_la_LIBADD = $(LIB_TDECORE) $(LIB_KABC) -ltdefx
+ldifvcardthumbnail_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEABC) -ltdefx
noinst_HEADERS = ldifvcardcreator.h
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index a0c557d1b..44e4684f8 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -84,10 +84,10 @@ bool VCard_LDIFCreator::readContents( const TQString &path )
#endif
file.close();
- // convert the file contents to a KABC::Addressee address
- KABC::AddresseeList addrList;
- KABC::Addressee addr;
- KABC::VCardConverter converter;
+ // convert the file contents to a TDEABC::Addressee address
+ TDEABC::AddresseeList addrList;
+ TDEABC::Addressee addr;
+ TDEABC::VCardConverter converter;
#if defined(KABC_VCARD_ENCODING_FIX)
addrList = converter.parseVCardsRaw( contentsRaw );
@@ -95,7 +95,7 @@ bool VCard_LDIFCreator::readContents( const TQString &path )
addrList = converter.parseVCards( contents );
#endif
if ( addrList.count() == 0 )
- if ( !KABC::LDIFConverter::LDIFToAddressee( contents, addrList ) )
+ if ( !TDEABC::LDIFConverter::LDIFToAddressee( contents, addrList ) )
return false;
if ( addrList.count()>1 ) {
// create an overview (list of all names)
@@ -126,7 +126,7 @@ bool VCard_LDIFCreator::readContents( const TQString &path )
name = name.simplifyWhiteSpace();
- KABC::PhoneNumber::List pnList = addr.phoneNumbers();
+ TDEABC::PhoneNumber::List pnList = addr.phoneNumbers();
TQStringList phoneNumbers;
for (unsigned int no=0; no<pnList.count(); ++no) {
TQString pn = pnList[no].number().simplifyWhiteSpace();
@@ -141,11 +141,11 @@ bool VCard_LDIFCreator::readContents( const TQString &path )
text += info + "\n";
// get an address
- KABC::Address address = addr.address(KABC::Address::Work);
+ TDEABC::Address address = addr.address(TDEABC::Address::Work);
if (address.isEmpty())
- address = addr.address(KABC::Address::Home);
+ address = addr.address(TDEABC::Address::Home);
if (address.isEmpty())
- address = addr.address(KABC::Address::Pref);
+ address = addr.address(TDEABC::Address::Pref);
info = address.formattedAddress();
if ( !info.isEmpty() )
text += info + "\n";
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index dc66696e5..aff63dd31 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -37,9 +37,9 @@
#include "undocmds.h"
-bool Command::resourceExist( KABC::Resource *resource )
+bool Command::resourceExist( TDEABC::Resource *resource )
{
- TQPtrList<KABC::Resource> lst = addressBook()->resources();
+ TQPtrList<TDEABC::Resource> lst = addressBook()->resources();
for ( Resource *res = lst.first(); res; res = lst.next() ) {
if ( res == resource )
return true;
@@ -47,7 +47,7 @@ bool Command::resourceExist( KABC::Resource *resource )
return false;
}
-DeleteCommand::DeleteCommand( KABC::AddressBook *addressBook,
+DeleteCommand::DeleteCommand( TDEABC::AddressBook *addressBook,
const TQStringList &uidList)
: Command( addressBook ), mUIDList( uidList )
{
@@ -61,8 +61,8 @@ TQString DeleteCommand::name() const
void DeleteCommand::unexecute()
{
// Put it back in the document
- KABC::Addressee::List::ConstIterator it;
- const KABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() );
+ TDEABC::Addressee::List::ConstIterator it;
+ const TDEABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() );
// lock resources
for ( it = mAddresseeList.begin(); it != endIt; ++it )
@@ -79,7 +79,7 @@ void DeleteCommand::unexecute()
void DeleteCommand::execute()
{
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
TQStringList::ConstIterator it;
const TQStringList::ConstIterator endIt( mUIDList.end() );
@@ -91,8 +91,8 @@ void DeleteCommand::execute()
cfg.remove();
}
- KABC::Addressee::List::ConstIterator addrIt;
- const KABC::Addressee::List::ConstIterator addrEndIt( mAddresseeList.end() );
+ TDEABC::Addressee::List::ConstIterator addrIt;
+ const TDEABC::Addressee::List::ConstIterator addrEndIt( mAddresseeList.end() );
for ( addrIt = mAddresseeList.begin(); addrIt != addrEndIt; ++addrIt ) {
if ( resourceExist( ( *addrIt ).resource() ) )
addressBook()->removeAddressee( *addrIt );
@@ -101,7 +101,7 @@ void DeleteCommand::execute()
}
-PasteCommand::PasteCommand( KAB::Core *core, const KABC::Addressee::List &addressees )
+PasteCommand::PasteCommand( KAB::Core *core, const TDEABC::Addressee::List &addressees )
: Command( core->addressBook() ), mAddresseeList( addressees ), mCore( core )
{
}
@@ -113,8 +113,8 @@ TQString PasteCommand::name() const
void PasteCommand::unexecute()
{
- KABC::Addressee::List::ConstIterator it;
- const KABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() );
+ TDEABC::Addressee::List::ConstIterator it;
+ const TDEABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() );
// lock resources
for ( it = mAddresseeList.begin(); it != endIt; ++it )
@@ -131,15 +131,15 @@ void PasteCommand::execute()
{
TQStringList uids;
- KABC::Addressee::List::ConstIterator constIt;
- const KABC::Addressee::List::ConstIterator constEndIt( mAddresseeList.end() );
+ TDEABC::Addressee::List::ConstIterator constIt;
+ const TDEABC::Addressee::List::ConstIterator constEndIt( mAddresseeList.end() );
// lock resources
for ( constIt = mAddresseeList.begin(); constIt != constEndIt; ++constIt )
lock()->lock( (*constIt).resource() );
- KABC::Addressee::List::Iterator it;
- const KABC::Addressee::List::Iterator endIt( mAddresseeList.end() );
+ TDEABC::Addressee::List::Iterator it;
+ const TDEABC::Addressee::List::Iterator endIt( mAddresseeList.end() );
for ( it = mAddresseeList.begin(); it != endIt; ++it ) {
if ( resourceExist( ( *it ).resource() ) ) {
@@ -157,7 +157,7 @@ void PasteCommand::execute()
}
-NewCommand::NewCommand( KABC::AddressBook *addressBook, const KABC::Addressee::List &addressees )
+NewCommand::NewCommand( TDEABC::AddressBook *addressBook, const TDEABC::Addressee::List &addressees )
: Command( addressBook ), mAddresseeList( addressees )
{
}
@@ -169,8 +169,8 @@ TQString NewCommand::name() const
void NewCommand::unexecute()
{
- KABC::Addressee::List::ConstIterator it;
- const KABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() );
+ TDEABC::Addressee::List::ConstIterator it;
+ const TDEABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() );
// lock resources
for ( it = mAddresseeList.begin(); it != endIt; ++it )
@@ -185,8 +185,8 @@ void NewCommand::unexecute()
void NewCommand::execute()
{
- KABC::Addressee::List::Iterator it;
- const KABC::Addressee::List::Iterator endIt( mAddresseeList.end() );
+ TDEABC::Addressee::List::Iterator it;
+ const TDEABC::Addressee::List::Iterator endIt( mAddresseeList.end() );
// lock resources
for ( it = mAddresseeList.begin(); it != endIt; ++it )
@@ -200,9 +200,9 @@ void NewCommand::execute()
}
-EditCommand::EditCommand( KABC::AddressBook *addressBook,
- const KABC::Addressee &oldAddressee,
- const KABC::Addressee &newAddressee )
+EditCommand::EditCommand( TDEABC::AddressBook *addressBook,
+ const TDEABC::Addressee &oldAddressee,
+ const TDEABC::Addressee &newAddressee )
: Command( addressBook ),
mOldAddressee( oldAddressee ), mNewAddressee( newAddressee )
{
@@ -234,7 +234,7 @@ void EditCommand::execute()
}
-CutCommand::CutCommand( KABC::AddressBook *addressBook, const TQStringList &uidList )
+CutCommand::CutCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList )
: Command( addressBook ), mUIDList( uidList )
{
}
@@ -246,8 +246,8 @@ TQString CutCommand::name() const
void CutCommand::unexecute()
{
- KABC::Addressee::List::ConstIterator it;
- const KABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() );
+ TDEABC::Addressee::List::ConstIterator it;
+ const TDEABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() );
// lock resources
for ( it = mAddresseeList.begin(); it != endIt; ++it )
@@ -268,7 +268,7 @@ void CutCommand::unexecute()
void CutCommand::execute()
{
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
TQStringList::ConstIterator it;
const TQStringList::ConstIterator endIt( mUIDList.end() );
@@ -278,8 +278,8 @@ void CutCommand::execute()
lock()->lock( addr.resource() );
}
- KABC::Addressee::List::ConstIterator addrIt;
- const KABC::Addressee::List::ConstIterator addrEndIt( mAddresseeList.end() );
+ TDEABC::Addressee::List::ConstIterator addrIt;
+ const TDEABC::Addressee::List::ConstIterator addrEndIt( mAddresseeList.end() );
for ( addrIt = mAddresseeList.begin(); addrIt != addrEndIt; ++addrIt ) {
if ( resourceExist( ( *addrIt ).resource() ) )
addressBook()->removeAddressee( *addrIt );
@@ -299,8 +299,8 @@ void CutCommand::execute()
#endif
}
-CopyToCommand::CopyToCommand( KABC::AddressBook *addressBook, const TQStringList &uidList,
- KABC::Resource *resource )
+CopyToCommand::CopyToCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList,
+ TDEABC::Resource *resource )
: Command( addressBook ), mUIDList( uidList ), mResource( resource )
{
}
@@ -312,8 +312,8 @@ TQString CopyToCommand::name() const
void CopyToCommand::unexecute()
{
- KABC::Addressee::List::ConstIterator it;
- const KABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() );
+ TDEABC::Addressee::List::ConstIterator it;
+ const TDEABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() );
//For copy : just remove it from the "copied to" resource.
// lock resources
for ( it = mAddresseeList.begin(); it != endIt; ++it )
@@ -332,9 +332,9 @@ void CopyToCommand::execute()
TQStringList::Iterator it( mUIDList.begin() );
const TQStringList::Iterator endIt( mUIDList.end() );
while ( it != endIt ) {
- KABC::Addressee addr = addressBook()->findByUid( *it++ );
+ TDEABC::Addressee addr = addressBook()->findByUid( *it++ );
if ( !addr.isEmpty() ) {
- KABC::Addressee newAddr( addr );
+ TDEABC::Addressee newAddr( addr );
// We need to set a new uid, otherwise the insert below is
// ignored. This is bad for syncing, but unavoidable, afaiks
newAddr.setUid( TDEApplication::randomString( 10 ) );
@@ -349,7 +349,7 @@ void CopyToCommand::execute()
}
MoveToCommand::MoveToCommand( KAB::Core *core, const TQStringList &uidList,
- KABC::Resource *resource )
+ TDEABC::Resource *resource )
: Command( core->addressBook() ), mUIDList( uidList ), mResource( resource ), mCore( core )
{
}
@@ -362,7 +362,7 @@ TQString MoveToCommand::name() const
void MoveToCommand::unexecute()
{
//For move : remove it from the "copied to" resource and insert it back to "copied from" resource.
- KABC::Resource *resource = mCore->requestResource( mCore->widget() );
+ TDEABC::Resource *resource = mCore->requestResource( mCore->widget() );
if ( !resource )
return;
moveContactTo( resource );
@@ -373,15 +373,15 @@ void MoveToCommand::execute()
moveContactTo( mResource );
}
-void MoveToCommand::moveContactTo( KABC::Resource *resource )
+void MoveToCommand::moveContactTo( TDEABC::Resource *resource )
{
KABLock::self( addressBook() )->lock( resource );
TQStringList::Iterator it( mUIDList.begin() );
const TQStringList::Iterator endIt( mUIDList.end() );
while ( it != endIt ) {
- KABC::Addressee addr = addressBook()->findByUid( *it++ );
+ TDEABC::Addressee addr = addressBook()->findByUid( *it++ );
if ( !addr.isEmpty() ) {
- KABC::Addressee newAddr( addr );
+ TDEABC::Addressee newAddr( addr );
// We need to set a new uid, otherwise the insert below is
// ignored. This is bad for syncing, but unavoidable, afaiks
TQString uid = TDEApplication::randomString( 10 );
diff --git a/kaddressbook/undocmds.h b/kaddressbook/undocmds.h
index b9915f150..91d881842 100644
--- a/kaddressbook/undocmds.h
+++ b/kaddressbook/undocmds.h
@@ -45,27 +45,27 @@ class Core;
class Command : public KCommand
{
public:
- Command( KABC::AddressBook *addressBook ) { mAddressBook = addressBook; }
+ Command( TDEABC::AddressBook *addressBook ) { mAddressBook = addressBook; }
protected:
- KABC::AddressBook *addressBook() const { return mAddressBook; }
+ TDEABC::AddressBook *addressBook() const { return mAddressBook; }
KABLock *lock() const { return KABLock::self( mAddressBook ); }
- bool resourceExist( KABC::Resource *resource );
+ bool resourceExist( TDEABC::Resource *resource );
private:
- KABC::AddressBook* mAddressBook;
+ TDEABC::AddressBook* mAddressBook;
};
class DeleteCommand : public Command
{
public:
- DeleteCommand( KABC::AddressBook *addressBook, const TQStringList &uidList );
+ DeleteCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList );
virtual TQString name() const;
virtual void unexecute();
virtual void execute();
private:
- KABC::Addressee::List mAddresseeList;
+ TDEABC::Addressee::List mAddresseeList;
TQStringList mUIDList;
};
@@ -73,28 +73,28 @@ class PasteCommand : public Command
{
public:
PasteCommand( KAB::Core *core,
- const KABC::Addressee::List &addressees );
+ const TDEABC::Addressee::List &addressees );
virtual TQString name() const;
virtual void unexecute();
virtual void execute();
private:
- KABC::Addressee::List mAddresseeList;
+ TDEABC::Addressee::List mAddresseeList;
KAB::Core *mCore;
};
class CutCommand : public Command
{
public:
- CutCommand( KABC::AddressBook *addressBook, const TQStringList &uidList );
+ CutCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList );
virtual TQString name() const;
virtual void unexecute();
virtual void execute();
private:
- KABC::Addressee::List mAddresseeList;
+ TDEABC::Addressee::List mAddresseeList;
TQStringList mUIDList;
#if defined(KABC_VCARD_ENCODING_FIX)
TQByteArray mClipText;
@@ -107,63 +107,63 @@ class CutCommand : public Command
class NewCommand : public Command
{
public:
- NewCommand( KABC::AddressBook *addressBook,
- const KABC::Addressee::List &addressees );
+ NewCommand( TDEABC::AddressBook *addressBook,
+ const TDEABC::Addressee::List &addressees );
virtual TQString name() const;
virtual void unexecute();
virtual void execute();
private:
- KABC::Addressee::List mAddresseeList;
+ TDEABC::Addressee::List mAddresseeList;
};
class EditCommand : public Command
{
public:
- EditCommand( KABC::AddressBook *addressBook, const KABC::Addressee &oldAddressee,
- const KABC::Addressee &newAddressee );
+ EditCommand( TDEABC::AddressBook *addressBook, const TDEABC::Addressee &oldAddressee,
+ const TDEABC::Addressee &newAddressee );
virtual TQString name() const;
virtual void unexecute();
virtual void execute();
private:
- KABC::Addressee mOldAddressee;
- KABC::Addressee mNewAddressee;
+ TDEABC::Addressee mOldAddressee;
+ TDEABC::Addressee mNewAddressee;
};
class CopyToCommand : public Command
{
public:
- CopyToCommand( KABC::AddressBook *addressBook, const TQStringList &uidList,
- KABC::Resource *resource );
+ CopyToCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList,
+ TDEABC::Resource *resource );
virtual TQString name() const;
virtual void unexecute();
virtual void execute();
private:
- KABC::Addressee::List mAddresseeList;
+ TDEABC::Addressee::List mAddresseeList;
TQStringList mUIDList;
- KABC::Resource *mResource;
+ TDEABC::Resource *mResource;
};
class MoveToCommand : public Command
{
public:
MoveToCommand( KAB::Core *core, const TQStringList &uidList,
- KABC::Resource *resource );
+ TDEABC::Resource *resource );
virtual TQString name() const;
virtual void unexecute();
virtual void execute();
- void moveContactTo( KABC::Resource *resource );
+ void moveContactTo( TDEABC::Resource *resource );
private:
- KABC::Addressee::List mAddresseeList;
+ TDEABC::Addressee::List mAddresseeList;
TQStringList mUIDList;
- KABC::Resource *mResource;
+ TDEABC::Resource *mResource;
KAB::Core *mCore;
};
#endif
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index cdfb28eab..828825fad 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -39,21 +39,21 @@
class FieldItem : public TQListBoxText
{
public:
- FieldItem( TQListBox *parent, KABC::Field *field )
+ FieldItem( TQListBox *parent, TDEABC::Field *field )
: TQListBoxText( parent, field->label() ), mField( field ) {}
- FieldItem( TQListBox *parent, KABC::Field *field, int index )
+ FieldItem( TQListBox *parent, TDEABC::Field *field, int index )
: TQListBoxText( parent, field->label(), parent->item( index ) ),
mField( field ) {}
- KABC::Field *field() { return mField; }
+ TDEABC::Field *field() { return mField; }
private:
- KABC::Field *mField;
+ TDEABC::Field *mField;
};
-ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab,
+ViewConfigureFieldsPage::ViewConfigureFieldsPage( TDEABC::AddressBook *ab,
TQWidget *parent,
const char *name )
: TQWidget( parent, name ), mAddressBook( ab )
@@ -63,12 +63,12 @@ ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab,
void ViewConfigureFieldsPage::restoreSettings( TDEConfig *config )
{
- KABC::Field::List fields = KABC::Field::restoreFields( config, "KABCFields" );
+ TDEABC::Field::List fields = TDEABC::Field::restoreFields( config, "KABCFields" );
if ( fields.isEmpty() )
- fields = KABC::Field::defaultFields();
+ fields = TDEABC::Field::defaultFields();
- KABC::Field::List::ConstIterator it;
+ TDEABC::Field::List::ConstIterator it;
for ( it = fields.begin(); it != fields.end(); ++it )
new FieldItem( mSelectedBox, *it );
@@ -77,14 +77,14 @@ void ViewConfigureFieldsPage::restoreSettings( TDEConfig *config )
void ViewConfigureFieldsPage::saveSettings( TDEConfig *config )
{
- KABC::Field::List fields;
+ TDEABC::Field::List fields;
for ( uint i = 0; i < mSelectedBox->count(); ++i ) {
FieldItem *fieldItem = static_cast<FieldItem *>( mSelectedBox->item( i ) );
fields.append( fieldItem->field() );
}
- KABC::Field::saveFields( config, "KABCFields", fields );
+ TDEABC::Field::saveFields( config, "KABCFields", fields );
}
void ViewConfigureFieldsPage::slotShowFields( int index )
@@ -93,12 +93,12 @@ void ViewConfigureFieldsPage::slotShowFields( int index )
mUnSelectedBox->clear();
int category;
- if ( index == 0 ) category = KABC::Field::All;
+ if ( index == 0 ) category = TDEABC::Field::All;
else category = 1 << ( index - 1 );
- KABC::Field::List allFields = mAddressBook->fields( category );
+ TDEABC::Field::List allFields = mAddressBook->fields( category );
- KABC::Field::List::ConstIterator it;
+ TDEABC::Field::List::ConstIterator it;
for ( it = allFields.begin(); it != allFields.end(); ++it ) {
TQListBoxItem *item = mSelectedBox->firstItem();
while( item ) {
@@ -207,13 +207,13 @@ void ViewConfigureFieldsPage::initGUI()
TQGridLayout *gl = new TQGridLayout( this , 6, 4, 0, KDialog::spacingHint() );
mCategoryCombo = new KComboBox( false, this );
- mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::All ) );
- mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Frequent ) );
- mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Address ) );
- mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Email ) );
- mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Personal ) );
- mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Organization ) );
- mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::CustomCategory ) );
+ mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::All ) );
+ mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Frequent ) );
+ mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Address ) );
+ mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Email ) );
+ mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Personal ) );
+ mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Organization ) );
+ mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::CustomCategory ) );
connect( mCategoryCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotShowFields(int) ) );
gl->addWidget( mCategoryCombo, 0, 0 );
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index cbafec5ae..9b66b1599 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -41,7 +41,7 @@ class ViewConfigureFieldsPage : public TQWidget
public:
- ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0,
+ ViewConfigureFieldsPage( TDEABC::AddressBook *ab, TQWidget *parent = 0,
const char *name = 0 );
void restoreSettings( TDEConfig* );
@@ -67,7 +67,7 @@ class ViewConfigureFieldsPage : public TQWidget
TQToolButton *mUpButton;
TQToolButton *mDownButton;
- KABC::AddressBook *mAddressBook;
+ TDEABC::AddressBook *mAddressBook;
};
#endif
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 105bd6857..cc60ce539 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -37,7 +37,7 @@
#include "viewconfigurewidget.h"
-ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent,
+ViewConfigureWidget::ViewConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent,
const char *name )
: KAB::ConfigureWidget( ab, parent, name )
{
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index c13f0fab9..839078e66 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -51,7 +51,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
public:
- ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ ViewConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
virtual ~ViewConfigureWidget();
/**
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 4a4f601ad..8b2113678 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -126,14 +126,14 @@ TQStringList ViewManager::selectedEmails() const
return TQStringList();
}
-KABC::Addressee::List ViewManager::selectedAddressees() const
+TDEABC::Addressee::List ViewManager::selectedAddressees() const
{
- KABC::Addressee::List list;
+ TDEABC::Addressee::List list;
const TQStringList uids = selectedUids();
TQStringList::ConstIterator it;
for ( it = uids.begin(); it != uids.end(); ++it ) {
- KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
+ TDEABC::Addressee addr = mCore->addressBook()->findByUid( *it );
if ( !addr.isEmpty() )
list.append( addr );
}
@@ -146,7 +146,7 @@ void ViewManager::setFilterSelectionWidget( FilterSelectionWidget *wdg )
mFilterSelectionWidget = wdg;
}
-KABC::Field *ViewManager::currentSortField() const
+TDEABC::Field *ViewManager::currentSortField() const
{
if ( mActiveView )
return mActiveView->sortField();
@@ -154,14 +154,14 @@ KABC::Field *ViewManager::currentSortField() const
return 0;
}
-KABC::Field::List ViewManager::viewFields() const
+TDEABC::Field::List ViewManager::viewFields() const
{
/*
if ( mActiveView )
return mActiveView->fields();
else
*/
- return KABC::Field::List();
+ return TDEABC::Field::List();
}
void ViewManager::setSelected( const TQString &uid, bool selected )
@@ -419,7 +419,7 @@ void ViewManager::dropped( TQDropEvent *e )
if ( e->source() == this )
return;
- KABC::Addressee::List list;
+ TDEABC::Addressee::List list;
KURL::List urls;
if ( KURLDrag::decode( e, urls) ) {
@@ -434,9 +434,9 @@ void ViewManager::dropped( TQDropEvent *e )
} else if ( c == 1 )
emit urlDropped( *it );
} else if ( KVCardDrag::decode( e, list ) ) {
- KABC::Addressee::List::ConstIterator it;
+ TDEABC::Addressee::List::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
- KABC::Addressee a = mCore->addressBook()->findByUid( (*it).uid() );
+ TDEABC::Addressee a = mCore->addressBook()->findByUid( (*it).uid() );
if ( a.isEmpty() ) { // not yet in address book
mCore->addressBook()->insertAddressee( *it );
emit modified();
@@ -450,7 +450,7 @@ void ViewManager::dropped( TQDropEvent *e )
void ViewManager::startDrag()
{
// Get the list of all the selected addressees
- KABC::Addressee::List addrList;
+ TDEABC::Addressee::List addrList;
const TQStringList uidList = selectedUids();
if ( uidList.isEmpty() )
return;
@@ -463,7 +463,7 @@ void ViewManager::startDrag()
KMultipleDrag *drag = new KMultipleDrag( this );
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
#if defined(KABC_VCARD_ENCODING_FIX)
TQCString vcards = converter.createVCardsRaw( addrList );
#else
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index d248a6baa..9820607e0 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -37,7 +37,7 @@ class TDESelectAction;
class FilterSelectionWidget;
namespace KAB { class Core; }
-namespace KABC { class AddressBook; }
+namespace TDEABC { class AddressBook; }
/**
The view manager manages the views and everything related to them. The
@@ -63,12 +63,12 @@ class ViewManager : public TQWidget
TQStringList selectedUids() const;
TQStringList selectedEmails() const;
- KABC::Addressee::List selectedAddressees() const;
+ TDEABC::Addressee::List selectedAddressees() const;
void setFilterSelectionWidget( FilterSelectionWidget *wdg );
- KABC::Field *currentSortField() const;
- KABC::Field::List viewFields() const;
+ TDEABC::Field *currentSortField() const;
+ TDEABC::Field::List viewFields() const;
public slots:
void setSelected( const TQString &uid = TQString(), bool selected = true );
diff --git a/kaddressbook/views/Makefile.am b/kaddressbook/views/Makefile.am
index 7b8cf31c0..37440a445 100644
--- a/kaddressbook/views/Makefile.am
+++ b/kaddressbook/views/Makefile.am
@@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
configurecardviewdialog.cpp \
kaddressbookcardview.cpp
libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC)
+libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC)
libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC)
+libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC)
libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
contactlistview.cpp \
kaddressbooktableview.cpp
libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY)
+libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) $(LIB_KIO) $(LIB_KIMPROXY)
noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
configuretableviewdialog.h contactlistview.h \
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index a386743c9..35d0b50c4 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -47,7 +47,7 @@
/////////////////////////////////
// ConfigureCardViewDialog
-ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent,
+ConfigureCardViewWidget::ConfigureCardViewWidget( TDEABC::AddressBook *ab, TQWidget *parent,
const char *name )
: ViewConfigureWidget( ab, parent, name )
{
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 892532c5e..afb938a61 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -36,7 +36,7 @@ class TQCheckBox;
class TQLabel;
class TDEConfig;
-namespace KABC { class AddressBook; }
+namespace TDEABC { class AddressBook; }
class CardViewLookAndFeelPage;
@@ -48,7 +48,7 @@ class CardViewLookAndFeelPage;
class ConfigureCardViewWidget : public ViewConfigureWidget
{
public:
- ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
+ ConfigureCardViewWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name );
virtual ~ConfigureCardViewWidget();
virtual void restoreSettings( TDEConfig* );
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index f14a5c451..04044e4c8 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -40,7 +40,7 @@
#include "configuretableviewdialog.h"
-ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab,
+ConfigureTableViewWidget::ConfigureTableViewWidget( TDEABC::AddressBook *ab,
TQWidget *parent,
const char *name )
: ViewConfigureWidget( ab, parent, name )
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index 94fd2a687..fc38d0da5 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -33,7 +33,7 @@ class TQCheckBox;
class KURLRequester;
class TDEConfig;
-namespace KABC { class AddressBook; }
+namespace TDEABC { class AddressBook; }
class LookAndFeelPage;
@@ -45,7 +45,7 @@ class LookAndFeelPage;
class ConfigureTableViewWidget : public ViewConfigureWidget
{
public:
- ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
+ ConfigureTableViewWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name );
virtual ~ConfigureTableViewWidget();
virtual void restoreSettings( TDEConfig* );
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 0d7942f95..3a01974bc 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -78,7 +78,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
//kdDebug(5720) << "Tip rec: " << r.x() << "," << r.y() << "," << r.width()
// << "," << r.height() << endl;
- KABC::Addressee a = plvi->addressee();
+ TDEABC::Addressee a = plvi->addressee();
if (a.isEmpty())
return;
@@ -146,10 +146,10 @@ void DynamicTip::maybeTip( const TQPoint &pos )
///////////////////////////
// ContactListViewItem Methods
-ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
+ContactListViewItem::ContactListViewItem(const TDEABC::Addressee &a,
ContactListView *parent,
- KABC::AddressBook *doc,
- const KABC::Field::List &fields,
+ TDEABC::AddressBook *doc,
+ const TDEABC::Field::List &fields,
KIMProxy *proxy )
: TDEListViewItem(parent), mAddressee(a), mFields( fields ),
parentListView( parent ), mDocument(doc), mIMProxy( proxy )
@@ -235,9 +235,9 @@ void ContactListViewItem::refresh()
setPixmap( parentListView->imColumn(), TQPixmap() );
}
- KABC::Field::List::ConstIterator it;
+ TDEABC::Field::List::ConstIterator it;
for ( it = mFields.begin(); it != mFields.end(); ++it ) {
- if ( (*it)->label() == KABC::Addressee::birthdayLabel() ) {
+ if ( (*it)->label() == TDEABC::Addressee::birthdayLabel() ) {
TQDate date = mAddressee.birthday().date();
if ( date.isValid() )
setText( i++, TDEGlobal::locale()->formatDate( date, true ) );
@@ -257,7 +257,7 @@ void ContactListViewItem::setHasIM( bool hasIM )
// ContactListView
ContactListView::ContactListView(KAddressBookTableView *view,
- KABC::AddressBook* /* doc */,
+ TDEABC::AddressBook* /* doc */,
TQWidget *parent,
const char *name )
: TDEListView( parent, name ),
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index b893cc352..138830b60 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -56,9 +56,9 @@ class ContactListViewItem : public TDEListViewItem
{
public:
- ContactListViewItem(const KABC::Addressee &a, ContactListView* parent,
- KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy );
- const KABC::Addressee &addressee() const { return mAddressee; }
+ ContactListViewItem(const TDEABC::Addressee &a, ContactListView* parent,
+ TDEABC::AddressBook *doc, const TDEABC::Field::List &fields, KIMProxy *proxy );
+ const TDEABC::Addressee &addressee() const { return mAddressee; }
virtual void refresh();
virtual ContactListView* parent();
virtual TQString key ( int, bool ) const;
@@ -70,10 +70,10 @@ public:
int column, int width, int align );
private:
- KABC::Addressee mAddressee;
- KABC::Field::List mFields;
+ TDEABC::Addressee mAddressee;
+ TDEABC::Field::List mFields;
ContactListView *parentListView;
- KABC::AddressBook *mDocument;
+ TDEABC::AddressBook *mDocument;
KIMProxy *mIMProxy;
bool mHasIM;
};
@@ -89,7 +89,7 @@ class ContactListView : public TDEListView
public:
ContactListView(KAddressBookTableView *view,
- KABC::AddressBook *doc,
+ TDEABC::AddressBook *doc,
TQWidget *parent,
const char *name = 0L );
virtual ~ContactListView() {}
@@ -127,8 +127,8 @@ public:
/**
* Set the column index of the column used for instant messaging presence.
* This method is necessary because presence, unlike the other fields, is not
- * a KABC::Field, and cannot be handled using their methods.
- * TODO: make presence a KABC::Field post 3.3
+ * a TDEABC::Field, and cannot be handled using their methods.
+ * TODO: make presence a TDEABC::Field post 3.3
*/
void setIMColumn( int column );
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index f60d171a3..9c6b55e10 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -52,7 +52,7 @@ class CardViewFactory : public ViewFactory
TQString description() const { return i18n( "Rolodex style cards represent contacts." ); }
- ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent,
+ ViewConfigureWidget *configureWidget( TDEABC::AddressBook *ab, TQWidget *parent,
const char *name = 0 )
{
return new ConfigureCardViewWidget( ab, parent, name );
@@ -69,21 +69,21 @@ extern "C" {
class AddresseeCardViewItem : public CardViewItem
{
public:
- AddresseeCardViewItem( const KABC::Field::List &fields,
+ AddresseeCardViewItem( const TDEABC::Field::List &fields,
bool showEmptyFields,
- KABC::AddressBook *doc, const KABC::Addressee &addr,
+ TDEABC::AddressBook *doc, const TDEABC::Addressee &addr,
CardView *parent )
: CardViewItem( parent, addr.realName() ),
mFields( fields ), mShowEmptyFields( showEmptyFields ),
mDocument( doc ), mAddressee( addr )
{
if ( mFields.isEmpty() )
- mFields = KABC::Field::defaultFields();
+ mFields = TDEABC::Field::defaultFields();
refresh();
}
- const KABC::Addressee &addressee() const { return mAddressee; }
+ const TDEABC::Addressee &addressee() const { return mAddressee; }
void refresh()
{
@@ -92,8 +92,8 @@ class AddresseeCardViewItem : public CardViewItem
if ( !mAddressee.isEmpty() ) {
clearFields();
- KABC::Field::List::ConstIterator it( mFields.begin() );
- const KABC::Field::List::ConstIterator endIt( mFields.end() );
+ TDEABC::Field::List::ConstIterator it( mFields.begin() );
+ const TDEABC::Field::List::ConstIterator endIt( mFields.end() );
for ( ; it != endIt; ++it ) {
// insert empty fields or not? not doing so saves a bit of memory and CPU
// (during geometry calculations), but prevents having equally
@@ -109,10 +109,10 @@ class AddresseeCardViewItem : public CardViewItem
}
private:
- KABC::Field::List mFields;
+ TDEABC::Field::List mFields;
bool mShowEmptyFields;
- KABC::AddressBook *mDocument;
- KABC::Addressee mAddressee;
+ TDEABC::AddressBook *mDocument;
+ TDEABC::Addressee mAddressee;
};
@@ -172,10 +172,10 @@ KAddressBookCardView::~KAddressBookCardView()
{
}
-KABC::Field *KAddressBookCardView::sortField() const
+TDEABC::Field *KAddressBookCardView::sortField() const
{
// we have hardcoded sorting, so we have to return a hardcoded field :(
- return KABC::Field::allFields()[ 0 ];
+ return TDEABC::Field::allFields()[ 0 ];
}
void KAddressBookCardView::readConfig( TDEConfig *config )
@@ -271,9 +271,9 @@ void KAddressBookCardView::refresh( const TQString &uid )
mCardView->viewport()->setUpdatesEnabled( false );
mCardView->clear();
- const KABC::Addressee::List addresseeList( addressees() );
- KABC::Addressee::List::ConstIterator it( addresseeList.begin() );
- const KABC::Addressee::List::ConstIterator endIt( addresseeList.end() );
+ const TDEABC::Addressee::List addresseeList( addressees() );
+ TDEABC::Addressee::List::ConstIterator it( addresseeList.begin() );
+ const TDEABC::Addressee::List::ConstIterator endIt( addresseeList.end() );
for ( ; it != endIt; ++it ) {
aItem = new AddresseeCardViewItem( fields(), mShowEmptyFields,
core()->addressBook(), *it, mCardView );
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 90b738d53..15c77a7c9 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -52,7 +52,7 @@ class KAddressBookCardView : public KAddressBookView
virtual TQStringList selectedUids();
virtual TQString type() const { return "Card"; }
- virtual KABC::Field *sortField() const;
+ virtual TDEABC::Field *sortField() const;
virtual void readConfig( TDEConfig *config );
virtual void writeConfig( TDEConfig *config );
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index f88af5ffe..8b9780183 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -95,14 +95,14 @@ TQDragObject *AddresseeIconView::dragObject()
class AddresseeIconViewItem : public TDEIconViewItem
{
public:
- AddresseeIconViewItem( const KABC::Field::List&, KABC::AddressBook *doc,
- const KABC::Addressee &addr, TQIconView *parent )
+ AddresseeIconViewItem( const TDEABC::Field::List&, TDEABC::AddressBook *doc,
+ const TDEABC::Addressee &addr, TQIconView *parent )
: TDEIconViewItem( parent ), mDocument( doc ), mAddressee( addr )
{
refresh();
}
- const KABC::Addressee &addressee() const { return mAddressee; }
+ const TDEABC::Addressee &addressee() const { return mAddressee; }
void refresh()
{
@@ -113,7 +113,7 @@ class AddresseeIconViewItem : public TDEIconViewItem
TQPixmap icon;
TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) );
- KABC::Picture pic = mAddressee.photo();
+ TDEABC::Picture pic = mAddressee.photo();
if ( pic.data().isNull() )
pic = mAddressee.logo();
@@ -130,8 +130,8 @@ class AddresseeIconViewItem : public TDEIconViewItem
}
private:
- KABC::AddressBook *mDocument;
- KABC::Addressee mAddressee;
+ TDEABC::AddressBook *mDocument;
+ TDEABC::Addressee mAddressee;
};
@@ -161,10 +161,10 @@ KAddressBookIconView::~KAddressBookIconView()
{
}
-KABC::Field *KAddressBookIconView::sortField() const
+TDEABC::Field *KAddressBookIconView::sortField() const
{
// we have hardcoded sorting, so we have to return a hardcoded field :(
- return KABC::Field::allFields()[ 2 ];
+ return TDEABC::Field::allFields()[ 2 ];
}
void KAddressBookIconView::readConfig( TDEConfig *config )
@@ -209,9 +209,9 @@ void KAddressBookIconView::refresh( const TQString &uid )
mIconView->clear();
mIconList.clear();
- const KABC::Addressee::List addresseeList( addressees() );
- KABC::Addressee::List::ConstIterator it( addresseeList.begin() );
- const KABC::Addressee::List::ConstIterator endIt( addresseeList.end() );
+ const TDEABC::Addressee::List addresseeList( addressees() );
+ TDEABC::Addressee::List::ConstIterator it( addresseeList.begin() );
+ const TDEABC::Addressee::List::ConstIterator endIt( addresseeList.end() );
for ( ; it != endIt; ++it )
aItem = new AddresseeIconViewItem( fields(), core()->addressBook(), *it, mIconView );
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index 4cf585b35..feb9edf3c 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -33,7 +33,7 @@ class TDEConfig;
class AddresseeIconView;
class AddresseeIconViewItem;
-namespace KABC { class AddressBook; }
+namespace TDEABC { class AddressBook; }
/** This is an example kaddressbook view that is implemented using
* TDEIconView. This view is not the most useful view, but it displays
@@ -51,7 +51,7 @@ class KAddressBookIconView : public KAddressBookView
virtual TQStringList selectedUids();
virtual TQString type() const { return "Icon"; }
- virtual KABC::Field *sortField() const;
+ virtual TDEABC::Field *sortField() const;
virtual void readConfig( TDEConfig *config );
void scrollUp();
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 6d8d0c971..ad39eb644 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -71,7 +71,7 @@ class TableViewFactory : public ViewFactory
TQString description() const { return i18n( "A listing of contacts in a table. Each cell of "
"the table holds a field of the contact." ); }
- ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent,
+ ViewConfigureWidget *configureWidget( TDEABC::AddressBook *ab, TQWidget *parent,
const char *name = 0 )
{
return new ConfigureTableViewWidget( ab, parent, name );
@@ -121,8 +121,8 @@ void KAddressBookTableView::reconstructListView()
mListView->setShowIM( mIMProxy != 0 );
// Add the columns
- const KABC::Field::List fieldList( fields() );
- KABC::Field::List::ConstIterator it;
+ const TDEABC::Field::List fieldList( fields() );
+ TDEABC::Field::List::ConstIterator it;
int c = 0;
for ( it = fieldList.begin(); it != fieldList.end(); ++it ) {
@@ -167,7 +167,7 @@ void KAddressBookTableView::reconstructListView()
mListView->show();
}
-KABC::Field *KAddressBookTableView::sortField() const
+TDEABC::Field *KAddressBookTableView::sortField() const
{
// we have hardcoded sorting, so we have to return a hardcoded field :(
return ( mListView->sortColumn() == -1 ? fields()[ 0 ] : fields()[ mListView->sortColumn() ] );
@@ -230,9 +230,9 @@ void KAddressBookTableView::refresh( const TQString &uid )
mListView->clear();
currentItem = 0;
- const KABC::Addressee::List addresseeList( addressees() );
- KABC::Addressee::List::ConstIterator it( addresseeList.begin() );
- const KABC::Addressee::List::ConstIterator endIt( addresseeList.end() );
+ const TDEABC::Addressee::List addresseeList( addressees() );
+ TDEABC::Addressee::List::ConstIterator it( addresseeList.begin() );
+ const TDEABC::Addressee::List::ConstIterator endIt( addresseeList.end() );
for ( ; it != endIt; ++it ) {
ContactListViewItem *item = new ContactListViewItem( *it, mListView,
core()->addressBook(), fields(), mIMProxy );
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index acbfb08d4..7d258d2a7 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -47,7 +47,7 @@ class KIMProxy;
class ContactListViewItem;
class ContactListView;
-namespace KABC { class AddressBook; }
+namespace TDEABC { class AddressBook; }
/**
* This class is the table view for kaddressbook. This view is a TDEListView
@@ -73,7 +73,7 @@ friend class ContactListView;
virtual TQStringList selectedUids();
virtual void setSelected( const TQString &uid = TQString(), bool selected = false );
virtual void setFirstSelected( bool selected = true );
- virtual KABC::Field *sortField() const;
+ virtual TDEABC::Field *sortField() const;
virtual void readConfig( TDEConfig *config );
virtual void writeConfig( TDEConfig *config );
diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am
index bdf1e86f5..ecf0372c4 100644
--- a/kaddressbook/xxport/Makefile.am
+++ b/kaddressbook/xxport/Makefile.am
@@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
$(top_builddir)/libtdepim/libtdepim.la
libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
-libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
-libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) \
+libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) \
$(top_builddir)/kaddressbook/libkaddressbook.la \
$(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la
libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
-libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
-libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
-libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
-libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
-libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
-libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
-libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO)
+libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
noinst_HEADERS = csvimportdialog.h
diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp
index 62357a599..39c709b3e 100644
--- a/kaddressbook/xxport/bookmark_xxport.cpp
+++ b/kaddressbook/xxport/bookmark_xxport.cpp
@@ -33,13 +33,13 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_bookmark_xxport, BookmarkXXPort )
-BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+BookmarkXXPort::BookmarkXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::XXPort( ab, parent, name )
{
createExportAction( i18n( "Export Bookmarks Menu..." ) );
}
-bool BookmarkXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& )
+bool BookmarkXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString& )
{
TQString fileName = locateLocal( "data", "tdeabc/bookmarks.xml" );
@@ -47,7 +47,7 @@ bool BookmarkXXPort::exportContacts( const KABC::AddresseeList &list, const TQSt
KBookmarkDomBuilder *builder = new KBookmarkDomBuilder( mgr->root(), mgr );
builder->connectImporter( this );
- KABC::AddresseeList::ConstIterator it;
+ TDEABC::AddresseeList::ConstIterator it;
emit newFolder( i18n( "AddressBook" ), false, "" );
for ( it = list.begin(); it != list.end(); ++it ) {
if ( !(*it).url().isEmpty() ) {
diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h
index 3c74dc68c..fde6fe4dc 100644
--- a/kaddressbook/xxport/bookmark_xxport.h
+++ b/kaddressbook/xxport/bookmark_xxport.h
@@ -33,12 +33,12 @@ class BookmarkXXPort : public KAB::XXPort
public:
- BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ BookmarkXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "bookmark"; }
public slots:
- bool exportContacts( const KABC::AddresseeList &list, const TQString &data );
+ bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data );
signals:
/**
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 20ed9aac7..a0a85ab27 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -36,14 +36,14 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_csv_xxport, CSVXXPort )
-CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+CSVXXPort::CSVXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import CSV List..." ) );
createExportAction( i18n( "Export CSV List..." ) );
}
-bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& )
+bool CSVXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString& )
{
KURL url = KFileDialog::getSaveURL( "addressbook.csv" );
if ( url.isEmpty() )
@@ -84,23 +84,23 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString&
}
}
-KABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const
{
CSVImportDialog dlg( addressBook(), parentWidget() );
if ( dlg.exec() )
return dlg.contacts();
else
- return KABC::AddresseeList();
+ return TDEABC::AddresseeList();
}
-void CSVXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
+void CSVXXPort::doExport( TQFile *fp, const TDEABC::AddresseeList &list )
{
TQTextStream t( fp );
t.setEncoding( TQTextStream::Locale );
- KABC::AddresseeList::ConstIterator iter;
- KABC::Field::List fields = addressBook()->fields();
- KABC::Field::List::Iterator fieldIter;
+ TDEABC::AddresseeList::ConstIterator iter;
+ TDEABC::Field::List fields = addressBook()->fields();
+ TDEABC::Field::List::Iterator fieldIter;
bool first = true;
// First output the column headings
@@ -114,7 +114,7 @@ void CSVXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
t << "\n";
// Then all the addressee objects
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
for ( iter = list.begin(); iter != list.end(); ++iter ) {
addr = *iter;
first = true;
diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h
index c7bea01b5..f0a28fdec 100644
--- a/kaddressbook/xxport/csv_xxport.h
+++ b/kaddressbook/xxport/csv_xxport.h
@@ -32,16 +32,16 @@ class CSVXXPort : public KAB::XXPort
public:
- CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ CSVXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "csv"; }
public slots:
- bool exportContacts( const KABC::AddresseeList &list, const TQString &data );
- KABC::AddresseeList importContacts( const TQString &data ) const;
+ bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data );
+ TDEABC::AddresseeList importContacts( const TQString &data ) const;
private:
- void doExport( TQFile *fp, const KABC::AddresseeList &list );
+ void doExport( TQFile *fp, const TDEABC::AddresseeList &list );
};
#endif
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 93635d25a..091d277f9 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -50,7 +50,7 @@
enum { Local = 0, Guess = 1, Latin1 = 2, Uni = 3, MSBug = 4, Codec = 5 };
-CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
+CSVImportDialog::CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent,
const char * name )
: KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 |
User2, Ok, parent, name, true, true ),
@@ -63,59 +63,59 @@ CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
initGUI();
mTypeMap.insert( i18n( "Undefined" ), Undefined );
- mTypeMap.insert( KABC::Addressee::formattedNameLabel(), FormattedName );
- mTypeMap.insert( KABC::Addressee::familyNameLabel(), FamilyName );
- mTypeMap.insert( KABC::Addressee::givenNameLabel(), GivenName );
- mTypeMap.insert( KABC::Addressee::additionalNameLabel(), AdditionalName );
- mTypeMap.insert( KABC::Addressee::prefixLabel(), Prefix );
- mTypeMap.insert( KABC::Addressee::suffixLabel(), Suffix );
- mTypeMap.insert( KABC::Addressee::nickNameLabel(), NickName );
- mTypeMap.insert( KABC::Addressee::birthdayLabel(), Birthday );
-
- mTypeMap.insert( KABC::Addressee::homeAddressStreetLabel(), HomeAddressStreet );
- mTypeMap.insert( KABC::Addressee::homeAddressLocalityLabel(),
+ mTypeMap.insert( TDEABC::Addressee::formattedNameLabel(), FormattedName );
+ mTypeMap.insert( TDEABC::Addressee::familyNameLabel(), FamilyName );
+ mTypeMap.insert( TDEABC::Addressee::givenNameLabel(), GivenName );
+ mTypeMap.insert( TDEABC::Addressee::additionalNameLabel(), AdditionalName );
+ mTypeMap.insert( TDEABC::Addressee::prefixLabel(), Prefix );
+ mTypeMap.insert( TDEABC::Addressee::suffixLabel(), Suffix );
+ mTypeMap.insert( TDEABC::Addressee::nickNameLabel(), NickName );
+ mTypeMap.insert( TDEABC::Addressee::birthdayLabel(), Birthday );
+
+ mTypeMap.insert( TDEABC::Addressee::homeAddressStreetLabel(), HomeAddressStreet );
+ mTypeMap.insert( TDEABC::Addressee::homeAddressLocalityLabel(),
HomeAddressLocality );
- mTypeMap.insert( KABC::Addressee::homeAddressRegionLabel(), HomeAddressRegion );
- mTypeMap.insert( KABC::Addressee::homeAddressPostalCodeLabel(),
+ mTypeMap.insert( TDEABC::Addressee::homeAddressRegionLabel(), HomeAddressRegion );
+ mTypeMap.insert( TDEABC::Addressee::homeAddressPostalCodeLabel(),
HomeAddressPostalCode );
- mTypeMap.insert( KABC::Addressee::homeAddressCountryLabel(),
+ mTypeMap.insert( TDEABC::Addressee::homeAddressCountryLabel(),
HomeAddressCountry );
- mTypeMap.insert( KABC::Addressee::homeAddressLabelLabel(), HomeAddressLabel );
+ mTypeMap.insert( TDEABC::Addressee::homeAddressLabelLabel(), HomeAddressLabel );
- mTypeMap.insert( KABC::Addressee::businessAddressStreetLabel(),
+ mTypeMap.insert( TDEABC::Addressee::businessAddressStreetLabel(),
BusinessAddressStreet );
- mTypeMap.insert( KABC::Addressee::businessAddressLocalityLabel(),
+ mTypeMap.insert( TDEABC::Addressee::businessAddressLocalityLabel(),
BusinessAddressLocality );
- mTypeMap.insert( KABC::Addressee::businessAddressRegionLabel(),
+ mTypeMap.insert( TDEABC::Addressee::businessAddressRegionLabel(),
BusinessAddressRegion );
- mTypeMap.insert( KABC::Addressee::businessAddressPostalCodeLabel(),
+ mTypeMap.insert( TDEABC::Addressee::businessAddressPostalCodeLabel(),
BusinessAddressPostalCode );
- mTypeMap.insert( KABC::Addressee::businessAddressCountryLabel(),
+ mTypeMap.insert( TDEABC::Addressee::businessAddressCountryLabel(),
BusinessAddressCountry );
- mTypeMap.insert( KABC::Addressee::businessAddressLabelLabel(),
+ mTypeMap.insert( TDEABC::Addressee::businessAddressLabelLabel(),
BusinessAddressLabel );
- mTypeMap.insert( KABC::Addressee::homePhoneLabel(), HomePhone );
- mTypeMap.insert( KABC::Addressee::businessPhoneLabel(), BusinessPhone );
- mTypeMap.insert( KABC::Addressee::mobilePhoneLabel(), MobilePhone );
- mTypeMap.insert( KABC::Addressee::homeFaxLabel(), HomeFax );
- mTypeMap.insert( KABC::Addressee::businessFaxLabel(), BusinessFax );
- mTypeMap.insert( KABC::Addressee::carPhoneLabel(), CarPhone );
- mTypeMap.insert( KABC::Addressee::isdnLabel(), Isdn );
- mTypeMap.insert( KABC::Addressee::pagerLabel(), Pager );
- mTypeMap.insert( KABC::Addressee::emailLabel(), Email );
- mTypeMap.insert( KABC::Addressee::mailerLabel(), Mailer );
- mTypeMap.insert( KABC::Addressee::titleLabel(), Title );
- mTypeMap.insert( KABC::Addressee::roleLabel(), Role );
- mTypeMap.insert( KABC::Addressee::organizationLabel(), Organization );
- mTypeMap.insert( KABC::Addressee::noteLabel(), Note );
- mTypeMap.insert( KABC::Addressee::urlLabel(), URL );
+ mTypeMap.insert( TDEABC::Addressee::homePhoneLabel(), HomePhone );
+ mTypeMap.insert( TDEABC::Addressee::businessPhoneLabel(), BusinessPhone );
+ mTypeMap.insert( TDEABC::Addressee::mobilePhoneLabel(), MobilePhone );
+ mTypeMap.insert( TDEABC::Addressee::homeFaxLabel(), HomeFax );
+ mTypeMap.insert( TDEABC::Addressee::businessFaxLabel(), BusinessFax );
+ mTypeMap.insert( TDEABC::Addressee::carPhoneLabel(), CarPhone );
+ mTypeMap.insert( TDEABC::Addressee::isdnLabel(), Isdn );
+ mTypeMap.insert( TDEABC::Addressee::pagerLabel(), Pager );
+ mTypeMap.insert( TDEABC::Addressee::emailLabel(), Email );
+ mTypeMap.insert( TDEABC::Addressee::mailerLabel(), Mailer );
+ mTypeMap.insert( TDEABC::Addressee::titleLabel(), Title );
+ mTypeMap.insert( TDEABC::Addressee::roleLabel(), Role );
+ mTypeMap.insert( TDEABC::Addressee::organizationLabel(), Organization );
+ mTypeMap.insert( TDEABC::Addressee::noteLabel(), Note );
+ mTypeMap.insert( TDEABC::Addressee::urlLabel(), URL );
mCustomCounter = mTypeMap.count();
int count = mCustomCounter;
- KABC::Field::List fields = mAddressBook->fields( KABC::Field::CustomCategory );
- KABC::Field::List::Iterator it;
+ TDEABC::Field::List fields = mAddressBook->fields( TDEABC::Field::CustomCategory );
+ TDEABC::Field::List::Iterator it;
for ( it = fields.begin(); it != fields.end(); ++it, ++count )
mTypeMap.insert( (*it)->label(), count );
@@ -155,10 +155,10 @@ CSVImportDialog::~CSVImportDialog()
mCodecs.clear();
}
-KABC::AddresseeList CSVImportDialog::contacts() const
+TDEABC::AddresseeList CSVImportDialog::contacts() const
{
DateParser dateParser( mDatePatternEdit->text() );
- KABC::AddresseeList contacts;
+ TDEABC::AddresseeList contacts;
KProgressDialog progressDialog( mPage );
progressDialog.setAutoClose( true );
@@ -169,10 +169,10 @@ KABC::AddresseeList CSVImportDialog::contacts() const
kapp->processEvents();
for ( int row = 1; row < mTable->numRows(); ++row ) {
- KABC::Addressee a;
+ TDEABC::Addressee a;
bool emptyRow = true;
- KABC::Address addrHome( KABC::Address::Home );
- KABC::Address addrWork( KABC::Address::Work );
+ TDEABC::Address addrHome( TDEABC::Address::Home );
+ TDEABC::Address addrWork( TDEABC::Address::Work );
for ( int col = 0; col < mTable->numCols(); ++col ) {
TQComboTableItem *item = static_cast<TQComboTableItem*>( mTable->item( 0,
col ) );
@@ -242,51 +242,51 @@ KABC::AddresseeList CSVImportDialog::contacts() const
case HomePhone:
if ( !value.isEmpty() ) {
- KABC::PhoneNumber number( value, KABC::PhoneNumber::Home );
+ TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Home );
a.insertPhoneNumber( number );
}
break;
case BusinessPhone:
if ( !value.isEmpty() ) {
- KABC::PhoneNumber number( value, KABC::PhoneNumber::Work );
+ TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Work );
a.insertPhoneNumber( number );
}
break;
case MobilePhone:
if ( !value.isEmpty() ) {
- KABC::PhoneNumber number( value, KABC::PhoneNumber::Cell );
+ TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Cell );
a.insertPhoneNumber( number );
}
break;
case HomeFax:
if ( !value.isEmpty() ) {
- KABC::PhoneNumber number( value, KABC::PhoneNumber::Home |
- KABC::PhoneNumber::Fax );
+ TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Home |
+ TDEABC::PhoneNumber::Fax );
a.insertPhoneNumber( number );
}
break;
case BusinessFax:
if ( !value.isEmpty() ) {
- KABC::PhoneNumber number( value, KABC::PhoneNumber::Work |
- KABC::PhoneNumber::Fax );
+ TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Work |
+ TDEABC::PhoneNumber::Fax );
a.insertPhoneNumber( number );
}
break;
case CarPhone:
if ( !value.isEmpty() ) {
- KABC::PhoneNumber number( value, KABC::PhoneNumber::Car );
+ TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Car );
a.insertPhoneNumber( number );
}
break;
case Isdn:
if ( !value.isEmpty() ) {
- KABC::PhoneNumber number( value, KABC::PhoneNumber::Isdn );
+ TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Isdn );
a.insertPhoneNumber( number );
}
break;
case Pager:
if ( !value.isEmpty() ) {
- KABC::PhoneNumber number( value, KABC::PhoneNumber::Pager );
+ TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Pager );
a.insertPhoneNumber( number );
}
break;
@@ -329,8 +329,8 @@ KABC::AddresseeList CSVImportDialog::contacts() const
addrWork.setLabel( value );
break;
default:
- KABC::Field::List fields = mAddressBook->fields( KABC::Field::CustomCategory );
- KABC::Field::List::Iterator it;
+ TDEABC::Field::List fields = mAddressBook->fields( TDEABC::Field::CustomCategory );
+ TDEABC::Field::List::Iterator it;
int counter = 0;
for ( it = fields.begin(); it != fields.end(); ++it ) {
@@ -347,7 +347,7 @@ KABC::AddresseeList CSVImportDialog::contacts() const
kapp->processEvents();
if ( progressDialog.wasCancelled() )
- return KABC::AddresseeList();
+ return TDEABC::AddresseeList();
progressDialog.progressBar()->advance( 1 );
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index b6b89d7ec..da91c019a 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -44,11 +44,11 @@ class CSVImportDialog : public KDialogBase
public:
- CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,
+ CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent,
const char *name = 0 );
~CSVImportDialog();
- KABC::AddresseeList contacts() const;
+ TDEABC::AddresseeList contacts() const;
protected slots:
virtual void slotOk();
@@ -116,7 +116,7 @@ class CSVImportDialog : public KDialogBase
TQString mDelimiter;
TQByteArray mFileArray;
TQMap<TQString, uint> mTypeMap;
- KABC::AddressBook *mAddressBook;
+ TDEABC::AddressBook *mAddressBook;
int mCustomCounter;
bool mClearTypeStore;
TQValueList<int> mTypeStore;
diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp
index 75f2ea24d..f310cb598 100644
--- a/kaddressbook/xxport/eudora_xxport.cpp
+++ b/kaddressbook/xxport/eudora_xxport.cpp
@@ -38,29 +38,29 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_eudora_xxport, EudoraXXPort )
-EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+EudoraXXPort::EudoraXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import Eudora Addressbook..." ) );
}
-KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const
{
TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(),
"*.[tT][xX][tT]|" + i18n("Eudora Light Addressbook (*.txt)"), 0 );
if ( fileName.isEmpty() )
- return KABC::AddresseeList();
+ return TDEABC::AddresseeList();
TQFile file( fileName );
if ( !file.open( IO_ReadOnly ) )
- return KABC::AddresseeList();
+ return TDEABC::AddresseeList();
TQString line;
TQTextStream stream( &file );
- KABC::Addressee *a = 0;
+ TDEABC::Addressee *a = 0;
int bytesRead = 0;
- KABC::AddresseeList list;
+ TDEABC::AddresseeList list;
while( !stream.eof() ) {
line = stream.readLine();
@@ -72,9 +72,9 @@ KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const
list << *a;
delete a;
a = 0;
- a = new KABC::Addressee();
+ a = new TDEABC::Addressee();
} else
- a = new KABC::Addressee();
+ a = new TDEABC::Addressee();
tmp = key( line ).stripWhiteSpace();
if ( !tmp.isEmpty() )
@@ -97,7 +97,7 @@ KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const
tmp = get( line, "address" ).stripWhiteSpace();
if ( !tmp.isEmpty() ) {
- KABC::Address addr;
+ TDEABC::Address addr;
kdDebug(5720) << tmp << endl; // dump complete address
addr.setLabel( tmp );
a->insertAddress( addr );
@@ -105,7 +105,7 @@ KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const
tmp = get( line, "phone" ).stripWhiteSpace();
if ( !tmp.isEmpty() )
- a->insertPhoneNumber( KABC::PhoneNumber( tmp, KABC::PhoneNumber::Home ) );
+ a->insertPhoneNumber( TDEABC::PhoneNumber( tmp, TDEABC::PhoneNumber::Home ) );
}
}
diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h
index b1b6ebf8e..b6b346022 100644
--- a/kaddressbook/xxport/eudora_xxport.h
+++ b/kaddressbook/xxport/eudora_xxport.h
@@ -32,12 +32,12 @@ class EudoraXXPort : public KAB::XXPort
public:
- EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ EudoraXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "eudora"; }
public slots:
- KABC::AddresseeList importContacts( const TQString &data ) const;
+ TDEABC::AddresseeList importContacts( const TQString &data ) const;
private:
TQString get( const TQString& line, const TQString& key ) const;
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 306fbe808..5755784af 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -77,7 +77,7 @@ static KProgressDialog *m_progressDlg;
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_gnokii_xxport, GNOKIIXXPort )
-GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+GNOKIIXXPort::GNOKIIXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::XXPort( ab, parent, name )
{
this_filter = this;
@@ -187,7 +187,7 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat )
// read and evaluate all phone entries
static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memtype,
- KABC::AddresseeList *addrList )
+ TDEABC::AddresseeList *addrList )
{
gn_error error;
@@ -204,7 +204,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
error = read_phone_memstat(memtype, &memstat);
TQStringList addrlist;
- KABC::Address *addr;
+ TDEABC::Address *addr;
TQString s, country;
progress->setTotalSteps(memstat.used);
@@ -237,7 +237,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
.arg(GN_FROM(name)).arg(GN_FROM(number))
.arg(gn_lib_get_pb_location(state)).arg(gn_lib_get_pb_caller_group(state))
.arg(subentries_count));
- KABC::Addressee *a = new KABC::Addressee();
+ TDEABC::Addressee *a = new TDEABC::Addressee();
// try to split Name into FamilyName and GivenName
s = GN_FROM(name).simplifyWhiteSpace();
@@ -280,8 +280,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
a->setRevision(datetime);
if (!subentries_count)
- a->insertPhoneNumber(KABC::PhoneNumber(number,
- KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref));
+ a->insertPhoneNumber(TDEABC::PhoneNumber(number,
+ TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Pref));
/* scan sub-entries */
if (subentries_count)
@@ -307,7 +307,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
break;
case GN_PHONEBOOK_ENTRY_Postal:
addrlist = TQStringList::split(';', s, true);
- addr = new KABC::Address(KABC::Address::Work);
+ addr = new TDEABC::Address(TDEABC::Address::Work);
if (addrlist.count() <= 1) {
addrlist = TQStringList::split(',', s, true);
if (addrlist.count() > 1 ) {
@@ -341,18 +341,18 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
a->setNote(a->note()+s);
break;
case GN_PHONEBOOK_ENTRY_Number:
- enum KABC::PhoneNumber::Types phonetype;
+ enum TDEABC::PhoneNumber::Types phonetype;
switch (number_type) {
- case GN_PHONEBOOK_NUMBER_Mobile: phonetype = KABC::PhoneNumber::Cell; break;
- case GN_PHONEBOOK_NUMBER_Fax: phonetype = KABC::PhoneNumber::Fax; break;
+ case GN_PHONEBOOK_NUMBER_Mobile: phonetype = TDEABC::PhoneNumber::Cell; break;
+ case GN_PHONEBOOK_NUMBER_Fax: phonetype = TDEABC::PhoneNumber::Fax; break;
case GN_PHONEBOOK_NUMBER_General:
- case GN_PHONEBOOK_NUMBER_Work: phonetype = KABC::PhoneNumber::Work; break;
+ case GN_PHONEBOOK_NUMBER_Work: phonetype = TDEABC::PhoneNumber::Work; break;
default:
- case GN_PHONEBOOK_NUMBER_Home: phonetype = KABC::PhoneNumber::Home; break;
+ case GN_PHONEBOOK_NUMBER_Home: phonetype = TDEABC::PhoneNumber::Home; break;
}
//if (s == entry.number)
- // type = (KABC::PhoneNumber::Types) (phonetype | KABC::PhoneNumber::Pref);
- a->insertPhoneNumber(KABC::PhoneNumber(s, phonetype));
+ // type = (TDEABC::PhoneNumber::Types) (phonetype | TDEABC::PhoneNumber::Pref);
+ a->insertPhoneNumber(TDEABC::PhoneNumber(s, phonetype));
break;
case GN_PHONEBOOK_ENTRY_URL:
a->setUrl(s);
@@ -388,7 +388,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
// export to phone
static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type memtype,
- const KABC::Addressee *addr)
+ const TDEABC::Addressee *addr)
{
TQString s;
@@ -398,13 +398,13 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
gn_lib_set_pb_location(state, phone_location);
gn_lib_set_pb_name(state, GN_TO(addr->realName()));
- s = addr->phoneNumber(KABC::PhoneNumber::Pref).number();
+ s = addr->phoneNumber(TDEABC::PhoneNumber::Pref).number();
if (s.isEmpty())
- s = addr->phoneNumber(KABC::PhoneNumber::Work).number();
+ s = addr->phoneNumber(TDEABC::PhoneNumber::Work).number();
if (s.isEmpty())
- s = addr->phoneNumber(KABC::PhoneNumber::Home).number();
+ s = addr->phoneNumber(TDEABC::PhoneNumber::Home).number();
if (s.isEmpty())
- s = addr->phoneNumber(KABC::PhoneNumber::Cell).number();
+ s = addr->phoneNumber(TDEABC::PhoneNumber::Cell).number();
if (s.isEmpty() && addr->phoneNumbers().count()>0)
s = (*addr->phoneNumbers().at(0)).number();
s = makeValidPhone(s);
@@ -428,25 +428,25 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location)
.arg(GN_FROM(gn_lib_get_pb_name(state))).arg(GN_FROM(gn_lib_get_pb_number(state))));
- const KABC::Address homeAddr = addr->address(KABC::Address::Home);
- const KABC::Address workAddr = addr->address(KABC::Address::Work);
+ const TDEABC::Address homeAddr = addr->address(TDEABC::Address::Home);
+ const TDEABC::Address workAddr = addr->address(TDEABC::Address::Work);
// add all phone numbers
- const KABC::PhoneNumber::List phoneList = addr->phoneNumbers();
- KABC::PhoneNumber::List::ConstIterator it;
+ const TDEABC::PhoneNumber::List phoneList = addr->phoneNumbers();
+ TDEABC::PhoneNumber::List::ConstIterator it;
for ( it = phoneList.begin(); it != phoneList.end(); ++it ) {
- const KABC::PhoneNumber *phonenumber = &(*it);
+ const TDEABC::PhoneNumber *phonenumber = &(*it);
s = phonenumber->number();
if (s.isEmpty()) continue;
gn_phonebook_number_type type;
int pn_type = phonenumber->type();
- if ((pn_type & KABC::PhoneNumber::Cell))
+ if ((pn_type & TDEABC::PhoneNumber::Cell))
type = GN_PHONEBOOK_NUMBER_Mobile;
- else if ((pn_type & KABC::PhoneNumber::Fax))
+ else if ((pn_type & TDEABC::PhoneNumber::Fax))
type = GN_PHONEBOOK_NUMBER_Fax;
- else if ((pn_type & KABC::PhoneNumber::Home))
+ else if ((pn_type & TDEABC::PhoneNumber::Home))
type = GN_PHONEBOOK_NUMBER_Home;
- else if ((pn_type & KABC::PhoneNumber::Work))
+ else if ((pn_type & TDEABC::PhoneNumber::Work))
type = GN_PHONEBOOK_NUMBER_Work;
else type = GN_PHONEBOOK_NUMBER_General;
gn_lib_set_pb_subentry(state, -1 /* index to append entry */,
@@ -474,10 +474,10 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
GN_PHONEBOOK_ENTRY_Email, GN_PHONEBOOK_NUMBER_General, GN_TO(s));
}
// add Adresses
- const KABC::Address::List addresses = addr->addresses();
- KABC::Address::List::ConstIterator it2;
+ const TDEABC::Address::List addresses = addr->addresses();
+ TDEABC::Address::List::ConstIterator it2;
for ( it2 = addresses.begin(); it2 != addresses.end(); ++it2 ) {
- const KABC::Address *Addr = &(*it2);
+ const TDEABC::Address *Addr = &(*it2);
if (Addr->isEmpty()) continue;
TQStringList a;
TQChar sem(';');
@@ -524,9 +524,9 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me
}
-KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
{
- KABC::AddresseeList addrList;
+ TDEABC::AddresseeList addrList;
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
i18n("<qt>Please connect your Mobile Phone to your computer and press "
@@ -573,7 +573,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
}
-bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
+bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString & )
{
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
i18n("<qt>Please connect your Mobile Phone to your computer and press "
@@ -597,7 +597,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
KProgress* progress = (KProgress*)m_progressDlg->progressBar();
- KABC::AddresseeList::ConstIterator it;
+ TDEABC::AddresseeList::ConstIterator it;
TQStringList failedList;
gn_error error;
@@ -663,7 +663,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
// Now run the loop...
phone_entry_no = 1;
for ( it = list.begin(); it != list.end(); ++it ) {
- const KABC::Addressee *addr = &(*it);
+ const TDEABC::Addressee *addr = &(*it);
if (addr->isEmpty())
continue;
// don't write back SIM-card entries !
@@ -966,7 +966,7 @@ static TQString buildMemoryTypeString( gn_memory_type memtype )
// read and evaluate all phone entries
static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memtype,
- KABC::AddresseeList *addrList )
+ TDEABC::AddresseeList *addrList )
{
gn_error error;
@@ -984,7 +984,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
gn_phonebook_entry entry;
TQStringList addrlist;
- KABC::Address *addr;
+ TDEABC::Address *addr;
TQString s, country;
progress->setTotalSteps(memstat.used);
@@ -1010,7 +1010,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
if (error == GN_ERR_NONE) {
GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i).arg(GN_FROM(entry.name))
.arg(GN_FROM(entry.number)).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count));
- KABC::Addressee *a = new KABC::Addressee();
+ TDEABC::Addressee *a = new TDEABC::Addressee();
// try to split Name into FamilyName and GivenName
s = GN_FROM(entry.name).simplifyWhiteSpace();
@@ -1052,7 +1052,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
a->setRevision(datetime);
if (!entry.subentries_count)
- a->insertPhoneNumber(KABC::PhoneNumber(entry.number, KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref));
+ a->insertPhoneNumber(TDEABC::PhoneNumber(entry.number, TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Pref));
/* scan sub-entries */
if (entry.subentries_count)
@@ -1072,7 +1072,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
break;
case GN_PHONEBOOK_ENTRY_Postal:
addrlist = TQStringList::split(';', s, true);
- addr = new KABC::Address(KABC::Address::Work);
+ addr = new TDEABC::Address(TDEABC::Address::Work);
if (addrlist.count() <= 1) {
addrlist = TQStringList::split(',', s, true);
if (addrlist.count() > 1 ) {
@@ -1106,18 +1106,18 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
a->setNote(a->note()+s);
break;
case GN_PHONEBOOK_ENTRY_Number:
- enum KABC::PhoneNumber::Types phonetype;
+ enum TDEABC::PhoneNumber::Types phonetype;
switch (entry.subentries[n].number_type) {
- case GN_PHONEBOOK_NUMBER_Mobile: phonetype = KABC::PhoneNumber::Cell; break;
- case GN_PHONEBOOK_NUMBER_Fax: phonetype = KABC::PhoneNumber::Fax; break;
+ case GN_PHONEBOOK_NUMBER_Mobile: phonetype = TDEABC::PhoneNumber::Cell; break;
+ case GN_PHONEBOOK_NUMBER_Fax: phonetype = TDEABC::PhoneNumber::Fax; break;
case GN_PHONEBOOK_NUMBER_General:
- case GN_PHONEBOOK_NUMBER_Work: phonetype = KABC::PhoneNumber::Work; break;
+ case GN_PHONEBOOK_NUMBER_Work: phonetype = TDEABC::PhoneNumber::Work; break;
default:
- case GN_PHONEBOOK_NUMBER_Home: phonetype = KABC::PhoneNumber::Home; break;
+ case GN_PHONEBOOK_NUMBER_Home: phonetype = TDEABC::PhoneNumber::Home; break;
}
//if (s == entry.number)
- // type = (KABC::PhoneNumber::Types) (phonetype | KABC::PhoneNumber::Pref);
- a->insertPhoneNumber(KABC::PhoneNumber(s, phonetype));
+ // type = (TDEABC::PhoneNumber::Types) (phonetype | TDEABC::PhoneNumber::Pref);
+ a->insertPhoneNumber(TDEABC::PhoneNumber(s, phonetype));
break;
case GN_PHONEBOOK_ENTRY_URL:
a->setUrl(s);
@@ -1154,20 +1154,20 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty
// export to phone
static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type memtype,
- const KABC::Addressee *addr)
+ const TDEABC::Addressee *addr)
{
gn_phonebook_entry entry;
TQString s;
memset(&entry, 0, sizeof(entry));
strncpy(entry.name, GN_TO(addr->realName()), sizeof(entry.name)-1);
- s = addr->phoneNumber(KABC::PhoneNumber::Pref).number();
+ s = addr->phoneNumber(TDEABC::PhoneNumber::Pref).number();
if (s.isEmpty())
- s = addr->phoneNumber(KABC::PhoneNumber::Work).number();
+ s = addr->phoneNumber(TDEABC::PhoneNumber::Work).number();
if (s.isEmpty())
- s = addr->phoneNumber(KABC::PhoneNumber::Home).number();
+ s = addr->phoneNumber(TDEABC::PhoneNumber::Home).number();
if (s.isEmpty())
- s = addr->phoneNumber(KABC::PhoneNumber::Cell).number();
+ s = addr->phoneNumber(TDEABC::PhoneNumber::Cell).number();
if (s.isEmpty() && addr->phoneNumbers().count()>0)
s = (*addr->phoneNumbers().at(0)).number();
s = makeValidPhone(s);
@@ -1194,28 +1194,28 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location)
.arg(GN_FROM(entry.name)).arg(GN_FROM(entry.number)));
- const KABC::Address homeAddr = addr->address(KABC::Address::Home);
- const KABC::Address workAddr = addr->address(KABC::Address::Work);
+ const TDEABC::Address homeAddr = addr->address(TDEABC::Address::Home);
+ const TDEABC::Address workAddr = addr->address(TDEABC::Address::Work);
entry.subentries_count = 0;
gn_phonebook_subentry *subentry = &entry.subentries[0];
// add all phone numbers
- const KABC::PhoneNumber::List phoneList = addr->phoneNumbers();
- KABC::PhoneNumber::List::ConstIterator it;
+ const TDEABC::PhoneNumber::List phoneList = addr->phoneNumbers();
+ TDEABC::PhoneNumber::List::ConstIterator it;
for ( it = phoneList.begin(); it != phoneList.end(); ++it ) {
- const KABC::PhoneNumber *phonenumber = &(*it);
+ const TDEABC::PhoneNumber *phonenumber = &(*it);
s = phonenumber->number();
if (s.isEmpty()) continue;
subentry->entry_type = GN_PHONEBOOK_ENTRY_Number;
gn_phonebook_number_type type;
int pn_type = phonenumber->type();
- if ((pn_type & KABC::PhoneNumber::Cell))
+ if ((pn_type & TDEABC::PhoneNumber::Cell))
type = GN_PHONEBOOK_NUMBER_Mobile;
- else if ((pn_type & KABC::PhoneNumber::Fax))
+ else if ((pn_type & TDEABC::PhoneNumber::Fax))
type = GN_PHONEBOOK_NUMBER_Fax;
- else if ((pn_type & KABC::PhoneNumber::Home))
+ else if ((pn_type & TDEABC::PhoneNumber::Home))
type = GN_PHONEBOOK_NUMBER_Home;
- else if ((pn_type & KABC::PhoneNumber::Work))
+ else if ((pn_type & TDEABC::PhoneNumber::Work))
type = GN_PHONEBOOK_NUMBER_Work;
else type = GN_PHONEBOOK_NUMBER_General;
subentry->number_type = type;
@@ -1253,12 +1253,12 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem
subentry++;
}
// add Adresses
- const KABC::Address::List addresses = addr->addresses();
- KABC::Address::List::ConstIterator it2;
+ const TDEABC::Address::List addresses = addr->addresses();
+ TDEABC::Address::List::ConstIterator it2;
for ( it2 = addresses.begin(); it2 != addresses.end(); ++it2 ) {
if (entry.subentries_count >= GN_PHONEBOOK_SUBENTRIES_MAX_NUMBER)
break; // Phonebook full
- const KABC::Address *Addr = &(*it2);
+ const TDEABC::Address *Addr = &(*it2);
if (Addr->isEmpty()) continue;
subentry->entry_type = GN_PHONEBOOK_ENTRY_Postal;
TQStringList a;
@@ -1315,9 +1315,9 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me
return error;
}
-KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
{
- KABC::AddresseeList addrList;
+ TDEABC::AddresseeList addrList;
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
i18n("<qt>Please connect your Mobile Phone to your computer and press "
@@ -1364,7 +1364,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
}
-bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
+bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString & )
{
if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(),
i18n("<qt>Please connect your Mobile Phone to your computer and press "
@@ -1388,7 +1388,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
KProgress* progress = (KProgress*)m_progressDlg->progressBar();
- KABC::AddresseeList::ConstIterator it;
+ TDEABC::AddresseeList::ConstIterator it;
TQStringList failedList;
gn_error error;
@@ -1454,7 +1454,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri
// Now run the loop...
phone_entry_no = 1;
for ( it = list.begin(); it != list.end(); ++it ) {
- const KABC::Addressee *addr = &(*it);
+ const TDEABC::Addressee *addr = &(*it);
if (addr->isEmpty())
continue;
// don't write back SIM-card entries !
@@ -1572,15 +1572,15 @@ finish:
#else /* no gnokii installed */
-KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const
{
- KABC::AddresseeList addrList;
+ TDEABC::AddresseeList addrList;
KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n"
"Please ask your distributor to add gnokii at compile time."));
return addrList;
}
-bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & )
+bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString & )
{
Q_UNUSED(list);
KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n"
diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h
index 898d1600f..b41aace12 100644
--- a/kaddressbook/xxport/gnokii_xxport.h
+++ b/kaddressbook/xxport/gnokii_xxport.h
@@ -32,13 +32,13 @@ class GNOKIIXXPort : public KAB::XXPort
public:
- GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ GNOKIIXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "gnokii"; }
public slots:
- bool exportContacts( const KABC::AddresseeList &list, const TQString &data );
- KABC::AddresseeList importContacts( const TQString &data ) const;
+ bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data );
+ TDEABC::AddresseeList importContacts( const TQString &data ) const;
};
#endif
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 730de8237..58ae2afdf 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -39,25 +39,25 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_kde2_xxport, KDE2XXPort )
-KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+KDE2XXPort::KDE2XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import KDE 2 Addressbook..." ) );
}
-KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
{
TQString fileName = locateLocal( "data", "tdeabc/std.vcf" );
if ( !TQFile::exists( fileName ) ) {
KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) );
- return KABC::AddresseeList();
+ return TDEABC::AddresseeList();
}
int result = KMessageBox::questionYesNoCancel( parentWidget(),
i18n( "Override previously imported entries?" ),
i18n( "Import KDE 2 Addressbook" ), i18n("Import"), i18n("Do Not Import") );
- if ( !result ) return KABC::AddresseeList();
+ if ( !result ) return TDEABC::AddresseeList();
TDEProcess proc;
@@ -68,13 +68,13 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
proc << "tdeab2tdeabc";
else {
kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl;
- return KABC::AddresseeList();
+ return TDEABC::AddresseeList();
}
proc.start( TDEProcess::Block );
addressBook()->load();
- return KABC::AddresseeList();
+ return TDEABC::AddresseeList();
}
#include "kde2_xxport.moc"
diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h
index b66440df5..694b0b1ba 100644
--- a/kaddressbook/xxport/kde2_xxport.h
+++ b/kaddressbook/xxport/kde2_xxport.h
@@ -32,12 +32,12 @@ class KDE2XXPort : public KAB::XXPort
public:
- KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ KDE2XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "kde2"; }
public slots:
- KABC::AddresseeList importContacts( const TQString &data ) const;
+ TDEABC::AddresseeList importContacts( const TQString &data ) const;
};
#endif
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 31d3c2936..8a68c481a 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -50,7 +50,7 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_ldif_xxport, LDIFXXPort )
-LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+LDIFXXPort::LDIFXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import LDIF Addressbook..." ) );
@@ -59,9 +59,9 @@ LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *nam
/* import */
-KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
{
- KABC::AddresseeList addrList;
+ TDEABC::AddresseeList addrList;
TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(),
"text/x-ldif", 0 );
@@ -81,7 +81,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
TQDateTime dtDefault = TQFileInfo(file).lastModified();
file.close();
- KABC::LDIFConverter::LDIFToAddressee( wholeFile, addrList, dtDefault );
+ TDEABC::LDIFConverter::LDIFToAddressee( wholeFile, addrList, dtDefault );
return addrList;
}
@@ -89,7 +89,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const
/* export */
-bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& )
+bool LDIFXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString& )
{
KURL url = KFileDialog::getSaveURL( TQDir::homeDirPath() + "/addressbook.ldif",
"text/x-ldif" );
@@ -132,10 +132,10 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString
}
}
-void LDIFXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list )
+void LDIFXXPort::doExport( TQFile *fp, const TDEABC::AddresseeList &list )
{
TQString str;
- KABC::LDIFConverter::addresseeToLDIF( list, str );
+ TDEABC::LDIFConverter::addresseeToLDIF( list, str );
TQTextStream t( fp );
t.setEncoding( TQTextStream::UnicodeUTF8 );
diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h
index 06c3c9155..1e8282a83 100644
--- a/kaddressbook/xxport/ldif_xxport.h
+++ b/kaddressbook/xxport/ldif_xxport.h
@@ -33,16 +33,16 @@ class LDIFXXPort : public KAB::XXPort
public:
- LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ LDIFXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "ldif"; }
public slots:
- bool exportContacts( const KABC::AddresseeList &list, const TQString &data );
- KABC::AddresseeList importContacts( const TQString &data ) const;
+ bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data );
+ TDEABC::AddresseeList importContacts( const TQString &data ) const;
private:
- void doExport( TQFile *fp, const KABC::AddresseeList &list );
+ void doExport( TQFile *fp, const TDEABC::AddresseeList &list );
};
#endif
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index 0a4ac4886..0332d9acc 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -38,15 +38,15 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_opera_xxport, OperaXXPort )
-OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+OperaXXPort::OperaXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import Opera Addressbook..." ) );
}
-KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
{
- KABC::AddresseeList addrList;
+ TDEABC::AddresseeList addrList;
TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) );
if ( fileName.isEmpty() )
@@ -63,7 +63,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
stream.setEncoding( TQTextStream::UnicodeUTF8 );
TQString line, key, value;
bool parseContact = false;
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
TQRegExp separator( "\x02\x02" );
@@ -72,13 +72,13 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
line = line.stripWhiteSpace();
if ( line == TQString::fromLatin1( "#CONTACT" ) ) {
parseContact = true;
- addr = KABC::Addressee();
+ addr = TDEABC::Addressee();
continue;
} else if ( line.isEmpty() ) {
parseContact = false;
if ( !addr.isEmpty() ) {
addrList.append( addr );
- addr = KABC::Addressee();
+ addr = TDEABC::Addressee();
}
continue;
}
@@ -99,12 +99,12 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
preferred = false;
}
} else if ( key == TQString::fromLatin1( "phone" ) )
- addr.insertPhoneNumber( KABC::PhoneNumber( value ) );
+ addr.insertPhoneNumber( TDEABC::PhoneNumber( value ) );
else if ( key == TQString::fromLatin1( "fax" ) )
- addr.insertPhoneNumber( KABC::PhoneNumber( value,
- KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) );
+ addr.insertPhoneNumber( TDEABC::PhoneNumber( value,
+ TDEABC::PhoneNumber::Fax | TDEABC::PhoneNumber::Home ) );
else if ( key == TQString::fromLatin1( "postaladdress" ) ) {
- KABC::Address address( KABC::Address::Home );
+ TDEABC::Address address( TDEABC::Address::Home );
address.setLabel( value.replace( separator, "\n" ) );
addr.insertAddress( address );
} else if ( key == TQString::fromLatin1( "description" ) )
@@ -112,7 +112,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const
else if ( key == TQString::fromLatin1( "url" ) )
addr.setUrl( KURL( value ) );
else if ( key == TQString::fromLatin1( "pictureurl" ) ) {
- KABC::Picture pic( value );
+ TDEABC::Picture pic( value );
addr.setPhoto( pic );
}
}
diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h
index 730e4972d..ce0a33ec4 100644
--- a/kaddressbook/xxport/opera_xxport.h
+++ b/kaddressbook/xxport/opera_xxport.h
@@ -33,12 +33,12 @@ class OperaXXPort : public KAB::XXPort
public:
- OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ OperaXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "opera"; }
public slots:
- KABC::AddresseeList importContacts( const TQString &data ) const;
+ TDEABC::AddresseeList importContacts( const TQString &data ) const;
};
#endif
diff --git a/kaddressbook/xxport/pab_mapihd.cpp b/kaddressbook/xxport/pab_mapihd.cpp
index 6d61cb339..9f1879b87 100644
--- a/kaddressbook/xxport/pab_mapihd.cpp
+++ b/kaddressbook/xxport/pab_mapihd.cpp
@@ -286,8 +286,8 @@ content_t pabfields_t::order(int k)
return tags[k].order();
}
-KABC::Addressee pabfields_t::get() {
- KABC::Addressee a;
+TDEABC::Addressee pabfields_t::get() {
+ TDEABC::Addressee a;
if (!givenName.isEmpty()) a.setFormattedName(givenName);
if (!email.isEmpty()) a.insertEmail(email);
if (!title.isEmpty()) a.setTitle(title);
@@ -295,7 +295,7 @@ KABC::Addressee pabfields_t::get() {
if (!additionalName.isEmpty()) a.setAdditionalName(additionalName);
if (!lastName.isEmpty()) a.setFamilyName(lastName);
- KABC::Address addr;
+ TDEABC::Address addr;
if (!address.isEmpty()) addr.setStreet(address);
if (!town.isEmpty()) addr.setLocality(town);
if (!zip.isEmpty()) addr.setPostalCode(zip);
@@ -306,10 +306,10 @@ KABC::Addressee pabfields_t::get() {
if (!organization.isEmpty()) a.setOrganization(organization);
if (!department.isEmpty()) a.setRole(department);
// Miss out department, subDep, job
- if (!tel.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( tel, KABC::PhoneNumber::Voice ) );
- if (!fax.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( fax, KABC::PhoneNumber::Fax ) );
- if (!mobile.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( mobile, KABC::PhoneNumber::Cell ) );
- if (!modem.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( modem, KABC::PhoneNumber::Modem ) );
+ if (!tel.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( tel, TDEABC::PhoneNumber::Voice ) );
+ if (!fax.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( fax, TDEABC::PhoneNumber::Fax ) );
+ if (!mobile.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( mobile, TDEABC::PhoneNumber::Cell ) );
+ if (!modem.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( modem, TDEABC::PhoneNumber::Modem ) );
if (!homepage.isEmpty()) a.setUrl(KURL( homepage ));
// Miss out talk
if (!comment.isEmpty()) a.setNote(comment);
diff --git a/kaddressbook/xxport/pab_mapihd.h b/kaddressbook/xxport/pab_mapihd.h
index c54be4500..2df9953cc 100644
--- a/kaddressbook/xxport/pab_mapihd.h
+++ b/kaddressbook/xxport/pab_mapihd.h
@@ -107,7 +107,7 @@
public:
pabfields_t(pabrec & R, TQWidget *parent);
public:
- KABC::Addressee get( );
+ TDEABC::Addressee get( );
bool isOK(void) { return OK; }
bool isUsable(void) { return givenName!=""; }
};
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index 894adf3d5..21070acfb 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -40,15 +40,15 @@
K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_pab_xxport, PABXXPort )
-PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+PABXXPort::PABXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::XXPort( ab, parent, name )
{
createImportAction( i18n("Import MS Exchange Personal Address Book (.PAB)") );
}
-KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList PABXXPort::importContacts( const TQString& ) const
{
- KABC::AddresseeList addrList;
+ TDEABC::AddresseeList addrList;
TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(),
"*.[pP][aA][bB]|" + i18n("MS Exchange Personal Address Book Files (*.pab)"), 0 );
diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h
index 04395f416..796894a06 100644
--- a/kaddressbook/xxport/pab_xxport.h
+++ b/kaddressbook/xxport/pab_xxport.h
@@ -33,15 +33,15 @@ class PABXXPort : public KAB::XXPort
public:
- PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ PABXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "pab"; }
public slots:
- KABC::AddresseeList importContacts( const TQString &data ) const;
+ TDEABC::AddresseeList importContacts( const TQString &data ) const;
private:
- void doExport( TQFile *fp, const KABC::AddresseeList &list );
+ void doExport( TQFile *fp, const TDEABC::AddresseeList &list );
};
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index b12779cbb..293879cc5 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -55,10 +55,10 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_vcard_xxport, VCardXXPort )
class VCardViewerDialog : public KDialogBase
{
public:
- VCardViewerDialog( const KABC::Addressee::List &list,
+ VCardViewerDialog( const TDEABC::Addressee::List &list,
TQWidget *parent, const char *name = 0 );
- KABC::Addressee::List contacts() const;
+ TDEABC::Addressee::List contacts() const;
protected:
void slotUser1();
@@ -71,8 +71,8 @@ class VCardViewerDialog : public KDialogBase
KPIM::AddresseeView *mView;
- KABC::Addressee::List mContacts;
- KABC::Addressee::List::Iterator mIt;
+ TDEABC::Addressee::List mContacts;
+ TDEABC::Addressee::List::Iterator mIt;
};
class VCardExportSelectionDialog : public KDialogBase
@@ -93,7 +93,7 @@ class VCardExportSelectionDialog : public KDialogBase
TQCheckBox *mEncryptionKeys;
};
-VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name )
+VCardXXPort::VCardXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name )
: KAB::XXPort( ab, parent, name )
{
createImportAction( i18n( "Import vCard..." ) );
@@ -101,11 +101,11 @@ VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *n
createExportAction( i18n( "Export vCard 3.0..." ), "v30" );
}
-bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQString &data )
+bool VCardXXPort::exportContacts( const TDEABC::AddresseeList &addrList, const TQString &data )
{
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
KURL url;
- KABC::AddresseeList list;
+ TDEABC::AddresseeList list;
list = filterContacts( addrList );
@@ -119,13 +119,13 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
if ( data == "v21" )
#if defined(KABC_VCARD_ENCODING_FIX)
- ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v2_1 ) );
+ ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v2_1 ) );
else
- ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 ) );
+ ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v3_0 ) );
#else
- ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v2_1 ) );
+ ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v2_1 ) );
else
- ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v3_0 ) );
+ ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v3_0 ) );
#endif
} else {
TQString msg = i18n( "You have selected a list of contacts, shall they be "
@@ -137,7 +137,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
if ( baseUrl.isEmpty() )
return true;
- KABC::AddresseeList::ConstIterator it;
+ TDEABC::AddresseeList::ConstIterator it;
uint counter = 0;
for ( it = list.begin(); it != list.end(); ++it ) {
TQString testUrl;
@@ -153,18 +153,18 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
url = testUrl + ".vcf";
bool tmpOk;
- KABC::AddresseeList tmpList;
+ TDEABC::AddresseeList tmpList;
tmpList.append( *it );
if ( data == "v21" )
#if defined(KABC_VCARD_ENCODING_FIX)
- tmpOk = doExport( url, converter.createVCardsRaw( tmpList, KABC::VCardConverter::v2_1 ) );
+ tmpOk = doExport( url, converter.createVCardsRaw( tmpList, TDEABC::VCardConverter::v2_1 ) );
else
- tmpOk = doExport( url, converter.createVCardsRaw( tmpList, KABC::VCardConverter::v3_0 ) );
+ tmpOk = doExport( url, converter.createVCardsRaw( tmpList, TDEABC::VCardConverter::v3_0 ) );
#else
- tmpOk = doExport( url, converter.createVCards( tmpList, KABC::VCardConverter::v2_1 ) );
+ tmpOk = doExport( url, converter.createVCards( tmpList, TDEABC::VCardConverter::v2_1 ) );
else
- tmpOk = doExport( url, converter.createVCards( tmpList, KABC::VCardConverter::v3_0 ) );
+ tmpOk = doExport( url, converter.createVCards( tmpList, TDEABC::VCardConverter::v3_0 ) );
#endif
ok = ok && tmpOk;
}
@@ -178,13 +178,13 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
if ( data == "v21" )
#if defined(KABC_VCARD_ENCODING_FIX)
- ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v2_1 ) );
+ ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v2_1 ) );
else
- ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 ) );
+ ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v3_0 ) );
#else
- ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v2_1 ) );
+ ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v2_1 ) );
else
- ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v3_0 ) );
+ ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v3_0 ) );
#endif
}
}
@@ -193,10 +193,10 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS
return ok;
}
-KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
+TDEABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
{
TQString fileName;
- KABC::AddresseeList addrList;
+ TDEABC::AddresseeList addrList;
KURL::List urls;
if ( !XXPortManager::importData.isEmpty() ) {
@@ -283,9 +283,9 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const
}
#if defined(KABC_VCARD_ENCODING_FIX)
-KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const
+TDEABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const
{
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
return converter.parseVCardsRaw( data.data() );
}
@@ -305,9 +305,9 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data )
return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
}
#else
-KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
+TDEABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const
{
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
return converter.parseVCards( data );
}
@@ -331,9 +331,9 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data )
}
#endif
-KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addrList )
+TDEABC::AddresseeList VCardXXPort::filterContacts( const TDEABC::AddresseeList &addrList )
{
- KABC::AddresseeList list;
+ TDEABC::AddresseeList list;
if ( addrList.isEmpty() )
return addrList;
@@ -342,9 +342,9 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
if ( !dlg.exec() )
return list;
- KABC::AddresseeList::ConstIterator it;
+ TDEABC::AddresseeList::ConstIterator it;
for ( it = addrList.begin(); it != addrList.end(); ++it ) {
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
addr.setUid( (*it).uid() );
addr.setFormattedName( (*it).formattedName() );
@@ -378,38 +378,38 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
addr.setLogo( (*it).logo() );
- KABC::PhoneNumber::List phones = (*it).phoneNumbers( KABC::PhoneNumber::Work );
- KABC::PhoneNumber::List::Iterator phoneIt;
+ TDEABC::PhoneNumber::List phones = (*it).phoneNumbers( TDEABC::PhoneNumber::Work );
+ TDEABC::PhoneNumber::List::Iterator phoneIt;
for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt )
addr.insertPhoneNumber( *phoneIt );
- KABC::Address::List addresses = (*it).addresses( KABC::Address::Work );
- KABC::Address::List::Iterator addrIt;
+ TDEABC::Address::List addresses = (*it).addresses( TDEABC::Address::Work );
+ TDEABC::Address::List::Iterator addrIt;
for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt )
addr.insertAddress( *addrIt );
}
- KABC::PhoneNumber::List phones = (*it).phoneNumbers();
- KABC::PhoneNumber::List::Iterator phoneIt;
+ TDEABC::PhoneNumber::List phones = (*it).phoneNumbers();
+ TDEABC::PhoneNumber::List::Iterator phoneIt;
for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) {
int type = (*phoneIt).type();
- if ( type & KABC::PhoneNumber::Home && dlg.exportPrivateFields() )
+ if ( type & TDEABC::PhoneNumber::Home && dlg.exportPrivateFields() )
addr.insertPhoneNumber( *phoneIt );
- else if ( type & KABC::PhoneNumber::Work && dlg.exportBusinessFields() )
+ else if ( type & TDEABC::PhoneNumber::Work && dlg.exportBusinessFields() )
addr.insertPhoneNumber( *phoneIt );
else if ( dlg.exportOtherFields() )
addr.insertPhoneNumber( *phoneIt );
}
- KABC::Address::List addresses = (*it).addresses();
- KABC::Address::List::Iterator addrIt;
+ TDEABC::Address::List addresses = (*it).addresses();
+ TDEABC::Address::List::Iterator addrIt;
for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) {
int type = (*addrIt).type();
- if ( type & KABC::Address::Home && dlg.exportPrivateFields() )
+ if ( type & TDEABC::Address::Home && dlg.exportPrivateFields() )
addr.insertAddress( *addrIt );
- else if ( type & KABC::Address::Work && dlg.exportBusinessFields() )
+ else if ( type & TDEABC::Address::Work && dlg.exportBusinessFields() )
addr.insertAddress( *addrIt );
else if ( dlg.exportOtherFields() )
addr.insertAddress( *addrIt );
@@ -419,8 +419,8 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
addr.setCustoms( (*it).customs() );
if ( dlg.exportEncryptionKeys() ) {
- addKey( addr, KABC::Key::PGP );
- addKey( addr, KABC::Key::X509 );
+ addKey( addr, TDEABC::Key::PGP );
+ addKey( addr, TDEABC::Key::X509 );
}
list.append( addr );
@@ -429,10 +429,10 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr
return list;
}
-void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type )
+void VCardXXPort::addKey( TDEABC::Addressee &addr, TDEABC::Key::Types type )
{
TQString fingerprint = addr.custom( "KADDRESSBOOK",
- (type == KABC::Key::PGP ? "OPENPGPFP" : "SMIMEFP") );
+ (type == TDEABC::Key::PGP ? "OPENPGPFP" : "SMIMEFP") );
if ( fingerprint.isEmpty() )
return;
@@ -455,7 +455,7 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type )
return;
}
- KABC::Key key;
+ TDEABC::Key key;
key.setType( type );
key.setBinaryData( dataProvider.data() );
@@ -464,7 +464,7 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type )
// ---------- VCardViewer Dialog ---------------- //
-VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list,
+VCardViewerDialog::VCardViewerDialog( const TDEABC::Addressee::List &list,
TQWidget *parent, const char *name )
: KDialogBase( Plain, i18n( "Import vCard" ), Yes | No | Apply | Cancel, Yes,
parent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ),
@@ -491,7 +491,7 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list,
updateView();
}
-KABC::Addressee::List VCardViewerDialog::contacts() const
+TDEABC::Addressee::List VCardViewerDialog::contacts() const
{
return mContacts;
}
@@ -500,7 +500,7 @@ void VCardViewerDialog::updateView()
{
mView->setAddressee( *mIt );
- KABC::Addressee::List::Iterator it = mIt;
+ TDEABC::Addressee::List::Iterator it = mIt;
actionButton( Apply )->setEnabled( (++it) != mContacts.end() );
}
diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h
index b4b03284f..c5f66f930 100644
--- a/kaddressbook/xxport/vcard_xxport.h
+++ b/kaddressbook/xxport/vcard_xxport.h
@@ -33,25 +33,25 @@ class VCardXXPort : public KAB::XXPort
public:
- VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
+ VCardXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
TQString identifier() const { return "vcard"; }
public slots:
- bool exportContacts( const KABC::AddresseeList &list, const TQString &data );
- KABC::AddresseeList importContacts( const TQString &data ) const;
+ bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data );
+ TDEABC::AddresseeList importContacts( const TQString &data ) const;
private:
#if defined(KABC_VCARD_ENCODING_FIX)
- KABC::AddresseeList parseVCard( const TQByteArray &data ) const;
+ TDEABC::AddresseeList parseVCard( const TQByteArray &data ) const;
bool doExport( const KURL &url, const TQByteArray &data );
#else
- KABC::AddresseeList parseVCard( const TQString &data ) const;
+ TDEABC::AddresseeList parseVCard( const TQString &data ) const;
bool doExport( const KURL &url, const TQString &data );
#endif
- void addKey( KABC::Addressee &addr, KABC::Key::Types type );
+ void addKey( TDEABC::Addressee &addr, TDEABC::Key::Types type );
- KABC::AddresseeList filterContacts( const KABC::AddresseeList& );
+ TDEABC::AddresseeList filterContacts( const TDEABC::AddresseeList& );
};
#endif
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 22d8a2d10..bdc48f6b6 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -81,12 +81,12 @@ void XXPortManager::slotImport( const TQString &identifier, const TQString &data
return;
}
- KABC::Resource *resource = mCore->requestResource( mCore->widget() );
+ TDEABC::Resource *resource = mCore->requestResource( mCore->widget() );
if ( !resource )
return;
- KABC::AddresseeList list = obj->importContacts( data );
- KABC::AddresseeList::Iterator it;
+ TDEABC::AddresseeList list = obj->importContacts( data );
+ TDEABC::AddresseeList::Iterator it;
for ( it = list.begin(); it != list.end(); ++it )
(*it).setResource( resource );
@@ -105,7 +105,7 @@ void XXPortManager::slotExport( const TQString &identifier, const TQString &data
return;
}
- KABC::AddresseeList addrList;
+ TDEABC::AddresseeList addrList;
XXPortSelectDialog dlg( mCore, obj->requiresSorting(), mCore->widget() );
if ( dlg.exec() )
addrList = dlg.contacts();
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 6c67c8ff5..b6849aaca 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -80,21 +80,21 @@ XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort,
mSortTypeCombo->insertItem( i18n( "Ascending" ) );
mSortTypeCombo->insertItem( i18n( "Descending" ) );
- mFields = mCore->addressBook()->fields( KABC::Field::All );
- KABC::Field::List::ConstIterator fieldIt;
+ mFields = mCore->addressBook()->fields( TDEABC::Field::All );
+ TDEABC::Field::List::ConstIterator fieldIt;
for ( fieldIt = mFields.begin(); fieldIt != mFields.end(); ++fieldIt )
mFieldCombo->insertItem( (*fieldIt)->label() );
}
-KABC::AddresseeList XXPortSelectDialog::contacts()
+TDEABC::AddresseeList XXPortSelectDialog::contacts()
{
const TQStringList selection = mCore->selectedUIDs();
- KABC::AddresseeList list;
+ TDEABC::AddresseeList list;
if ( mUseSelection->isChecked() ) {
TQStringList::ConstIterator it;
for ( it = selection.begin(); it != selection.end(); ++it ) {
- KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
+ TDEABC::Addressee addr = mCore->addressBook()->findByUid( *it );
if ( !addr.isEmpty() )
list.append( addr );
}
@@ -105,7 +105,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
if ( (*filterIt).name() == mFiltersCombo->currentText() )
break;
- KABC::AddressBook::Iterator it;
+ TDEABC::AddressBook::Iterator it;
for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it ) {
if ( (*filterIt).filterAddressee( *it ) )
list.append( *it );
@@ -113,8 +113,8 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
} else if ( mUseCategories->isChecked() ) {
const TQStringList categorieList = categories();
- KABC::AddressBook::ConstIterator it;
- KABC::AddressBook::ConstIterator addressBookEnd( mCore->addressBook()->end() );
+ TDEABC::AddressBook::ConstIterator it;
+ TDEABC::AddressBook::ConstIterator addressBookEnd( mCore->addressBook()->end() );
for ( it = mCore->addressBook()->begin(); it != addressBookEnd; ++it ) {
const TQStringList tmp( (*it).categories() );
TQStringList::ConstIterator tmpIt;
@@ -126,7 +126,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
}
} else {
// create a string list of all entries:
- KABC::AddressBook::ConstIterator it;
+ TDEABC::AddressBook::ConstIterator it;
for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it )
list.append( *it );
}
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index 5141e5d39..d9355e5b5 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -51,7 +51,7 @@ class XXPortSelectDialog : public KDialogBase
XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* parent,
const char* name = 0 );
- KABC::AddresseeList contacts();
+ TDEABC::AddresseeList contacts();
private slots:
void filterChanged( int );
@@ -76,9 +76,9 @@ class XXPortSelectDialog : public KDialogBase
KComboBox *mSortTypeCombo;
KAB::Core *mCore;
- KABC::AddresseeList mAddresseeList;
+ TDEABC::AddresseeList mAddresseeList;
Filter::List mFilters;
- KABC::Field::List mFields;
+ TDEABC::Field::List mFields;
bool mUseSorting;
};