summaryrefslogtreecommitdiffstats
path: root/kabc
diff options
context:
space:
mode:
Diffstat (limited to 'kabc')
-rw-r--r--kabc/frontend/mainWindow.ui16
-rw-r--r--kabc/frontend/mainWindow.ui.h18
-rw-r--r--kabc/kabc2mutt/kabc2mutt.cpp10
-rw-r--r--kabc/kabc2mutt/kabc2mutt.h2
-rw-r--r--kabc/kabcdistlistupdater/Makefile.am2
-rw-r--r--kabc/kabcdistlistupdater/kabcdistlistupdater.cpp4
6 files changed, 26 insertions, 26 deletions
diff --git a/kabc/frontend/mainWindow.ui b/kabc/frontend/mainWindow.ui
index 1ca19b2ca..240114a6a 100644
--- a/kabc/frontend/mainWindow.ui
+++ b/kabc/frontend/mainWindow.ui
@@ -1359,9 +1359,9 @@
<forward>class AddresseeItem</forward>
</forwards>
<variables>
- <variable>KABC::ResourceFile *mResourceFile</variable>
+ <variable>TDEABC::ResourceFile *mResourceFile</variable>
<variable>AddresseeItem *mCurrentItem</variable>
- <variable>KABC::AddressBook *mAddressBook</variable>
+ <variable>TDEABC::AddressBook *mAddressBook</variable>
<variable>TQString mCurrentAddress</variable>
<variable>TQString mCurrentPhone</variable>
</variables>
@@ -1372,19 +1372,19 @@
<slot>fileOpen()</slot>
<slot>loadAddressBook( const TQString &amp; fileName )</slot>
<slot>updateAddressee( TQListViewItem * item )</slot>
- <slot>readAddressee( const KABC::Addressee &amp; a )</slot>
- <slot returnType="KABC::Addressee">writeAddressee( const KABC::Addressee &amp; addressee )</slot>
+ <slot>readAddressee( const TDEABC::Addressee &amp; a )</slot>
+ <slot returnType="TDEABC::Addressee">writeAddressee( const TDEABC::Addressee &amp; addressee )</slot>
<slot>newEntry()</slot>
<slot>removeEntry()</slot>
<slot>updateAddress( int id )</slot>
- <slot returnType="KABC::Address">writeAddress( const KABC::Address &amp; address )</slot>
+ <slot returnType="TDEABC::Address">writeAddress( const TDEABC::Address &amp; address )</slot>
<slot>writeAddress( const TQString &amp; id )</slot>
- <slot>readAddress( const KABC::Address &amp; a )</slot>
+ <slot>readAddress( const TDEABC::Address &amp; a )</slot>
<slot>readAddress( const TQString &amp; id )</slot>
<slot>updatePhone( int id )</slot>
- <slot returnType="KABC::PhoneNumber">writePhone( const KABC::PhoneNumber &amp; phoneNumber )</slot>
+ <slot returnType="TDEABC::PhoneNumber">writePhone( const TDEABC::PhoneNumber &amp; phoneNumber )</slot>
<slot>writePhone( const TQString &amp; id )</slot>
- <slot>readPhone( const KABC::PhoneNumber &amp; p )</slot>
+ <slot>readPhone( const TDEABC::PhoneNumber &amp; p )</slot>
<slot>readPhone( const TQString &amp; id )</slot>
<slot>newAddress()</slot>
<slot>removeAddress()</slot>
diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h
index 1a88f1deb..8e678b932 100644
--- a/kabc/frontend/mainWindow.ui.h
+++ b/kabc/frontend/mainWindow.ui.h
@@ -15,7 +15,7 @@
#include <tdeabc/stdaddressbook.h>
-using namespace KABC;
+using namespace TDEABC;
class AddresseeItem : public TQListViewItem
{
@@ -32,7 +32,7 @@ class AddresseeItem : public TQListViewItem
void MainWindow::init()
{
- mAddressBook = KABC::StdAddressBook::self( true );
+ mAddressBook = TDEABC::StdAddressBook::self( true );
mCurrentItem = 0;
@@ -75,7 +75,7 @@ void MainWindow::loadAddressBook( const TQString &fileName )
mCurrentAddress = TQString();
readAddressee( Addressee() );
- KABC::AddressBook::Iterator it;
+ TDEABC::AddressBook::Iterator it;
for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
new AddresseeItem( mAddresseeList, (*it) );
}
@@ -101,7 +101,7 @@ void MainWindow::updateAddressee( TQListViewItem *item )
}
-void MainWindow::readAddressee( const KABC::Addressee &a )
+void MainWindow::readAddressee( const TDEABC::Addressee &a )
{
kdDebug() << "MainWindow::readAddressee(): " << a.name() << endl;
@@ -169,7 +169,7 @@ void MainWindow::readAddressee( const KABC::Addressee &a )
readPhone( mCurrentPhone );
}
-KABC::Addressee MainWindow::writeAddressee( const KABC::Addressee &addressee )
+TDEABC::Addressee MainWindow::writeAddressee( const TDEABC::Addressee &addressee )
{
Addressee a( addressee );
a.setName( mNameEdit->text() );
@@ -237,7 +237,7 @@ void MainWindow::updateAddress( int id )
readAddress( mCurrentAddress );
}
-KABC::Address MainWindow::writeAddress( const KABC::Address &address )
+TDEABC::Address MainWindow::writeAddress( const TDEABC::Address &address )
{
Address a( address );
@@ -276,7 +276,7 @@ void MainWindow::writeAddress( const TQString &id )
mCurrentItem->addressee().insertAddress( address );
}
-void MainWindow::readAddress( const KABC::Address &a )
+void MainWindow::readAddress( const TDEABC::Address &a )
{
mAddressPostOfficeBoxEdit->setText( a.postOfficeBox() );
mAddressExtendedEdit->setText( a.extended() );
@@ -328,7 +328,7 @@ void MainWindow::updatePhone( int id )
readPhone( mCurrentPhone );
}
-KABC::PhoneNumber MainWindow::writePhone( const KABC::PhoneNumber &phoneNumber )
+TDEABC::PhoneNumber MainWindow::writePhone( const TDEABC::PhoneNumber &phoneNumber )
{
PhoneNumber p( phoneNumber );
@@ -367,7 +367,7 @@ void MainWindow::writePhone( const TQString &id )
mCurrentItem->addressee().insertPhoneNumber( p );
}
-void MainWindow::readPhone( const KABC::PhoneNumber &p )
+void MainWindow::readPhone( const TDEABC::PhoneNumber &p )
{
mPhoneNumberEdit->setText( p.number() );
diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp
index 144ffe2dd..01ae6fd28 100644
--- a/kabc/kabc2mutt/kabc2mutt.cpp
+++ b/kabc/kabc2mutt/kabc2mutt.cpp
@@ -39,8 +39,8 @@ KABC2Mutt::KABC2Mutt( TQObject *parent, const char *name )
void KABC2Mutt::run()
{
- mAddressBook = KABC::StdAddressBook::self( true );
- KABC::StdAddressBook::setAutomaticSave( false );
+ mAddressBook = TDEABC::StdAddressBook::self( true );
+ TDEABC::StdAddressBook::setAutomaticSave( false );
connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
this, TQT_SLOT( loadingFinished() ) );
@@ -49,7 +49,7 @@ void KABC2Mutt::run()
void KABC2Mutt::loadingFinished()
{
// print addressees
- KABC::AddressBook::ConstIterator iaddr;
+ TDEABC::AddressBook::ConstIterator iaddr;
for ( iaddr = mAddressBook->begin(); iaddr != mAddressBook->end(); ++iaddr ) {
const TQString name = (*iaddr).givenName() + ' ' + (*iaddr).familyName();
if ( !mQuery.isEmpty() ) {
@@ -122,12 +122,12 @@ void KABC2Mutt::loadingFinished()
}
// print all distribution lists
- KABC::DistributionListManager manager( mAddressBook );
+ TDEABC::DistributionListManager manager( mAddressBook );
manager.load();
TQStringList dists = manager.listNames();
for ( TQStringList::Iterator iaddr = dists.begin(); iaddr != dists.end(); ++iaddr ) {
- KABC::DistributionList *list = manager.list( *iaddr );
+ TDEABC::DistributionList *list = manager.list( *iaddr );
if ( list ) {
if ( !mQuery.isEmpty() ) {
bool match = ((*iaddr).find(mQuery) > -1);
diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h
index 328f06c17..92b7e9680 100644
--- a/kabc/kabc2mutt/kabc2mutt.h
+++ b/kabc/kabc2mutt/kabc2mutt.h
@@ -51,7 +51,7 @@ class KABC2Mutt : public TQObject
bool mAllAddresses;
bool mAlternateKeyFormat;
- KABC::AddressBook *mAddressBook;
+ TDEABC::AddressBook *mAddressBook;
};
#endif
diff --git a/kabc/kabcdistlistupdater/Makefile.am b/kabc/kabcdistlistupdater/Makefile.am
index 0eb5c411e..691ec277d 100644
--- a/kabc/kabcdistlistupdater/Makefile.am
+++ b/kabc/kabcdistlistupdater/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kabcdistlistupdater
kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la
+kabcdistlistupdater_LDADD = $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp
autostart_DATA = kabcdistlistupdater.desktop
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index b2e8d93b8..9455e88b4 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -62,10 +62,10 @@ void convertDistributionLists()
}
}
- KABC::StdAddressBook::self()->insertAddressee( distList );
+ TDEABC::StdAddressBook::self()->insertAddressee( distList );
}
- KABC::StdAddressBook::self()->save();
+ TDEABC::StdAddressBook::self()->save();
}
int main( int argc, char **argv )