diff options
Diffstat (limited to 'kopete/kopete/contactlist')
-rw-r--r-- | kopete/kopete/contactlist/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kopete/kopete/contactlist/Makefile.am | 6 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopeteaddrbookexport.cpp | 2 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopetecontactlistview.cpp | 8 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopetelviprops.cpp | 10 | ||||
-rw-r--r-- | kopete/kopete/contactlist/kopetemetacontactlvi.cpp | 4 | ||||
-rw-r--r-- | kopete/kopete/contactlist/tdeabcexport.cpp (renamed from kopete/kopete/contactlist/kabcexport.cpp) | 14 | ||||
-rw-r--r-- | kopete/kopete/contactlist/tdeabcexport.h (renamed from kopete/kopete/contactlist/kabcexport.h) | 8 | ||||
-rw-r--r-- | kopete/kopete/contactlist/tdeabcexport_base.ui (renamed from kopete/kopete/contactlist/kabcexport_base.ui) | 0 |
9 files changed, 27 insertions, 27 deletions
diff --git a/kopete/kopete/contactlist/CMakeLists.txt b/kopete/kopete/contactlist/CMakeLists.txt index 741d3e0f..cabcc684 100644 --- a/kopete/kopete/contactlist/CMakeLists.txt +++ b/kopete/kopete/contactlist/CMakeLists.txt @@ -36,5 +36,5 @@ tde_add_library( kopetecontactlist STATIC_PIC AUTOMOC kopetelviprops.cpp kopeteaddrbookexport.cpp kopeteaddrbookexportui.ui customnotifications.ui customnotificationprops.cpp kopetegrouplistaction.cpp - kabcexport.cpp kabcexport_base.ui + tdeabcexport.cpp tdeabcexport_base.ui ) diff --git a/kopete/kopete/contactlist/Makefile.am b/kopete/kopete/contactlist/Makefile.am index 785f890d..5f28c71c 100644 --- a/kopete/kopete/contactlist/Makefile.am +++ b/kopete/kopete/contactlist/Makefile.am @@ -15,13 +15,13 @@ libkopetecontactlist_la_SOURCES = kopetemetacontactlvi.cpp \ kopetestatusgroupviewitem.cpp kopetegroupviewitem.cpp kopetecontactlistview.cpp \ kopetegvipropswidget.ui kopetemetalvipropswidget.ui kopetelviprops.cpp \ kopeteaddrbookexport.cpp kopeteaddrbookexportui.ui customnotifications.ui \ - customnotificationprops.cpp kopetegrouplistaction.cpp kabcexport.cpp \ - kabcexport_base.ui + customnotificationprops.cpp kopetegrouplistaction.cpp tdeabcexport.cpp \ + tdeabcexport_base.ui libkopetecontactlist_la_LDFLAGS = $(all_libraries) -ltdefx libkopetecontactlist_la_LIBADD = -ltdeabc ../../libkopete/libkopete.la ../addcontactwizard/libkopeteaddcontactwizard.la $(LIB_TDEUI) $(LIB_XRENDER) -noinst_HEADERS = kopeteaddrbookexport.h customnotificationprops.h kabcexport.h +noinst_HEADERS = kopeteaddrbookexport.h customnotificationprops.h tdeabcexport.h KDE_OPTIONS = nofinal diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp index 7e2075fa..7104faaf 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp +++ b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp @@ -181,7 +181,7 @@ int KopeteAddressBookExport::showDialog() TQString(), i18n( "Set address book fields using the selected data from Kopete" ) ) ); initLabels(); - // fetch existing data from kabc + // fetch existing data from tdeabc fetchKABCData(); // fetch data from contacts fetchIMData(); diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 0284921a..051ca692 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -1361,8 +1361,8 @@ void KopeteContactListView::updateActionsForSelection( bool inkabc=false; if(singleContactSelected) { - TQString kabcid=contacts.first()->metaContactId(); - inkabc= !kabcid.isEmpty() && !kabcid.contains(":"); + TQString tdeabcid=contacts.first()->metaContactId(); + inkabc= !tdeabcid.isEmpty() && !tdeabcid.contains(":"); } actionSendFile->setEnabled( singleContactSelected && contacts.first()->canAcceptFiles()); @@ -1434,7 +1434,7 @@ void KopeteContactListView::slotSendFile() { //I borrowed this from slotSendMessage Kopete::MetaContact *m=Kopete::ContactList::self()->selectedMetaContacts().first(); - if ( !m->metaContactId().isEmpty( ) ) // check if in kabc + if ( !m->metaContactId().isEmpty( ) ) // check if in tdeabc { TDEABC::Addressee addressee = TDEABC::StdAddressBook::self()->findByUid( m->metaContactId() ); if ( !addressee.isEmpty() ) @@ -1883,7 +1883,7 @@ void KopeteContactListView::slotUndo() m_undo->args[1] = c->protocol()->pluginId(); m_undo->args[2] = c->account()->accountId(); } - // source kabc requires no arguments + // source tdeabc requires no arguments // do the undo if ( undoSource == Kopete::MetaContact::SourceContact ) diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index dc412fbd..a6cec329 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -45,7 +45,7 @@ #include <kstandarddirs.h> #include <kurlrequester.h> -#include "kabcpersistence.h" +#include "tdeabcpersistence.h" #include "kopeteaddrbookexport.h" #include "kopetecontact.h" #include "kopetegroup.h" @@ -327,12 +327,12 @@ void KopeteMetaLVIProps::slotEnableAndDisableWidgets() TDEABC::AddressBook *ab = Kopete::KABCPersistence::self()->addressBook(); TDEABC::Addressee a = ab->findByUid( mAddressBookUid ); bool validLink = ! a.isEmpty(); - // kabc source requires a kabc link + // tdeabc source requires a tdeabc link mainWidget->radioNameKABC->setEnabled(validLink); - // kabc source requires a kabc link + // tdeabc source requires a tdeabc link mainWidget->radioPhotoKABC->setEnabled(validLink); - // sync with kabc has no sense if we use kabc as source (sync kabc with kabc? uh?) - // it has also no sense if they are no kabc link + // sync with tdeabc has no sense if we use tdeabc as source (sync tdeabc with tdeabc? uh?) + // it has also no sense if they are no tdeabc link if( selectedPhotoSource() == Kopete::MetaContact::SourceKABC || !validLink ) { mainWidget->chkSyncPhoto->setEnabled(false); diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index 04bb8c98..c77367fb 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -61,7 +61,7 @@ #include "systemtray.h" #include "kopeteglobal.h" #include "kopetecontact.h" -#include "kabcpersistence.h" +#include "tdeabcpersistence.h" #include <memory> @@ -322,7 +322,7 @@ void KopeteMetaContactLVI::rename( const TQString& newName ) if(c) u->args << c->contactId() << c->protocol()->pluginId() << c->account()->accountId(); } - // source kabc requires no arguments + // source tdeabc requires no arguments lv->insertUndoItem(u); } diff --git a/kopete/kopete/contactlist/kabcexport.cpp b/kopete/kopete/contactlist/tdeabcexport.cpp index fa6e2143..32539863 100644 --- a/kopete/kopete/contactlist/kabcexport.cpp +++ b/kopete/kopete/contactlist/tdeabcexport.cpp @@ -1,5 +1,5 @@ /* - kabcexport.cpp - Export Contacts to Address Book Wizard for Kopete + tdeabcexport.cpp - Export Contacts to Address Book Wizard for Kopete Copyright (c) 2005 by Will Stephenson <[email protected]> Resource selector taken from KRES::SelectDialog @@ -34,16 +34,16 @@ #include <tdeabc/resource.h> #include <tdeabc/stdaddressbook.h> -#include <kabcpersistence.h> +#include <tdeabcpersistence.h> #include <kopetecontact.h> #include <kopetecontactlist.h> #include <kopetecontactproperty.h> #include <kopeteglobal.h> #include <kopetemetacontact.h> -#include "kabcpersistence.h" +#include "tdeabcpersistence.h" -#include "kabcexport.h" +#include "tdeabcexport.h" class ContactLVI : public TQCheckListItem { @@ -66,9 +66,9 @@ KabcExportWizard::KabcExportWizard( TQWidget *parent, const char *name ) // fill resource selector m_addressBook = Kopete::KABCPersistence::self()->addressBook(); - TQPtrList<TDEABC::Resource> kabcResources = m_addressBook->resources(); + TQPtrList<TDEABC::Resource> tdeabcResources = m_addressBook->resources(); - TQPtrListIterator<TDEABC::Resource> resIt( kabcResources ); + TQPtrListIterator<TDEABC::Resource> resIt( tdeabcResources ); TDEABC::Resource *resource; uint counter = 0; @@ -246,4 +246,4 @@ void KabcExportWizard::exportDetails( Kopete::MetaContact * mc, TDEABC::Addresse addr.setPhoto( TDEABC::Picture( photo ) ); } -#include "kabcexport.moc" +#include "tdeabcexport.moc" diff --git a/kopete/kopete/contactlist/kabcexport.h b/kopete/kopete/contactlist/tdeabcexport.h index 63a2be0e..c686dafd 100644 --- a/kopete/kopete/contactlist/kabcexport.h +++ b/kopete/kopete/contactlist/tdeabcexport.h @@ -1,5 +1,5 @@ /* - kabcexport.h - Export Contacts to Address Book Wizard for Kopete + tdeabcexport.h - Export Contacts to Address Book Wizard for Kopete Copyright (c) 2005 by Will Stephenson <[email protected]> @@ -15,10 +15,10 @@ ************************************************************************* */ -#ifndef KABCEXPORTWIZARD_H -#define KABCEXPORTWIZARD_H +#ifndef TDEABCEXPORTWIZARD_H +#define TDEABCEXPORTWIZARD_H -#include "kabcexport_base.h" +#include "tdeabcexport_base.h" namespace TDEABC { class AddressBook; diff --git a/kopete/kopete/contactlist/kabcexport_base.ui b/kopete/kopete/contactlist/tdeabcexport_base.ui index fa147a52..fa147a52 100644 --- a/kopete/kopete/contactlist/kabcexport_base.ui +++ b/kopete/kopete/contactlist/tdeabcexport_base.ui |