summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/libkopete')
-rw-r--r--kopete/libkopete/kabcpersistence.cpp34
-rw-r--r--kopete/libkopete/kabcpersistence.h10
-rw-r--r--kopete/libkopete/kopetecontactlist.cpp2
-rw-r--r--kopete/libkopete/kopetemetacontact.cpp24
-rw-r--r--kopete/libkopete/kopetepicture.cpp4
-rw-r--r--kopete/libkopete/kopetepicture.h8
-rw-r--r--kopete/libkopete/ui/addressbooklinkwidget.cpp6
-rw-r--r--kopete/libkopete/ui/addressbooklinkwidget.h6
-rw-r--r--kopete/libkopete/ui/addressbookselectordialog.cpp4
-rw-r--r--kopete/libkopete/ui/addressbookselectordialog.h4
-rw-r--r--kopete/libkopete/ui/addressbookselectorwidget.cpp6
-rw-r--r--kopete/libkopete/ui/addressbookselectorwidget.h8
-rw-r--r--kopete/libkopete/ui/addresseeitem.cpp4
-rw-r--r--kopete/libkopete/ui/addresseeitem.h6
-rw-r--r--kopete/libkopete/ui/contactaddednotifydialog.cpp4
-rw-r--r--kopete/libkopete/ui/contactaddednotifydialog.h4
-rw-r--r--kopete/libkopete/ui/kopete.widgets2
-rw-r--r--kopete/libkopete/ui/kopetewidgets.cpp2
18 files changed, 69 insertions, 69 deletions
diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/kabcpersistence.cpp
index 2e0e5b61..0d03fc07 100644
--- a/kopete/libkopete/kabcpersistence.cpp
+++ b/kopete/libkopete/kabcpersistence.cpp
@@ -72,9 +72,9 @@ KABCPersistence *KABCPersistence::s_self = 0L;
bool KABCPersistence::s_addrBookWritePending = false;
-TQPtrList<KABC::Resource> KABCPersistence::s_pendingResources;
+TQPtrList<TDEABC::Resource> KABCPersistence::s_pendingResources;
-KABC::AddressBook* KABCPersistence::s_addressBook = 0;
+TDEABC::AddressBook* KABCPersistence::s_addressBook = 0;
KABCPersistence *KABCPersistence::self()
{
@@ -84,12 +84,12 @@ KABCPersistence *KABCPersistence::self()
return s_self;
}
-KABC::AddressBook* KABCPersistence::addressBook()
+TDEABC::AddressBook* KABCPersistence::addressBook()
{
if ( s_addressBook == 0L )
{
- s_addressBook = KABC::StdAddressBook::self();
- KABC::StdAddressBook::setAutomaticSave( false );
+ s_addressBook = TDEABC::StdAddressBook::self();
+ TDEABC::StdAddressBook::setAutomaticSave( false );
}
return s_addressBook;
}
@@ -97,11 +97,11 @@ KABC::AddressBook* KABCPersistence::addressBook()
void KABCPersistence::write( MetaContact * mc )
{
// Save any changes in each contact's addressBookFields to KABC
- KABC::AddressBook* ab = addressBook();
+ TDEABC::AddressBook* ab = addressBook();
kdDebug( 14010 ) << k_funcinfo << "looking up Addressee for " << mc->displayName() << "..." << endl;
// Look up the address book entry
- KABC::Addressee theAddressee = ab->findByUid( mc->metaContactId() );
+ TDEABC::Addressee theAddressee = ab->findByUid( mc->metaContactId() );
// Check that if addressee is not deleted or if the link is spurious
// (inherited from Kopete < 0.8, where all metacontacts had random ids)
if ( theAddressee.isEmpty() )
@@ -171,7 +171,7 @@ void KABCPersistence::write( MetaContact * mc )
}*/
}
-void KABCPersistence::writeAddressBook( const KABC::Resource * res)
+void KABCPersistence::writeAddressBook( const TDEABC::Resource * res)
{
if ( !s_pendingResources.containsRef( res ) )
s_pendingResources.append( res );
@@ -185,12 +185,12 @@ void KABCPersistence::writeAddressBook( const KABC::Resource * res)
void KABCPersistence::slotWriteAddressBook()
{
//kdDebug( 14010 ) << k_funcinfo << endl;
- KABC::AddressBook* ab = addressBook();
- TQPtrListIterator<KABC::Resource> it( s_pendingResources );
+ TDEABC::AddressBook* ab = addressBook();
+ TQPtrListIterator<TDEABC::Resource> it( s_pendingResources );
for ( ; it.current(); ++it )
{
//kdDebug( 14010 ) << "Writing resource " << it.current()->resourceName() << endl;
- KABC::Ticket *ticket = ab->requestSaveTicket( it.current() );
+ TDEABC::Ticket *ticket = ab->requestSaveTicket( it.current() );
if ( !ticket )
kdWarning( 14010 ) << "WARNING: Resource is locked by other application!" << endl;
else
@@ -211,7 +211,7 @@ void KABCPersistence::removeKABC( MetaContact *)
{
/* // remove any data this KMC has written to the TDE address book
// Save any changes in each contact's addressBookFields to KABC
- KABC::AddressBook* ab = addressBook();
+ TDEABC::AddressBook* ab = addressBook();
// Wipe out the existing addressBook entries
d->addressBook.clear();
@@ -223,7 +223,7 @@ void KABCPersistence::removeKABC( MetaContact *)
{
//kdDebug( 14010 ) << k_funcinfo << "looking up Addressee for " << displayName() << "..." << endl;
// Look up the address book entry
- KABC::Addressee theAddressee = ab->findByUid( metaContactId() );
+ TDEABC::Addressee theAddressee = ab->findByUid( metaContactId() );
if ( theAddressee.isEmpty() )
{
@@ -259,8 +259,8 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc )
kdDebug(14010) << k_funcinfo << endl;
bool contactAdded = false;
// check whether the dontShowAgain was checked
- KABC::AddressBook* ab = addressBook();
- KABC::Addressee addr = ab->findByUid( mc->metaContactId() );
+ TDEABC::AddressBook* ab = addressBook();
+ TDEABC::Addressee addr = ab->findByUid( mc->metaContactId() );
if ( !addr.isEmpty() ) // if we are associated with KABC
{
@@ -435,9 +435,9 @@ void KABCPersistence::splitField( const TQString &str, TQString &app, TQString &
void KABCPersistence::dumpAB()
{
- KABC::AddressBook * ab = addressBook();
+ TDEABC::AddressBook * ab = addressBook();
kdDebug( 14010 ) << k_funcinfo << " DUMPING ADDRESSBOOK" << endl;
- KABC::AddressBook::ConstIterator dumpit = ab->begin();
+ TDEABC::AddressBook::ConstIterator dumpit = ab->begin();
for ( ; dumpit != ab->end(); ++dumpit )
{
(*dumpit).dump();
diff --git a/kopete/libkopete/kabcpersistence.h b/kopete/libkopete/kabcpersistence.h
index ae84d615..3c5f4b0b 100644
--- a/kopete/libkopete/kabcpersistence.h
+++ b/kopete/libkopete/kabcpersistence.h
@@ -28,7 +28,7 @@
// *) KABC Export Wizard - TODO - think about sequence of events when adding addressees AND writing their IM data. - Extra save should be unnecessary because we are sharing a kabc instance
// *) Select addressbook entry
-namespace KABC
+namespace TDEABC
{
class AddressBook;
class Resource;
@@ -60,7 +60,7 @@ class KOPETE_EXPORT KABCPersistence : public TQObject
/**
* @brief Access Kopete's KDE address book instance
*/
- static KABC::AddressBook* addressBook();
+ static TDEABC::AddressBook* addressBook();
/**
* @brief Change the KABC data associated with this metacontact
*
@@ -84,7 +84,7 @@ class KOPETE_EXPORT KABCPersistence : public TQObject
/**
* Request an address book write, will be delayed to bundle any others happening around the same time
*/
- void writeAddressBook( const KABC::Resource * res );
+ void writeAddressBook( const TDEABC::Resource * res );
protected:
static void splitField( const TQString &str, TQString &app, TQString &name, TQString &value );
@@ -97,9 +97,9 @@ class KOPETE_EXPORT KABCPersistence : public TQObject
void slotWriteAddressBook();
private:
static KABCPersistence * s_self;
- static KABC::AddressBook* s_addressBook;
+ static TDEABC::AddressBook* s_addressBook;
static bool s_addrBookWritePending;
- static TQPtrList<KABC::Resource> s_pendingResources;
+ static TQPtrList<TDEABC::Resource> s_pendingResources;
};
} // end namespace Kopete
diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp
index de9e509b..394527d6 100644
--- a/kopete/libkopete/kopetecontactlist.cpp
+++ b/kopete/libkopete/kopetecontactlist.cpp
@@ -311,7 +311,7 @@ void ContactList::loadGlobalIdentity()
connect(myself(), TQT_SIGNAL(photoChanged()), this, TQT_SLOT(slotPhotoChanged()));
// Ensure that the myself metaContactId is always the KABC whoAmI
- KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI();
+ TDEABC::Addressee a = TDEABC::StdAddressBook::self()->whoAmI();
if(!a.isEmpty() && a.uid() != myself()->metaContactId())
{
myself()->setMetaContactId(a.uid());
diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp
index fb34e892..65d61106 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -639,13 +639,13 @@ TQString MetaContact::displayName() const
TQString nameFromKABC( const TQString &id ) /*const*/
{
- KABC::AddressBook* ab = KABCPersistence::self()->addressBook();
+ TDEABC::AddressBook* ab = KABCPersistence::self()->addressBook();
if ( ! id.isEmpty() && !id.contains(':') )
{
- KABC::Addressee theAddressee = ab->findByUid(id);
+ TDEABC::Addressee theAddressee = ab->findByUid(id);
if ( theAddressee.isEmpty() )
{
- kdDebug( 14010 ) << k_funcinfo << "no KABC::Addressee found for ( " << id << " ) " << " in current address book" << endl;
+ kdDebug( 14010 ) << k_funcinfo << "no TDEABC::Addressee found for ( " << id << " ) " << " in current address book" << endl;
}
else
{
@@ -738,17 +738,17 @@ TQImage photoFromContact( Kopete::Contact *contact) /*const*/
TQImage photoFromKABC( const TQString &id ) /*const*/
{
- KABC::AddressBook* ab = KABCPersistence::self()->addressBook();
+ TDEABC::AddressBook* ab = KABCPersistence::self()->addressBook();
if ( ! id.isEmpty() && !id.contains(':') )
{
- KABC::Addressee theAddressee = ab->findByUid(id);
+ TDEABC::Addressee theAddressee = ab->findByUid(id);
if ( theAddressee.isEmpty() )
{
- kdDebug( 14010 ) << k_funcinfo << "no KABC::Addressee found for ( " << id << " ) " << " in current address book" << endl;
+ kdDebug( 14010 ) << k_funcinfo << "no TDEABC::Addressee found for ( " << id << " ) " << " in current address book" << endl;
}
else
{
- KABC::Picture pic = theAddressee.photo();
+ TDEABC::Picture pic = theAddressee.photo();
if ( pic.data().isNull() && pic.url().isEmpty() )
pic = theAddressee.logo();
@@ -1289,18 +1289,18 @@ void MetaContact::slotAllPluginsLoaded()
void MetaContact::slotUpdateAddressBookPicture()
{
- KABC::AddressBook* ab = KABCPersistence::self()->addressBook();
+ TDEABC::AddressBook* ab = KABCPersistence::self()->addressBook();
TQString id = metaContactId();
if ( !id.isEmpty() && !id.contains(':') )
{
- KABC::Addressee theAddressee = ab->findByUid(id);
+ TDEABC::Addressee theAddressee = ab->findByUid(id);
if ( theAddressee.isEmpty() )
{
- kdDebug( 14010 ) << k_funcinfo << "no KABC::Addressee found for ( " << id << " ) " << " in current address book" << endl;
+ kdDebug( 14010 ) << k_funcinfo << "no TDEABC::Addressee found for ( " << id << " ) " << " in current address book" << endl;
}
else
{
- KABC::Picture pic = theAddressee.photo();
+ TDEABC::Picture pic = theAddressee.photo();
if ( pic.data().isNull() && pic.url().isEmpty() )
pic = theAddressee.logo();
@@ -1398,7 +1398,7 @@ void MetaContact::setPhotoSyncedWithKABC(bool b)
if ( !d->metaContactId.isEmpty() && !newValue.isNull())
{
- KABC::Addressee theAddressee = KABCPersistence::self()->addressBook()->findByUid( metaContactId() );
+ TDEABC::Addressee theAddressee = KABCPersistence::self()->addressBook()->findByUid( metaContactId() );
if ( !theAddressee.isEmpty() )
{
diff --git a/kopete/libkopete/kopetepicture.cpp b/kopete/libkopete/kopetepicture.cpp
index dad810c4..74d85ffe 100644
--- a/kopete/libkopete/kopetepicture.cpp
+++ b/kopete/libkopete/kopetepicture.cpp
@@ -55,7 +55,7 @@ Picture::Picture(const TQImage &image)
setPicture(image);
}
-Picture::Picture(const KABC::Picture &picture)
+Picture::Picture(const TDEABC::Picture &picture)
: d(new Private)
{
setPicture(picture);
@@ -171,7 +171,7 @@ void Picture::setPicture(const TQString &path)
d->pictureBase64 = TQString();
}
-void Picture::setPicture(const KABC::Picture &picture)
+void Picture::setPicture(const TDEABC::Picture &picture)
{
// No need to call detach() here because setPicture will do it.
if ( picture.isIntern())
diff --git a/kopete/libkopete/kopetepicture.h b/kopete/libkopete/kopetepicture.h
index 7b8de0d4..555787df 100644
--- a/kopete/libkopete/kopetepicture.h
+++ b/kopete/libkopete/kopetepicture.h
@@ -23,7 +23,7 @@
#include <tqimage.h>
-namespace KABC
+namespace TDEABC
{
class Picture;
}
@@ -74,9 +74,9 @@ public:
*/
Picture(const TQImage &image);
/**
- * Create a picture from a KABC::Picture.
+ * Create a picture from a TDEABC::Picture.
*/
- Picture(const KABC::Picture &picture);
+ Picture(const TDEABC::Picture &picture);
/**
* Copy a picture. It doesn't create a full copy, it just make a reference.
*/
@@ -131,7 +131,7 @@ public:
* Set the picture content.
* @param picture a KABC Picture.
*/
- void setPicture(const KABC::Picture &picture);
+ void setPicture(const TDEABC::Picture &picture);
private:
/**
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp
index 2aa7df67..80f9fba5 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.cpp
+++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp
@@ -45,7 +45,7 @@ AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * na
connect( btnSelectAddressee, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddressee() ) );
}
-void AddressBookLinkWidget::setAddressee( const KABC::Addressee& addr )
+void AddressBookLinkWidget::setAddressee( const TDEABC::Addressee& addr )
{
edtAddressee->setText( addr.realName() );
btnClear->setEnabled( !addr.isEmpty() );
@@ -65,7 +65,7 @@ void AddressBookLinkWidget::slotClearAddressee()
{
edtAddressee->clear();
btnClear->setEnabled( false );
- KABC::Addressee mrEmpty;
+ TDEABC::Addressee mrEmpty;
mSelectedUid = TQString();
emit addresseeChanged( mrEmpty );
}
@@ -81,7 +81,7 @@ void AddressBookLinkWidget::slotSelectAddressee()
Kopete::UI::AddressBookSelectorDialog dialog( i18n("Addressbook Association"), message, ( mMetaContact ? mMetaContact->metaContactId() : TQString() ), this );
int result = dialog.exec();
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
if ( result == TQDialog::Accepted )
{
addr = dialog.addressBookSelectorWidget()->addressee();
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.h b/kopete/libkopete/ui/addressbooklinkwidget.h
index 0ff4a651..a20f021f 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.h
+++ b/kopete/libkopete/ui/addressbooklinkwidget.h
@@ -50,7 +50,7 @@ public:
/**
* Set the currently selected addressee
*/
- void setAddressee( const KABC::Addressee& addr );
+ void setAddressee( const TDEABC::Addressee& addr );
/**
* Set the current metacontact so that the selector dialog may be preselected
*/
@@ -61,9 +61,9 @@ public:
TQString uid() const;
signals:
/**
- * Emitted when the selected addressee changed. addr is the KABC::Addressee that was selected. If addr.isEmpty() is empty, the clear button was clicked.
+ * Emitted when the selected addressee changed. addr is the TDEABC::Addressee that was selected. If addr.isEmpty() is empty, the clear button was clicked.
*/
- void addresseeChanged( const KABC::Addressee& addr );
+ void addresseeChanged( const TDEABC::Addressee& addr );
/**
* Provided so you can perform your own actions instead of opening the AddressBookSelectorWidget.
diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp
index e75e7bc9..5ff4292f 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.cpp
+++ b/kopete/libkopete/ui/addressbookselectordialog.cpp
@@ -52,12 +52,12 @@ AddressBookSelectorDialog::~AddressBookSelectorDialog()
{
}
-KABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent)
+TDEABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent)
{
AddressBookSelectorDialog dialog(title, message, preSelectUid, parent);
int result = dialog.exec();
- KABC::Addressee adr;
+ TDEABC::Addressee adr;
if ( result == TQDialog::Accepted )
adr = dialog.addressBookSelectorWidget()->addressee();
diff --git a/kopete/libkopete/ui/addressbookselectordialog.h b/kopete/libkopete/ui/addressbookselectordialog.h
index 5f5f6500..5b64c75c 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.h
+++ b/kopete/libkopete/ui/addressbookselectordialog.h
@@ -23,7 +23,7 @@
#include "kopete_export.h"
#include <kdialogbase.h>
-namespace KABC
+namespace TDEABC
{
class AddressBook;
class Addressee;
@@ -72,7 +72,7 @@ public:
* @returns the selected contact, or a null addressee if the user
* pressed the Cancel button. Optionally
*/
- static KABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent = 0L );
+ static TDEABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent = 0L );
protected slots:
virtual void accept();
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 8a0f08b5..2ff65529 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -90,7 +90,7 @@ AddressBookSelectorWidget::~AddressBookSelectorWidget()
}
-KABC::Addressee AddressBookSelectorWidget::addressee()
+TDEABC::Addressee AddressBookSelectorWidget::addressee()
{
AddresseeItem *item = 0L;
item = static_cast<AddresseeItem *>( addresseeListView->selectedItem() );
@@ -127,7 +127,7 @@ bool AddressBookSelectorWidget::addresseeSelected()
void AddressBookSelectorWidget::slotLoadAddressees()
{
addresseeListView->clear();
- KABC::AddressBook::Iterator it;
+ TDEABC::AddressBook::Iterator it;
AddresseeItem *addr;
for( it = m_addressBook->begin(); it != m_addressBook->end(); ++it )
{
@@ -148,7 +148,7 @@ void AddressBookSelectorWidget::slotAddAddresseeClicked()
if ( !addresseeName.isEmpty() )
{
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
addr.setNameFromString( addresseeName );
m_addressBook->insertAddressee(addr);
Kopete::KABCPersistence::self()->writeAddressBook( 0 );
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h
index 09eb406d..067af94d 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.h
+++ b/kopete/libkopete/ui/addressbookselectorwidget.h
@@ -35,7 +35,7 @@
#include "addressbookselectorwidget_base.h"
-namespace KABC {
+namespace TDEABC {
class AddressBook;
class Addressee;
}
@@ -52,7 +52,7 @@ class KOPETE_EXPORT AddressBookSelectorWidget : public AddressBookSelectorWidget
public:
AddressBookSelectorWidget( TQWidget *parent = 0, const char *name = 0 );
~AddressBookSelectorWidget();
- KABC::Addressee addressee();
+ TDEABC::Addressee addressee();
/**
* sets the widget label message
* example: Please select a contact
@@ -69,8 +69,8 @@ public:
bool addresseeSelected();
private:
- KABC::AddressBook * m_addressBook;
- KABC::Addressee m_addressee;
+ TDEABC::AddressBook * m_addressBook;
+ TDEABC::Addressee m_addressee;
protected slots:
void slotAddAddresseeClicked();
diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp
index 3065abe8..f84dd8d4 100644
--- a/kopete/libkopete/ui/addresseeitem.cpp
+++ b/kopete/libkopete/ui/addresseeitem.cpp
@@ -27,12 +27,12 @@
#include "addresseeitem.h"
-AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) :
+AddresseeItem::AddresseeItem( TQListView *parent, const TDEABC::Addressee &addressee) :
TDEListViewItem( parent ),
mAddressee( addressee )
{
//We can't save showphoto because we don't have a d pointer
- KABC::Picture pic = mAddressee.photo();
+ TDEABC::Picture pic = mAddressee.photo();
if(!pic.isIntern())
pic = mAddressee.logo();
if(pic.isIntern())
diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h
index 6962d109..786db604 100644
--- a/kopete/libkopete/ui/addresseeitem.h
+++ b/kopete/libkopete/ui/addresseeitem.h
@@ -49,12 +49,12 @@ class AddresseeItem : public TDEListViewItem
@param parent The parent listview.
@param addressee The associated addressee.
*/
- AddresseeItem( TQListView *parent, const KABC::Addressee &addressee );
+ AddresseeItem( TQListView *parent, const TDEABC::Addressee &addressee );
/**
Returns the addressee.
*/
- KABC::Addressee addressee() const { return mAddressee; }
+ TDEABC::Addressee addressee() const { return mAddressee; }
/**
Method used by TQListView to sort the items.
@@ -62,7 +62,7 @@ class AddresseeItem : public TDEListViewItem
virtual TQString key( int column, bool ascending ) const;
private:
- KABC::Addressee mAddressee;
+ TDEABC::Addressee mAddressee;
};
#endif
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp
index b0fdd43a..642a8be3 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.cpp
+++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp
@@ -102,7 +102,7 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId,
}
d->widget->m_groupList->setCurrentText(TQString()); //default to top-level
- connect( d->widget->widAddresseeLink, TQT_SIGNAL( addresseeChanged( const KABC::Addressee& ) ), this, TQT_SLOT( slotAddresseeSelected( const KABC::Addressee& ) ) );
+ connect( d->widget->widAddresseeLink, TQT_SIGNAL( addresseeChanged( const TDEABC::Addressee& ) ), this, TQT_SLOT( slotAddresseeSelected( const TDEABC::Addressee& ) ) );
connect( d->widget->m_infoButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotInfoClicked() ) );
connect( this, TQT_SIGNAL(okClicked()) , this , TQT_SLOT(slotFinished()));
@@ -153,7 +153,7 @@ MetaContact *ContactAddedNotifyDialog::addContact() const
return metacontact;
}
-void ContactAddedNotifyDialog::slotAddresseeSelected( const KABC::Addressee & addr )
+void ContactAddedNotifyDialog::slotAddresseeSelected( const TDEABC::Addressee & addr )
{
if ( !addr.isEmpty() )
{
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.h b/kopete/libkopete/ui/contactaddednotifydialog.h
index e439ed47..78c39aa2 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.h
+++ b/kopete/libkopete/ui/contactaddednotifydialog.h
@@ -20,7 +20,7 @@
#include <kdialogbase.h>
#include "kopete_export.h"
-namespace KABC {
+namespace TDEABC {
class Addressee;
}
@@ -160,7 +160,7 @@ signals:
private slots:
- void slotAddresseeSelected( const KABC::Addressee &);
+ void slotAddresseeSelected( const TDEABC::Addressee &);
void slotInfoClicked();
void slotFinished();
diff --git a/kopete/libkopete/ui/kopete.widgets b/kopete/libkopete/ui/kopete.widgets
index bb4ee05f..54435dda 100644
--- a/kopete/libkopete/ui/kopete.widgets
+++ b/kopete/libkopete/ui/kopete.widgets
@@ -18,7 +18,7 @@ Group=Input (Kopete)
[Kopete::UI::AddressBookLinkWidget]
ToolTip=Address Book Link Widget (Kopete)
-WhatsThis=KABC::Addressee display/selector
+WhatsThis=TDEABC::Addressee display/selector
IncludeFile=addressbooklinkwidget.h
ConstructorArgs=(parent, name)
Group=Input (Kopete)
diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp
index b7addd10..f20cef6d 100644
--- a/kopete/libkopete/ui/kopetewidgets.cpp
+++ b/kopete/libkopete/ui/kopetewidgets.cpp
@@ -79,7 +79,7 @@ KopeteWidgets::KopeteWidgets()
#endif
widget.includeFile = TQString::fromLatin1("addressbooklinkwidget.h");
widget.toolTip = TQString::fromLatin1("Address Book Link Widget (Kopete)");
- widget.whatsThis = TQString::fromLatin1("KABC::Addressee display/selector");
+ widget.whatsThis = TQString::fromLatin1("TDEABC::Addressee display/selector");
widget.isContainer = false;
m_widgets.insert(TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget"), widget);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 22:38:53 +0000