Additional k => tde renaming and fixes

89 files changed, 262 insertions, 262 deletions

diff --git a/kopete/KABC_INTEG_NOTES b/kopete/KABC_INTEG_NOTES
index 3b00924d..ea053dbe 100644
--- a/kopete/KABC_INTEG_NOTES
+++ b/kopete/KABC_INTEG_NOTES
@@ -20,20 +20,20 @@ Spaze's goals
 2. Allow other apps to retrieve all IM-enabled contacts and their online status for e.g. presence display in kmail or invitations for desktop sharing
 3. Allow other IM apps to share the same data that Kopete uses in a standardized way
 4. Allow other apps to start a chat with selected persons in a standardized way _regardless of client used_
-5. in the longer run i would like to add,say, an ICQ UIN from kaddressbook and Kopete automatically picks up the change, adds it to the server side contact list and does all other kind of syncing of changes made in kaddressbook as well. for the short term one way kopete->kabc is ok, but the API should be prepared for full bidi comms. ideally kopete, libkabc and all server side contact lists are always 100% in sync as much as possible for each.
+5. in the longer run i would like to add,say, an ICQ UIN from kaddressbook and Kopete automatically picks up the change, adds it to the server side contact list and does all other kind of syncing of changes made in kaddressbook as well. for the short term one way kopete->tdeabc is ok, but the API should be prepared for full bidi comms. ideally kopete, libtdeabc and all server side contact lists are always 100% in sync as much as possible for each.
 
 mETz' goals
 1. well, I just think Kopete should never edit my addressbook without me knowing
 
 Gof's goals
-1. my goal is to have the kopete contactlist a kind of address book  (i.e. i want to view and modify kabc entry from kopete, like if i am in the kab interface.  i do not want to open KAB
+1. my goal is to have the kopete contactlist a kind of address book  (i.e. i want to view and modify tdeabc entry from kopete, like if i am in the kab interface.  i do not want to open KAB
 2. and i want to share fields (gpg key) with other application, like kmail
 3.  technicaly, i think that should be transparent.
 Goals (-ve):
 *) don't store information that's not worth sharing in the address book
 
 gregj's goals
-kopete should not replace  server side data with kabc derived data nor upload information that wasn't present on the server before. 
+kopete should not replace  server side data with tdeabc derived data nor upload information that wasn't present on the server before. 
 E.g. we know someones telephone nr. but we don't want to put this information back on server if it was not present there before. Update IMO is ok.  
 
 brunes goals
@@ -47,16 +47,16 @@ KABC->kopete ok, what about server side metadata
 Display Name
 
 Priority: Goals for 3.2
-ONLY the actual linking and one-way storage from kopete in kabc and retrieval of display name and address book data
-Also ability to add kabc contained contacts to kopete ( selected ones only )
+ONLY the actual linking and one-way storage from kopete in tdeabc and retrieval of display name and address book data
+Also ability to add tdeabc contained contacts to kopete ( selected ones only )
 
 Linking
 use KMC UID to store KABC uid, QString::null if no link.
 Establish the link using KMC Props dialog (mETz: Alt+return shortcut to open pls).
 Policy:
-One way kopete->kabc contacts
+One way kopete->tdeabc contacts
 , achieve bidi later
-<Bille> what about the sync policy between IM contacts contained in kabc and in kopete
+<Bille> what about the sync policy between IM contacts contained in tdeabc and in kopete
 <spaze> mETz: alt-enter doesn't work? report a bug to tdelistview/qlistview, that sucks :( </ot>
 <gregj> hyhy
 <spaze> Bille: implied i'd say
@@ -67,7 +67,7 @@ One way kopete->kabc contacts
 <spaze> ugh..
 <Gof> and the wizzard iontegration is in the link
 <Gof> now, it has no sense  to provide a link if we don't use it at all
-<spaze> Bille: I think Gof is right. first we just ignore what's in libkabc and do it one-way
+<spaze> Bille: I think Gof is right. first we just ignore what's in libtdeabc and do it one-way
 <spaze> Bille: once that works we can do it bidi
 <Bille> ok
 <spaze> Bille: we have the luxury to be the first so no need to be compatible :)
@@ -80,7 +80,7 @@ One way kopete->kabc contacts
 <spaze> ( ) Add only these contacts
 <Gof> if not, the link is useless, and it's better no link at all
 <Bille> spaze: agreed
-<spaze> not even conditional, just always, if you say you want to use kabc
+<spaze> not even conditional, just always, if you say you want to use tdeabc
 <spaze> that's our first test case
 <spaze> once that works we can do the addressbook fields
 <Bille> gregj: what is your take on syncing display name to addressee name?
@@ -92,7 +92,7 @@ One way kopete->kabc contacts
 ***
 
 <Gof> spaze: ( )  add all contact    is not good imo  (i don't want to add irc channels)  and also, it would make a lot of duplicate entities
-<gregj> i want kabc to provide me storage, and give back just what i stored
+<gregj> i want tdeabc to provide me storage, and give back just what i stored
 <gregj> nothing more
 <Bille> gregj: what if it changes the Kopete displayname (that is not sent to the server)?
 <gregj> if i didn't provide email, i don't want email back
@@ -101,10 +101,10 @@ One way kopete->kabc contacts
 <Gof> maybe
 <gregj> Bille: hmm, this is hard to say now
 <gregj> Bille: i am retriving all information on connect from server
-<spaze> Gof: I'm talking about the fields to IMPORT from libkabc when we start kopete and kabc was changed by another app, i.e. someone was added there
+<spaze> Gof: I'm talking about the fields to IMPORT from libtdeabc when we start kopete and tdeabc was changed by another app, i.e. someone was added there
 <gregj> Bille: as long as uid matches, this should be ok
 <Bille> gregj: ok
-<gregj> if someone changes uid in kabc, then it is his problem
+<gregj> if someone changes uid in tdeabc, then it is his problem
 <spaze> Gof: but you pointed out a nice flaw in the current addressBookFields API :(
  samppa Singularity spaze STiAT|off 
 <spaze> gregj: i'm talking about adding new entries, not modifying
@@ -115,21 +115,21 @@ One way kopete->kabc contacts
 <Bille> yup
 <gregj> spaze: than it is ok to me
 <gregj> spaze: i will have to synchronize it with server than
-<spaze> Bille: we now assume addressbook fields are either all stored in kabc or all stored in xml
+<spaze> Bille: we now assume addressbook fields are either all stored in tdeabc or all stored in xml
 
 SEMANTICS OF KABC KEYS
  ok, one question, it is already dual-key based (app, key)
 <spaze> so that's perfect
 <Bille> yeah, what's that Key about?
 <Bille> i wasn't sure what that's for
-<spaze> Bille: what kabc is "supposed" to be used like is as follows:
+<spaze> Bille: what tdeabc is "supposed" to be used like is as follows:
 <spaze> addCustomField( "kopete", "myCustomKey", "myValue" )
 <spaze> BUT
-<spaze> we use kabc for data that is NOT app-specific
+<spaze> we use tdeabc for data that is NOT app-specific
 <Bille> in our semantics, what's the All mean, all messaging apps incl kopete? :)
 <spaze> so we 'abuse' app as key and are stuck with a key that we don't use
 <-- cdr has quit (Client Quit)
-<gregj> spaze: maybe there should be a category in kabc
+<gregj> spaze: maybe there should be a category in tdeabc
 <spaze> Bille: oh... that's another 'abuse' of the sematics
 <spaze> Bille: that's only for contact id's
 <gregj> spaze: category for IM related info, emails, and so on
@@ -150,8 +150,8 @@ Use cases
 1) Add new metacontact + contacts using Add Contact Wizard
 	Decide whether to associate or not if using mandatory association.
     a) Matching addressbook entry already exists
-	- Need to choose kabc entry in ACW?
-	- Check if kabc entry already contains IM information (old install of Kopete or from another client)
+	- Need to choose tdeabc entry in ACW?
+	- Check if tdeabc entry already contains IM information (old install of Kopete or from another client)
 	b) No matching entry exists
 	- Need to add new one
 
@@ -161,15 +161,15 @@ Use cases
 3)  All new Kopete (first run / no existing configs or contactlist)
 	Add accounts
 	Server Side Contact List (SSCL) fetched, lots of permanent contacts are created.
-*)  Consider if 2 accounts are added and there are contacts from different accounts such that they represent the same person.  They belong in the same MC.  MC merging should take place prior to kabc association.
+*)  Consider if 2 accounts are added and there are contacts from different accounts such that they represent the same person.  They belong in the same MC.  MC merging should take place prior to tdeabc association.
 
-4)  An existing Kopete config is present and we upgrade to a version of Kopete supporting kabc.
+4)  An existing Kopete config is present and we upgrade to a version of Kopete supporting tdeabc.
 
 5a)  After abandoning Kopete, users start using a different KDE IM client, and would like to use the IM address details stored in the KDE address book.
 
 5b)  The user used another KDE IM Client.  But he finally discovers Kopete,which is the best, decides to use it, and he would like to use information already existing in KABC
 
-6)  Protocols may deliver contact data that users may want to aggregate into the kabc entry.
+6)  Protocols may deliver contact data that users may want to aggregate into the tdeabc entry.
 
 7)  A contact adds a new IM account, either the user decides to add the new account to the MC manually, or the contact messages the user first, we get a temporary contact Kopete side, add them to the MC.
 
@@ -179,7 +179,7 @@ Use cases
 
 Implementation notes
 --------------------
-1) New MC.  Need dialogs to ask if association needed. Association dialog allows to select/search kabc contacts.  We need to write the kabc data sooner than closing Kopete!
+1) New MC.  Need dialogs to ask if association needed. Association dialog allows to select/search tdeabc contacts.  We need to write the tdeabc data sooner than closing Kopete!
 
 2) Same as 1)
 
@@ -188,16 +188,16 @@ Implementation notes
 
 4) Deferred association
 
-5a) We don't want any Kopete specific data in the kabc.  Entries should be usable by other KDE IM apps.
+5a) We don't want any Kopete specific data in the tdeabc.  Entries should be usable by other KDE IM apps.
 
 5b) The reverse case, therefore we should agree standard entry format with other apps.
     We should also make using this info really easy in the Add Contact Wizard (see below).
 
-6) Question: how to combine all contacts in an MCs' data before saving this to kabc.
+6) Question: how to combine all contacts in an MCs' data before saving this to tdeabc.
 
-7) First do dupe check or 'im-info-in-tdeabc-not-in-kopete' check in case this information already exists in KABC.  Once added to a MC, if already associated, we can add the new contact information to kabc immediately, otherwise Deferred association accessed via MC properties dialog.
+7) First do dupe check or 'im-info-in-tdeabc-not-in-kopete' check in case this information already exists in KABC.  Once added to a MC, if already associated, we can add the new contact information to tdeabc immediately, otherwise Deferred association accessed via MC properties dialog.
 
-8) Don't remove the kabc fields, other IM clients might be using them.  So we just remove them from the Kopete contact list.  Dupe contact on the MC add contact thingy will catch if the contact is added again.  (and the user might still want to have other data like the phone number) * See the kabc section
+8) Don't remove the tdeabc fields, other IM clients might be using them.  So we just remove them from the Kopete contact list.  Dupe contact on the MC add contact thingy will catch if the contact is added again.  (and the user might still want to have other data like the phone number) * See the tdeabc section
 
 Therefore we need an Association Dialog accessed in wizard and from the MC properties dialog.  Note, this name sucks, don't write any classes using it.
 
@@ -207,13 +207,13 @@ Side Issues
 It's not possible to add >1 contact per protocol using the ACW.  Martijn: >1 contact per MC is for power users, they can add extra contacts using the MC's context menu. Change to an iterative ACW would fix this.
 
 
-Possible ACW order including kabc
+Possible ACW order including tdeabc
 ---------------------------------
 1) Welcome :P
 2) Choose Account
 3) Fill in protocol details
 4) Select Group
-5) Select kabc contact from list | create new | create none
+5) Select tdeabc contact from list | create new | create none
 
 6) - if the user selected to create a new entry in the KAB, show the page showed when you add normaly a new KAB entry (if possible where some fields are
    - if the user selected to search in the existing KABC database, show a nice widget to search one user.
@@ -281,7 +281,7 @@ B) use a KPart from KAB to show the widget showed when adding new KAB entried =>
 This try to do all in as few step as possible.
 I can't count very well, but AFAICS your suggestion is equal or greater:
 
-Step Count		No IM in kabc	1 IM in kabc (new entry) + n new
+Step Count		No IM in tdeabc	1 IM in tdeabc (new entry) + n new
 Will    			7				6 +  3 * n = 9
 Gof     			6 				5 +  2 * n = 7
 
@@ -305,7 +305,7 @@ so kopete becomes in fact a addressbook itself
 
 
 
-Adding fields to kabc
+Adding fields to tdeabc
 ~~~~~~~~~~~~~~~~~~~~~
 Either - all new addressee, no IM + new IM to add | existing address, no IM + new IM to add
 | existing addressee, no IM + new IM to add | existing addressee, existing IM + new IM to add | existing addressee, existing IM + nothing to add
@@ -314,17 +314,17 @@ I think we're going to need a more complex data structure to tell KCL::addMetaCo
 
    I don't understand this <p>  -Olivier
 
-Fields to put in kabc
+Fields to put in tdeabc
 ~~~~~~~~~~~~~~~~~~~~~
-Relation between kabc entries and kopete metacontacts could be 1:1 or 1:many.  1:1 is neatest.
+Relation between tdeabc entries and kopete metacontacts could be 1:1 or 1:many.  1:1 is neatest.
 
 In Kopete contact list:
-include UID from related kabc entry
+include UID from related tdeabc entry
 
-In kabc
+In tdeabc
 Something like X-MESSAGING-MSN:[email protected] for each protocol account that contact uses.
 
-We should keep the extra stuff in kabc to a minimum.  We can store nicknames in contactlist.xml.
+We should keep the extra stuff in tdeabc to a minimum.  We can store nicknames in contactlist.xml.
 
 We should allow plugins to save some data:
 Some protocol allow to reach phone numbers, or more (see the ICQ info page)
@@ -332,9 +332,9 @@ It would be useful if KABC could remember what application writes an entry. so w
 
 Or like the language or the PGP public key
 
-It is too complex to store the phone number according to icq as well as the kabc phone number and every other protocol's idea of phone.  The fields would be of no use to any app other than the inserting program or else we would have to update the world.  We *should* have a facility to insert information obtained from protocols into the common kabc fields but this is a hard problem to solve neatly.
+It is too complex to store the phone number according to icq as well as the tdeabc phone number and every other protocol's idea of phone.  The fields would be of no use to any app other than the inserting program or else we would have to update the world.  We *should* have a facility to insert information obtained from protocols into the common tdeabc fields but this is a hard problem to solve neatly.
  - - I think it is not, ICQ phone number ~should~ be the same as all others one.  storing it here is just a way to *centralise* all information about someone.  Then, when you want to know his phone number, you look only there, and not at every place
- 		*problem: how to trust the information? that's why kabc could handle a source of the information
+ 		*problem: how to trust the information? that's why tdeabc could handle a source of the information
 
 
 KABC Participation modes
@@ -371,15 +371,15 @@ Scenario 2:
 Mandatory
 ~~~~~~~~~
 Scenario 1
-1) When fetching SSCL, automatically create synthetic kabc entries.
+1) When fetching SSCL, automatically create synthetic tdeabc entries.
 Scenario 2
-1) Fetch SSCL, ask user to create kabc entry normally.
+1) Fetch SSCL, ask user to create tdeabc entry normally.
 Hybrid 1-2
 1) Fetch SSCL
-2) Match SS contacts with kabc entries and associate automatically.  Unmatched contacts are associated with synthetic kabc entries.
+2) Match SS contacts with tdeabc entries and associate automatically.  Unmatched contacts are associated with synthetic tdeabc entries.
 
 -- For
-.) Can integrate with kabc contacts without disturbing user
+.) Can integrate with tdeabc contacts without disturbing user
 
 -- Against
 .) User has control of address book, this removes that control.
@@ -422,7 +422,7 @@ But how to use such as information available only at runtime, like the Status.
 2) KMail could contact Kopete via DCop
    --too bad if i want to use another IM Client?
 
-3) add an interface in kabc (or other) which could contact Kopete, or the IM which is actualy running.  This is in effect what dfaure suggested above.
+3) add an interface in tdeabc (or other) which could contact Kopete, or the IM which is actualy running.  This is in effect what dfaure suggested above.
 
 KDE Games/Desktop sharing use of Kopete
 ---------------------------------------
@@ -453,7 +453,7 @@ see also Bug 63297: "meta-contact" global(local) display nickname for all accoun
 
 Notes: some user might don't want to export their info the the server.
 
-Yes this would be cool.  I think we need a general UI to control the flow of contact information between kabc and kopete.  The myself issue is the same as the metacontacts issue.
+Yes this would be cool.  I think we need a general UI to control the flow of contact information between tdeabc and kopete.  The myself issue is the same as the metacontacts issue.
 
 
 What about the API?
@@ -461,7 +461,7 @@ What about the API?
 
  In KABC
 ---------
-The actual add to kabc could be performed in KopeteContactList::addMetaContact()
+The actual add to tdeabc could be performed in KopeteContactList::addMetaContact()
 
 ACW::accept() -> KopeteContactList::adddMetaContact()
 
@@ -486,9 +486,9 @@ Gof: This was not our idea, we intend not to pollute the KABC with any more extr
 so for example, the pgp plugin will request the public key:
 metacontact->data("application/pgp-public-key");
 
-if the contact is in KABC, then libkopete will request info from kabc. Else, it will take the data stored internaly in the contactlist.xml (Gof)
+if the contact is in KABC, then libkopete will request info from tdeabc. Else, it will take the data stored internaly in the contactlist.xml (Gof)
 
-This is a good question.  I think since we have the constraint that we have to keep kabc clean, this is the way to do it. (Will)
+This is a good question.  I think since we have the constraint that we have to keep tdeabc clean, this is the way to do it. (Will)
 
 for contacts same things.
 Anyway? what if we have several contact in one metacontact.
@@ -498,15 +498,15 @@ messenging/msn         =>   [email protected] ; [email protected]   (it's a StringList)
 messenging/nickname    =>    Mr. X ; Mr. Y
 
 that looks fine, but how to make sure than Mr. X is for [email protected], imagine if we have icq contact, or other? (Gof)
-We should never store nicknames in kabc.  The metacontact name should be taken from the kabc formatted name (Will)
+We should never store nicknames in tdeabc.  The metacontact name should be taken from the tdeabc formatted name (Will)
 
 Of course every fields shouldn't be stored in KABC (for example: MSN's groups, or others)
-to know what can be saved or not in kabc, i see two ways:
+to know what can be saved or not in tdeabc, i see two ways:
 1) KopeteMetaContact::setData( QString key , QString data , bool saveToKAB);
 2) if the key is or not recognized by KABC. example, if i save  "messaging/msn-groups"  KAB is not able to store it, so don't store it in KABC
 
 
-Syncing contactlist info currently takes place when Kopete exits.  other kabc apps write kabc during their runs.  We will have to make changes to do this and to make sure that we don't try to write 200 kabc entries simultaneously with individual tickets after fetching the SSCL for a new account.
+Syncing contactlist info currently takes place when Kopete exits.  other tdeabc apps write tdeabc during their runs.  We will have to make changes to do this and to make sure that we don't try to write 200 tdeabc entries simultaneously with individual tickets after fetching the SSCL for a new account.
 
 I don't think that syncing the KAB on an SSCL fetch is necessary. The only information we get when we fetch the SSCL is the contact name of that person who is on our SSCL, it's not until later, perhaps when we request the user info that we update the KAB. (Matt)
 
@@ -532,9 +532,9 @@ Association creates a 1:1 relationship between KMC and Addressee.  If we assume
 
 Association with existing contact: 1) No messaging information 2) Some messaging entries already exist.  Possible courses of action - add (only in KABC) accounts to MC - ask (how do we remember what the user wanted the next time we read the KABC)
 
-What if a related kabc entry is deleted while Kopete is running?
+What if a related tdeabc entry is deleted while Kopete is running?
 
-Deserialising contact from contactlist.xml - do we try to check the kabc entries and create any accounts that we find there but not in the contactlist.xml?
+Deserialising contact from contactlist.xml - do we try to check the tdeabc entries and create any accounts that we find there but not in the contactlist.xml?
 
 When to update KABC
 -------------------
@@ -544,7 +544,7 @@ NOT when starting kopete and the MC is filled with contacts!
 *) When adding a new contact (Use case: A new contact messages me, I add them to my contact list, and then I want to play a game with them, and invite them using IM, for example)
    KopeteContactList::addMetaContact()
 *) When linking an existing contact to KABC (so other apps gain the benefit of the new link)
-   handle this in KMC::setMetaContactId() - remember issues if a link is changed, do we delete the kabc fields?
+   handle this in KMC::setMetaContactId() - remember issues if a link is changed, do we delete the tdeabc fields?
 *) When adding new contacts to a KMC.
 	KMC::addContact()
 *) When moving contacts between KMCs. KC::setMetaContact()?
diff --git a/kopete/kopete/CMakeLists.txt b/kopete/kopete/CMakeLists.txt
index 8f7f6b98..054587cb 100644
--- a/kopete/kopete/CMakeLists.txt
+++ b/kopete/kopete/CMakeLists.txt
@@ -55,7 +55,7 @@ tde_add_executable( kopete AUTOMOC
     main.cpp kopeteapplication.cpp kopeteiface.cpp
     kopeteiface.skel systemtray.cpp kopeteballoon.cpp
     kopetewindow.cpp kopeteaccountstatusbaricon.cpp
-    kimifaceimpl.cpp kimiface.skel groupkabcselectorwidget.ui
+    kimifaceimpl.cpp kimiface.skel grouptdeabcselectorwidget.ui
     kopeteeditglobalidentitywidget.cpp
   LINK
     kopetecontactlist-static kopeteaddaccountwizard-static
diff --git a/kopete/kopete/Makefile.am b/kopete/kopete/Makefile.am
index 0dbf8f13..1ca1a35e 100644
--- a/kopete/kopete/Makefile.am
+++ b/kopete/kopete/Makefile.am
@@ -29,7 +29,7 @@ bin_PROGRAMS = kopete
 kopete_SOURCES = main.cpp 	kopeteapplication.cpp kopeteiface.cpp \
 		kopeteiface.skel 	systemtray.cpp 	kopeteballoon.cpp kopetewindow.cpp \
 			kopeteaccountstatusbaricon.cpp 	kimifaceimpl.cpp kimiface.skel kopeteeditglobalidentitywidget.cpp \
-	groupkabcselectorwidget.ui
+	grouptdeabcselectorwidget.ui
 
 kimiface_DIR = $(kde_includes)
 
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
index 7ec11d52..5b41ef0c 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp
@@ -74,7 +74,7 @@
 AddContactWizard::AddContactWizard( TQWidget *parent, const char *name )
 : AddContactWizard_Base( parent, name )
 {
-    //TQVBox *kabcPageVbox = new TQVBox(this->page(1));
+    //TQVBox *tdeabcPageVbox = new TQVBox(this->page(1));
 	m_addressbookSelectorWidget = new Kopete::UI::AddressBookSelectorWidget(this->page(1));
 	selectAddresseeLayout->addWidget(m_addressbookSelectorWidget);
 
@@ -224,7 +224,7 @@ void AddContactWizard::accept()
 		if ( chkAddressee->isChecked() && m_addressbookSelectorWidget->addresseeSelected() )
 		{
 			metaContact->setMetaContactId( m_addressbookSelectorWidget->addressee().uid() );
-			// if using kabc link, and the user didn't touch the mc name, set a kabc souce instead of custom
+			// if using tdeabc link, and the user didn't touch the mc name, set a tdeabc souce instead of custom
 			if ( chkAddressee->isChecked() && (m_addressbookSelectorWidget->addressee().realName() == mDisplayName->text()))
 			{
 				metaContact->setDisplayNameSource(Kopete::MetaContact::SourceKABC);
diff --git a/kopete/kopete/chatwindow/Makefile.am b/kopete/kopete/chatwindow/Makefile.am
index a70cabd3..3f6518d5 100644
--- a/kopete/kopete/chatwindow/Makefile.am
+++ b/kopete/kopete/chatwindow/Makefile.am
@@ -6,21 +6,21 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) -I$(top_srcdir)/kopet
 
 kopete_chatwindow_la_SOURCES = chatview.cpp kopetechatwindow.cpp chatmemberslistwidget.cpp
 kopete_chatwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
+kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
 
 kopete_emailwindow_la_SOURCES = kopeteemailwindow.cpp
 kopete_emailwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
+kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
 
 libkrichtexteditpart_la_SOURCES = krichtexteditpart.cpp
 libkrichtexteditpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
-libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_KSPELL) $(LIB_TDEPRINT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_TDEPARTS) $(LIB_TDESPELL) $(LIB_TDEPRINT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 libkopetechatwindow_la_SOURCES = chatmessagepart.cpp emoticonselector.cpp kopeteemoticonaction.cpp \
 	chattexteditpart.cpp krichtexteditpart.cpp kopetechatwindowstylemanager.cpp \
 	kopetechatwindowstyle.cpp 
 libkopetechatwindow_la_LDFLAGS = $(all_libraries) -no-undefined
-libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
+libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS)
 
 partdir = $(kde_datadir)/kopeterichtexteditpart
 part_DATA = kopeterichtexteditpartfull.rc
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp
index e095b458..815923a2 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp
@@ -25,8 +25,8 @@
 
 #include <kopetechatwindowstyle.h>
 
-KUNITTEST_MODULE( tdeunittest_chatwindowstyle_test, "KopeteChatWindowTestSuite");
-KUNITTEST_MODULE_REGISTER_TESTER( ChatWindowStyle_Test );
+TDEUNITTEST_MODULE( tdeunittest_chatwindowstyle_test, "KopeteChatWindowTestSuite");
+TDEUNITTEST_MODULE_REGISTER_TESTER( ChatWindowStyle_Test );
 
 void ChatWindowStyle_Test::allTests()
 {
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
index 177de9c6..a930b6f7 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
@@ -46,8 +46,8 @@
 
 using namespace Kopete;
 
-KUNITTEST_MODULE( tdeunittest_chatwindowstylerendering_test, "KopeteChatWindowTestSuite");
-KUNITTEST_MODULE_REGISTER_TESTER( ChatWindowStyleRendering_Test );
+TDEUNITTEST_MODULE( tdeunittest_chatwindowstylerendering_test, "KopeteChatWindowTestSuite");
+TDEUNITTEST_MODULE_REGISTER_TESTER( ChatWindowStyleRendering_Test );
 
 // Reimplement Kopete::Contact and its abstract method
 class FakeContact : public Kopete::Contact
diff --git a/kopete/kopete/config/accounts/Makefile.am b/kopete/kopete/config/accounts/Makefile.am
index 139d9b2e..b455b396 100644
--- a/kopete/kopete/config/accounts/Makefile.am
+++ b/kopete/kopete/config/accounts/Makefile.am
@@ -8,8 +8,8 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) $(all_includes) -I$(k
 kde_module_LTLIBRARIES = kcm_kopete_accountconfig.la
 
 kcm_kopete_accountconfig_la_SOURCES = kopeteaccountconfigbase.ui kopeteaccountconfig.cpp
-kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_accountconfig_la_LIBADD  = ../../../libkopete/libkopete.la ../../addaccountwizard/libkopeteaddaccountwizard.la $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_accountconfig_la_LIBADD  = ../../../libkopete/libkopete.la ../../addaccountwizard/libkopeteaddaccountwizard.la $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_accountconfig.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/kopete/config/appearance/Makefile.am b/kopete/kopete/config/appearance/Makefile.am
index a555ef57..d16188bd 100644
--- a/kopete/kopete/config/appearance/Makefile.am
+++ b/kopete/kopete/config/appearance/Makefile.am
@@ -13,7 +13,7 @@ kcm_kopete_appearanceconfig_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
 	$(all_libraries)
 kcm_kopete_appearanceconfig_la_LIBADD = ../../../libkopete/libkopete.la  \
 	../../../kopete/chatwindow/libkopetechatwindow.la \
-	-ltdetexteditor $(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_KNEWSTUFF)
+	-ltdetexteditor $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS) $(LIB_KNEWSTUFF)
 
 service_DATA = kopete_appearanceconfig.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/kopete/config/avdevice/Makefile.am b/kopete/kopete/config/avdevice/Makefile.am
index 24ace923..5e588a23 100644
--- a/kopete/kopete/config/avdevice/Makefile.am
+++ b/kopete/kopete/config/avdevice/Makefile.am
@@ -8,11 +8,11 @@ kde_module_LTLIBRARIES = kcm_kopete_avdeviceconfig.la
 kcm_kopete_avdeviceconfig_la_SOURCES = avdeviceconfig.cpp \
 	avdeviceconfig_videoconfig.ui
 
-kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kcm_kopete_avdeviceconfig_la_LIBADD  = ../../../libkopete/libkopete.la \
 	../../../libkopete/avdevice/libkopete_videodevice.la \
-	$(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+	$(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_avdeviceconfig.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/kopete/config/behavior/Makefile.am b/kopete/kopete/config/behavior/Makefile.am
index ef04b4ff..33866039 100644
--- a/kopete/kopete/config/behavior/Makefile.am
+++ b/kopete/kopete/config/behavior/Makefile.am
@@ -7,10 +7,10 @@ kcm_kopete_behaviorconfig_la_SOURCES = \
 	kopeteawayconfigbase.ui  \
 	behaviorconfig_chat.ui behaviorconfig_general.ui behaviorconfig_events.ui behaviorconfig.cpp
 
-kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kcm_kopete_behaviorconfig_la_LIBADD  = ../../../libkopete/libkopete.la \
-	$(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+	$(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_behaviorconfig.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/kopete/config/identity/Makefile.am b/kopete/kopete/config/identity/Makefile.am
index b69f72f9..64fdf05c 100644
--- a/kopete/kopete/config/identity/Makefile.am
+++ b/kopete/kopete/config/identity/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_kopete_identityconfig.la
 kcm_kopete_identityconfig_la_SOURCES = kopeteidentityconfigbase.ui \
 		kopeteidentityconfig.cpp globalidentitiesmanager.cpp kopeteidentityconfigpreferences.kcfgc
 kcm_kopete_identityconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kcm_kopete_identityconfig_la_LIBADD  = -ltdeabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kcm_kopete_identityconfig_la_LIBADD  = -ltdeabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 service_DATA = kopete_identityconfig.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
index 619c138b..e7ad4ac8 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
@@ -44,7 +44,7 @@
 #include <kpixmapregionselectordialog.h>
 #include <kmdcodec.h>
 
-// KDE KIO includes
+// KDE TDEIO includes
 #include <tdeio/netaccess.h>
 
 // KDE KABC(AddressBook) includes
@@ -53,7 +53,7 @@
 #include <tdeabc/addressee.h>
 
 // Kopete include
-#include "kabcpersistence.h"
+#include "tdeabcpersistence.h"
 #include "kopeteglobal.h"
 #include "kopeteaccountmanager.h"
 #include "kopeteprotocol.h"
diff --git a/kopete/kopete/config/plugins/Makefile.am b/kopete/kopete/config/plugins/Makefile.am
index 3ed239a1..b7d66dfb 100644
--- a/kopete/kopete/config/plugins/Makefile.am
+++ b/kopete/kopete/config/plugins/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libkopetepluginconfig.la
 
 libkopetepluginconfig_la_SOURCES = kopetepluginconfig.cpp
 libkopetepluginconfig_la_LDFLAGS = $(all_libraries)
-libkopetepluginconfig_la_LIBADD = $(LIB_KUTILS)
+libkopetepluginconfig_la_LIBADD = $(LIB_TDEUTILS)
 
 # vim: set noet:
 
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
diff --git a/kopete/kopete/groupkabcselectorwidget.ui b/kopete/kopete/grouptdeabcselectorwidget.ui
index d4d6d5cf..bdcf1045 100644
--- a/kopete/kopete/groupkabcselectorwidget.ui
+++ b/kopete/kopete/grouptdeabcselectorwidget.ui
@@ -43,13 +43,13 @@
                 </property>
                 <widget class="TQLabel" row="1" column="0">
                     <property name="name">
-                        <cstring>kabcLabel</cstring>
+                        <cstring>tdeabcLabel</cstring>
                     </property>
                     <property name="text">
                         <string>Addressbook entry:</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>kabcCombo</cstring>
+                        <cstring>tdeabcCombo</cstring>
                     </property>
                 </widget>
                 <widget class="Kopete::UI::AddressBookLinkWidget" row="1" column="1">
diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp
index 1b72b4b4..67836771 100644
--- a/kopete/kopete/kopeteapplication.cpp
+++ b/kopete/kopete/kopeteapplication.cpp
@@ -30,7 +30,7 @@
 #include <tdemessagebox.h>
 
 #include "addaccountwizard.h"
-#include "kabcpersistence.h"
+#include "tdeabcpersistence.h"
 #include "kopeteaccount.h"
 #include "kopeteaccountmanager.h"
 #include "kopetecommandhandler.h"
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index 398c4827..5d00b50b 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -56,8 +56,8 @@
 #include "addcontactpage.h"
 #include "addcontactwizard.h"
 #include "addressbooklinkwidget.h"
-#include "groupkabcselectorwidget.h"
-#include "kabcexport.h"
+#include "grouptdeabcselectorwidget.h"
+#include "tdeabcexport.h"
 #include "kopeteapplication.h"
 #include "kopeteaccount.h"
 #include "kopeteaway.h"
diff --git a/kopete/kopete/tdeconf_update/Makefile.am b/kopete/kopete/tdeconf_update/Makefile.am
index 8c4b949e..c997a2af 100644
--- a/kopete/kopete/tdeconf_update/Makefile.am
+++ b/kopete/kopete/tdeconf_update/Makefile.am
@@ -17,15 +17,15 @@ tdeconf_PROGRAMS = kopete-account-tdeconf_update kopete-pluginloader2-tdeconf_up
 tdeconfdir = $(libdir)/tdeconf_update_bin
 
 kopete_account_tdeconf_update_SOURCES = kopete-account-tdeconf_update.cpp
-kopete_account_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_account_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_account_tdeconf_update_LDADD = $(LIB_QT)
 
 kopete_pluginloader2_tdeconf_update_SOURCES = kopete-pluginloader2.cpp
-kopete_pluginloader2_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_pluginloader2_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_pluginloader2_tdeconf_update_LDADD = $(LIB_QT)
 
 kopete_nameTracking_tdeconf_update_SOURCES = kopete-nameTracking.cpp
-kopete_nameTracking_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_nameTracking_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_nameTracking_tdeconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE)
 
 # vim: set noet:
diff --git a/kopete/libkopete/CMakeLists.txt b/kopete/libkopete/CMakeLists.txt
index 113289cb..7c1130ea 100644
--- a/kopete/libkopete/CMakeLists.txt
+++ b/kopete/libkopete/CMakeLists.txt
@@ -46,7 +46,7 @@ install( FILES
     kopetemimetypehandler.h kopeteonlinestatus.h kopeteonlinestatusmanager.h
     kopetepasswordedaccount.h kopetepassword.h kopeteplugin.h
     kopeteprotocol.h kopetesimplemessagehandler.h kopetetask.h
-    kopetetransfermanager.h kopeteuiglobal.h kabcpersistence.h
+    kopetetransfermanager.h kopeteuiglobal.h tdeabcpersistence.h
     managedconnectionaccount.h kopetenotifydataobject.h
     kopeteversion.h kopeteprefs.h kopetepicture.h webcamwidget.h
     kopetepluginmanager.h kopeteblacklister.h
@@ -80,7 +80,7 @@ tde_add_library( kopete SHARED AUTOMOC
     kopetetask.cpp kopetemimesourcefactory.cpp kopeteeventpresentation.cpp
     kopetenotifyevent.cpp kopetenotifydataobject.cpp kopeteblacklister.cpp
     kopetemessageevent.cpp kopetemessagehandler.cpp kopetemessagehandlerchain.cpp
-    kopetesimplemessagehandler.cpp kopeteproperties.cpp kabcpersistence.cpp
+    kopetesimplemessagehandler.cpp kopeteproperties.cpp tdeabcpersistence.cpp
     connectionmanager.skel clientiface.stub managedconnectionaccount.cpp
     networkstatuscommon.h kopeteconfig.kcfgc kopeteutils.cpp
     kopeteprefs.cpp kopetepicture.cpp webcamwidget.cpp
diff --git a/kopete/libkopete/Makefile.am b/kopete/libkopete/Makefile.am
index 07d661f8..56fd99bb 100644
--- a/kopete/libkopete/Makefile.am
+++ b/kopete/libkopete/Makefile.am
@@ -30,19 +30,19 @@ libkopete_la_SOURCES = knotification.cpp connectionmanager.cpp kopeteonlinestatu
 	kopetemimetypehandler.cpp kopetetask.cpp kopetemimesourcefactory.cpp \
 	kopeteeventpresentation.cpp kopetenotifyevent.cpp kopetenotifydataobject.cpp kopeteblacklister.cpp \
 	kopetemessageevent.cpp kopetemessagehandler.cpp kopetemessagehandlerchain.cpp \
-	kopetesimplemessagehandler.cpp kopeteproperties.cpp kabcpersistence.cpp connectionmanager.skel \
+	kopetesimplemessagehandler.cpp kopeteproperties.cpp tdeabcpersistence.cpp connectionmanager.skel \
 	clientiface.stub managedconnectionaccount.cpp networkstatuscommon.h kopeteconfig.kcfgc kopeteutils.cpp \
 	kopeteprefs.cpp kopetepicture.cpp webcamwidget.cpp
 
 libkopete_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
-libkopete_la_LIBADD = -ltdeabc ui/libkopeteui.la $(COMPAT_LIBS) $(LIB_KIO) $(LIB_XSS) $(LIB_XRENDER)
+libkopete_la_LIBADD = -ltdeabc ui/libkopeteui.la $(COMPAT_LIBS) $(LIB_TDEIO) $(LIB_XSS) $(LIB_XRENDER)
 
 kde_kcfg_DATA = kopete.kcfg
 
 #AM_CXXFLAGS = -DQT_PLUGIN
 #kde_widget_LTLIBRARIES = libkopetewidgets.la
 #libkopetewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-#libkopetewidgets_la_LIBADD = $(LIB_KIO) libkopete.la ui/libkopeteui.la
+#libkopetewidgets_la_LIBADD = $(LIB_TDEIO) libkopete.la ui/libkopeteui.la
 #libkopetewidgets_la_SOURCES = ui/kopetewidgets.cpp
 
 kopetewidgets.cpp: $(srcdir)/kopete.widgets
@@ -62,7 +62,7 @@ kopeteinclude_HEADERS = kopeteaccount.h kopeteaccountmanager.h kopeteawayaction.
 	kopetechatsession.h kopetechatsessionmanager.h kopetemetacontact.h kopetemimetypehandler.h \
 	kopeteonlinestatus.h kopeteonlinestatusmanager.h kopetepasswordedaccount.h \
 	kopetepassword.h kopeteplugin.h kopeteprotocol.h kopetesimplemessagehandler.h kopetetask.h \
-	kopetetransfermanager.h kopeteuiglobal.h kabcpersistence.h managedconnectionaccount.h \
+	kopetetransfermanager.h kopeteuiglobal.h tdeabcpersistence.h managedconnectionaccount.h \
 	kopetenotifydataobject.h kopeteversion.h kopeteprefs.h kopetepicture.h webcamwidget.h \
 	kopetepluginmanager.h
 
diff --git a/kopete/libkopete/avdevice/Makefile.am b/kopete/libkopete/avdevice/Makefile.am
index 474d6a67..9036b3f2 100644
--- a/kopete/libkopete/avdevice/Makefile.am
+++ b/kopete/libkopete/avdevice/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CA
 METASOURCES = AUTO
 lib_LTLIBRARIES = libkopete_videodevice.la
 noinst_LTLIBRARIES = libkvideoio.la
-libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 noinst_HEADERS = kxv.h qvideo.h qvideostream.h videocontrol.h videodevice.h \
 	videodevicemodelpool.h videodevicepool.h videoinput.h \
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index 623fd2fd..4ea6909c 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -31,7 +31,7 @@
 #include <tdemessagebox.h>
 #include <knotifyclient.h>
 
-#include "kabcpersistence.h"
+#include "tdeabcpersistence.h"
 #include "kopetecontactlist.h"
 #include "kopeteaccount.h"
 #include "kopeteaccountmanager.h"
diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp
index 322a46f3..b1d9005e 100644
--- a/kopete/libkopete/kopetecontact.cpp
+++ b/kopete/libkopete/kopetecontact.cpp
@@ -26,7 +26,7 @@
 #include <tdeversion.h>
 #include <kinputdialog.h>
 
-#include <kabcpersistence.h>
+#include <tdeabcpersistence.h>
 #include <kdialogbase.h>
 #include <tdelocale.h>
 #include <tdepopupmenu.h>
@@ -343,7 +343,7 @@ void Contact::setMetaContact( MetaContact *m )
 		m->addContact( this );
 		m->insertChild( this );
 		// it is necessary to call this write here, because MetaContact::addContact() does not differentiate
-		// between adding completely new contacts (which should be written to kabc) and restoring upon restart
+		// between adding completely new contacts (which should be written to tdeabc) and restoring upon restart
 		// (where no write is needed).
 		KABCPersistence::self()->write( m );
 		connect( d->metaContact, TQT_SIGNAL( aboutToSave( Kopete::MetaContact * ) ),
diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp
index 394527d6..2a8d69c6 100644
--- a/kopete/libkopete/kopetecontactlist.cpp
+++ b/kopete/libkopete/kopetecontactlist.cpp
@@ -1097,7 +1097,7 @@ void ContactList::slotSaveLater()
 void ContactList::slotKABCChanged()
 {
 	// TODO: react to changes in KABC, replacing this function, post 3.4 (Will)
-	// call syncWithKABC on each metacontact to check if its associated kabc entry has changed.
+	// call syncWithKABC on each metacontact to check if its associated tdeabc entry has changed.
 /*	for ( MetaContact * mc = d->contacts.first(); mc; mc = d->contacts.next() )
 
 		mc->syncWithKABC();*/
diff --git a/kopete/libkopete/kopeteglobal.h b/kopete/libkopete/kopeteglobal.h
index 7ecc6f5b..926e2645 100644
--- a/kopete/libkopete/kopeteglobal.h
+++ b/kopete/libkopete/kopeteglobal.h
@@ -39,13 +39,13 @@ namespace Global
 	 * \brief Installs one or more kopete emoticon themes from a tarball
 	 * (either .kopete-emoticons or .tar.gz or .tar.bz2)
 	 *
-	 * @p localPath Full path to a local emoticon archive, use KIO to download
+	 * @p localPath Full path to a local emoticon archive, use TDEIO to download
 	 * files in case their are non-local.
 	 *
 	 * @return true in case install was successful, false otherwise. Errors are
-	 * displayed by either KIO or by using KMessagebox directly.
+	 * displayed by either TDEIO or by using KMessagebox directly.
 	 *
-	 * TODO: If possible, port it to KIO instead of using ugly blocking KTar
+	 * TODO: If possible, port it to TDEIO instead of using ugly blocking KTar
 	 **/
 	KOPETE_EXPORT void installEmoticonTheme(const TQString &localPath);
 
diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp
index 65d61106..68b77535 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -30,7 +30,7 @@
 #include <tdemessagebox.h>
 #include <tdeversion.h>
 
-#include "kabcpersistence.h"
+#include "tdeabcpersistence.h"
 #include "kopetecontactlist.h"
 #include "kopetecontact.h"
 #include "kopeteaccountmanager.h"
@@ -74,7 +74,7 @@ class  MetaContact::Private
 	Contact *displayNameSourceContact;
 	Contact *photoSourceContact;
 	
-	// used when source is kabc
+	// used when source is tdeabc
 	TQString metaContactId;
 	
 	// used when source is custom
@@ -93,7 +93,7 @@ class  MetaContact::Private
 	TQString photoSourcePID, photoSourceAID, photoSourceCID;
 
 	// The photo cache. Reduce disk access and CPU usage.
-	Picture customPicture, contactPicture, kabcPicture;
+	Picture customPicture, contactPicture, tdeabcPicture;
 };
 
 MetaContact::MetaContact()
@@ -610,8 +610,8 @@ TQString MetaContact::displayName() const
 	PropertySource source = displayNameSource();
 	if ( source == SourceKABC )
 	{
-		// kabc source, try to get from addressbook
-		// if the metacontact has a kabc association
+		// tdeabc source, try to get from addressbook
+		// if the metacontact has a tdeabc association
 		if ( !metaContactId().isEmpty() )
 			return nameFromKABC(metaContactId());
 	}
@@ -652,7 +652,7 @@ TQString nameFromKABC( const TQString &id ) /*const*/
 			return theAddressee.formattedName();
 		}
 	}
-	// no kabc association, return null image
+	// no tdeabc association, return null image
 	return TQString();
 }
 
@@ -700,7 +700,7 @@ Picture &MetaContact::picture() const
 {
 	if ( photoSource() == SourceKABC )
 	{
-		return d->kabcPicture;
+		return d->tdeabcPicture;
 	}
 	else if ( photoSource() == SourceContact )
 	{
@@ -762,7 +762,7 @@ TQImage photoFromKABC( const TQString &id ) /*const*/
 			}
 		}
 	}
-	// no kabc association, return null image
+	// no tdeabc association, return null image
 	return TQImage();
 }
 
@@ -1190,7 +1190,7 @@ bool MetaContact::fromXML( const TQDomElement& element )
 		else
 		{
 			// lets do the best conversion for the old name tracking
-			// if the custom display name is the same as kabc name, set the source to kabc
+			// if the custom display name is the same as tdeabc name, set the source to tdeabc
 			if ( !d->metaContactId.isEmpty() && ( d->displayName == nameFromKABC(d->metaContactId)) )
 				setDisplayNameSource(SourceKABC);
 			else
@@ -1304,7 +1304,7 @@ void MetaContact::slotUpdateAddressBookPicture()
 			if ( pic.data().isNull() && pic.url().isEmpty() )
 				pic = theAddressee.logo();
 
-			d->kabcPicture.setPicture(pic);
+			d->tdeabcPicture.setPicture(pic);
 		}
 	}
 }
@@ -1350,13 +1350,13 @@ void MetaContact::setMetaContactId( const TQString& newMetaContactId )
 		return;
 
 	// 1) Check the Id is not already used by another contact
-	// 2) cause a kabc write ( only in response to metacontactLVIProps calling this, or will
+	// 2) cause a tdeabc write ( only in response to metacontactLVIProps calling this, or will
 	//      write be called twice when creating a brand new MC? )
-	// 3) What about changing from one valid kabc to another, are kabc fields removed?
-	// 4) May be called with Null to remove an invalid kabc uid by KMC::toKABC()
+	// 3) What about changing from one valid tdeabc to another, are tdeabc fields removed?
+	// 4) May be called with Null to remove an invalid tdeabc uid by KMC::toKABC()
 	// 5) Is called when reading the saved contact list
 
-	// Don't remove IM addresses from kabc if we are changing contacts; 
+	// Don't remove IM addresses from tdeabc if we are changing contacts; 
 	// other programs may have written that data and depend on it
 	d->metaContactId = newMetaContactId;
 	KABCPersistence::self()->write( this );
@@ -1412,8 +1412,8 @@ void MetaContact::setPhotoSyncedWithKABC(bool b)
 				{
 					// Some protocols like MSN save the photo as a url in
 					// contact properties, we should not use this url
-					// to sync with kabc but try first to embed the
-					// photo data in the kabc addressee, because it could
+					// to sync with tdeabc but try first to embed the
+					// photo data in the tdeabc addressee, because it could
 					// be remote resource and the local url makes no sense
 					TQImage fallBackImage = TQImage(newValue.toString());
 					if(fallBackImage.isNull())
diff --git a/kopete/libkopete/kopetemetacontact.h b/kopete/libkopete/kopetemetacontact.h
index 2f918c73..15d82228 100644
--- a/kopete/libkopete/kopetemetacontact.h
+++ b/kopete/libkopete/kopetemetacontact.h
@@ -262,7 +262,7 @@ public:
 	void setPhotoSourceContact( Contact* contact );
 
 	/**
-	 * @return true if when a subcontact change his photo, the photo will be set to the kabc contact.
+	 * @return true if when a subcontact change his photo, the photo will be set to the tdeabc contact.
 	 */
 	bool isPhotoSyncedWithKABC() const;
 
@@ -373,7 +373,7 @@ public:
 	 * cannot be altered!
 	 *
 	 * @param p The Plugin by which uses this field
-	 * @param app refers to the application id in the libkabc database.
+	 * @param app refers to the application id in the libtdeabc database.
 	 * This should be a standardized format to make sense in the address
 	 * book in the first place - if you could use "" as application
 	 * then probably you should use the plugin data API instead of the
diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp
index b0758128..6a2d3279 100644
--- a/kopete/libkopete/kopeteprotocol.cpp
+++ b/kopete/libkopete/kopeteprotocol.cpp
@@ -194,7 +194,7 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact )
 			// The Unicode chars E000-F800 are non-printable and reserved for
 			// private use in applications. For more details, see also
 			// http://www.unicode.org/charts/PDF/UE000.pdf.
-			// Inside libkabc the use of TQChar( 0xE000 ) has been standardized
+			// Inside libtdeabc the use of TQChar( 0xE000 ) has been standardized
 			// as separator for the string lists, use this also for the 'normal'
 			// serialized data.
 			if( serializedData.contains( it.key() ) )
@@ -222,9 +222,9 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact )
 		// FIXME: This is a terrible hack to check the key name for the phrase "messaging/"
 		//        to indicate what app name to use, but for now it's by far the easiest
 		//        way to get this working.
-		//        Once all this is in CVS and the actual storage in libkabc is working
+		//        Once all this is in CVS and the actual storage in libtdeabc is working
 		//        we can devise a better API, but with the constantly changing
-		//        requirements every time I learn more about kabc I'd better no touch
+		//        requirements every time I learn more about tdeabc I'd better no touch
 		//        the API yet - Martijn
 		if( it.key().startsWith( TQString::fromLatin1( "messaging/" ) ) )
 		{
@@ -283,12 +283,12 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap<TQString, TQSt
 		//        book data in the deserializer yet, only when serializing.
 		//        - Martijn
 		TQMap<TQString, TQString> ad;
-		TQStringList kabcFields = addressBookFields();
-		for( TQStringList::Iterator fieldIt = kabcFields.begin(); fieldIt != kabcFields.end(); ++fieldIt )
+		TQStringList tdeabcFields = addressBookFields();
+		for( TQStringList::Iterator fieldIt = tdeabcFields.begin(); fieldIt != tdeabcFields.end(); ++fieldIt )
 		{
 			// FIXME: This hack is even more ugly, and has the same reasons as the similar
 			//        hack in the serialize code.
-			//        Once this code is actually capable of talking to kabc this hack
+			//        Once this code is actually capable of talking to tdeabc this hack
 			//        should be removed ASAP! - Martijn
 			if( ( *fieldIt ).startsWith( TQString::fromLatin1( "messaging/" ) ) )
 				ad[ *fieldIt ] = metaContact->addressBookField( this, *fieldIt, TQString::fromLatin1( "All" ) );
diff --git a/kopete/libkopete/kopetetransfermanager.h b/kopete/libkopete/kopetetransfermanager.h
index 0333fc5a..3df90adc 100644
--- a/kopete/libkopete/kopetetransfermanager.h
+++ b/kopete/libkopete/kopetetransfermanager.h
@@ -129,7 +129,7 @@ private:
 };
 
 /**
- * A KIO job for a kopete file transfer.
+ * A TDEIO job for a kopete file transfer.
  * @author Richard Smith <[email protected]>
  */
 class KOPETE_EXPORT Transfer : public TDEIO::Job
diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/tdeabcpersistence.cpp
index 0d03fc07..1fc46098 100644
--- a/kopete/libkopete/kabcpersistence.cpp
+++ b/kopete/libkopete/tdeabcpersistence.cpp
@@ -39,7 +39,7 @@
 #include "kopetepluginmanager.h"
 #include "kopeteprotocol.h"
 
-#include "kabcpersistence.h"
+#include "tdeabcpersistence.h"
 
 namespace Kopete
 {
@@ -218,7 +218,7 @@ void KABCPersistence::removeKABC( MetaContact *)
 	// This causes each Kopete::Protocol subclass to serialise its contacts' data into the metacontact's plugin data and address book data
 	emit aboutToSave(this);
 
-	// If the metacontact is linked to a kabc entry
+	// If the metacontact is linked to a tdeabc entry
 	if ( !d->metaContactId.isEmpty() )
 	{
 		//kdDebug( 14010 ) << k_funcinfo << "looking up Addressee for " << displayName() << "..." << endl;
@@ -449,4 +449,4 @@ void KABCPersistence::dumpAB()
 
 		// dump addressbook contents 
 
-#include "kabcpersistence.moc"
+#include "tdeabcpersistence.moc"
diff --git a/kopete/libkopete/kabcpersistence.h b/kopete/libkopete/tdeabcpersistence.h
index 3c5f4b0b..ea2b922a 100644
--- a/kopete/libkopete/kabcpersistence.h
+++ b/kopete/libkopete/tdeabcpersistence.h
@@ -25,7 +25,7 @@
 // *) Add Contact Wizard
 // *) KopeteMetaContact
 // *) KopeteAddrBookExport
-// *) 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
+// *) 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 tdeabc instance
 // *) Select addressbook entry
 
 namespace TDEABC
diff --git a/kopete/libkopete/tests/kopetecontactlist_test.cpp b/kopete/libkopete/tests/kopetecontactlist_test.cpp
index 6fb0db26..71dade85 100644
--- a/kopete/libkopete/tests/kopetecontactlist_test.cpp
+++ b/kopete/libkopete/tests/kopetecontactlist_test.cpp
@@ -23,8 +23,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_kopetecontactlist_test, "KopeteSuite");
-KUNITTEST_MODULE_REGISTER_TESTER( KopeteContactList_Test );
+TDEUNITTEST_MODULE( tdeunittest_kopetecontactlist_test, "KopeteSuite");
+TDEUNITTEST_MODULE_REGISTER_TESTER( KopeteContactList_Test );
 
 void KopeteContactList_Test::allTests()
 {
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp
index f57becaa..7121ff19 100644
--- a/kopete/libkopete/tests/kopeteemoticontest.cpp
+++ b/kopete/libkopete/tests/kopeteemoticontest.cpp
@@ -34,8 +34,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_kopeteemoticontest, "KopeteSuite");
-KUNITTEST_MODULE_REGISTER_TESTER( KopeteEmoticonTest );
+TDEUNITTEST_MODULE( tdeunittest_kopeteemoticontest, "KopeteSuite");
+TDEUNITTEST_MODULE_REGISTER_TESTER( KopeteEmoticonTest );
 
 /*
   There are three sets of tests, the Kopete 0.7 baseline with tests that were
diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
index 43f66f88..59b24396 100644
--- a/kopete/libkopete/tests/kopetemessage_test.cpp
+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
@@ -37,8 +37,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_kopetemessage_test, "KopeteSuite");
-KUNITTEST_MODULE_REGISTER_TESTER( KopeteMessage_Test );
+TDEUNITTEST_MODULE( tdeunittest_kopetemessage_test, "KopeteSuite");
+TDEUNITTEST_MODULE_REGISTER_TESTER( KopeteMessage_Test );
 
 /*
   There are four sets of tests: for each of plain text and html, we have those
diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp
index 19dcff47..cec5f9ec 100644
--- a/kopete/libkopete/tests/kopetepropertiestest.cpp
+++ b/kopete/libkopete/tests/kopetepropertiestest.cpp
@@ -32,8 +32,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_kopetepropertiestest, "KopeteSuite");
-KUNITTEST_MODULE_REGISTER_TESTER( KopetePropertiesTest );
+TDEUNITTEST_MODULE( tdeunittest_kopetepropertiestest, "KopeteSuite");
+TDEUNITTEST_MODULE_REGISTER_TESTER( KopetePropertiesTest );
 
 using namespace Kopete::Properties;
 
diff --git a/kopete/libkopete/tests/template_test.cpp b/kopete/libkopete/tests/template_test.cpp
index 919d25e0..8f349ac8 100644
--- a/kopete/libkopete/tests/template_test.cpp
+++ b/kopete/libkopete/tests/template_test.cpp
@@ -20,8 +20,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_template_test, "KopeteSuite");
-KUNITTEST_MODULE_REGISTER_TESTER( Template_Test );
+TDEUNITTEST_MODULE( tdeunittest_template_test, "KopeteSuite");
+TDEUNITTEST_MODULE_REGISTER_TESTER( Template_Test );
 
 void Template_Test::allTests()
 {
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 2ff65529..3df1ea9a 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -45,7 +45,7 @@
 
 #include "addressbookselectorwidget.h"
 #include <addresseeitem.h>
-#include "kabcpersistence.h"
+#include "tdeabcpersistence.h"
 
 using namespace Kopete::UI;
 
diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h
index 786db604..b69cdeee 100644
--- a/kopete/libkopete/ui/addresseeitem.h
+++ b/kopete/libkopete/ui/addresseeitem.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc.
+    This file is part of libtdeabc.
     Copyright (c) 2001 Cornelius Schumacher <[email protected]>
 
     This library is free software; you can redistribute it and/or
diff --git a/kopete/plugins/addbookmarks/Makefile.am b/kopete/plugins/addbookmarks/Makefile.am
index 006ed524..409535f6 100644
--- a/kopete/plugins/addbookmarks/Makefile.am
+++ b/kopete/plugins/addbookmarks/Makefile.am
@@ -6,12 +6,12 @@ noinst_HEADERS = addbookmarksplugin.h addbookmarkspreferences.h \
 
 kde_module_LTLIBRARIES = kopete_addbookmarks.la kcm_kopete_addbookmarks.la
 
-kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la
 kopete_addbookmarks_la_SOURCES = addbookmarksplugin.cpp addbookmarksprefssettings.cpp
 
-kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 kcm_kopete_addbookmarks_la_SOURCES = addbookmarkspreferences.cpp addbookmarksprefsui.ui \
                                      addbookmarksprefssettings.cpp
 
diff --git a/kopete/plugins/alias/Makefile.am b/kopete/plugins/alias/Makefile.am
index ee84eb0c..e5de8be3 100644
--- a/kopete/plugins/alias/Makefile.am
+++ b/kopete/plugins/alias/Makefile.am
@@ -4,12 +4,12 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_alias.la kcm_kopete_alias.la
 
 kopete_alias_la_SOURCES     = aliasplugin.cpp
-kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_alias_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_alias_la_SOURCES     = aliaspreferences.cpp aliasdialogbase.ui aliasdialog.ui editaliasdialog.cpp
-kcm_kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_alias_la_LIBADD      = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) ../../libkopete/libkopete.la
+kcm_kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_alias_la_LIBADD      = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS) ../../libkopete/libkopete.la
 
 service_DATA = kopete_alias.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/autoreplace/Makefile.am b/kopete/plugins/autoreplace/Makefile.am
index 3a0d6440..5ac7bcd8 100644
--- a/kopete/plugins/autoreplace/Makefile.am
+++ b/kopete/plugins/autoreplace/Makefile.am
@@ -6,12 +6,12 @@ SUBDIRS = icons
 kde_module_LTLIBRARIES = kopete_autoreplace.la kcm_kopete_autoreplace.la
 
 kopete_autoreplace_la_SOURCES     = autoreplaceplugin.cpp autoreplaceconfig.cpp
-kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_autoreplace_la_SOURCES     = autoreplacepreferences.cpp autoreplaceconfig.cpp autoreplaceprefs.ui
-kcm_kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_autoreplace.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/connectionstatus/Makefile.am b/kopete/plugins/connectionstatus/Makefile.am
index 11e3aee9..e341af6d 100644
--- a/kopete/plugins/connectionstatus/Makefile.am
+++ b/kopete/plugins/connectionstatus/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_connectionstatus.la
 
 kopete_connectionstatus_la_SOURCES     = connectionstatusplugin.cpp
-kopete_connectionstatus_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_connectionstatus_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_connectionstatus_la_LIBADD      = ../../libkopete/libkopete.la
 
 service_DATA = kopete_connectionstatus.desktop
diff --git a/kopete/plugins/contactnotes/Makefile.am b/kopete/plugins/contactnotes/Makefile.am
index 95a1e6b7..555f351b 100644
--- a/kopete/plugins/contactnotes/Makefile.am
+++ b/kopete/plugins/contactnotes/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_contactnotes.la
 
 kopete_contactnotes_la_SOURCES     = contactnotesplugin.cpp contactnotesedit.cpp
-kopete_contactnotes_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_contactnotes_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_contactnotes_la_LIBADD      = ../../libkopete/libkopete.la -ltdeio
 
 service_DATA = kopete_contactnotes.desktop
diff --git a/kopete/plugins/cryptography/Makefile.am b/kopete/plugins/cryptography/Makefile.am
index 8e90bbfc..ff3e4ba7 100644
--- a/kopete/plugins/cryptography/Makefile.am
+++ b/kopete/plugins/cryptography/Makefile.am
@@ -7,12 +7,12 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_cryptography.la kcm_kopete_cryptography.la
 
 kopete_cryptography_la_SOURCES     = cryptographyplugin.cpp kgpginterface.cpp cryptographyguiclient.cpp cryptographyselectuserkey.cpp cryptographyuserkey_ui.ui popuppublic.cpp kgpgselkey.cpp
-kopete_cryptography_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_cryptography_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_cryptography_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_cryptography_la_SOURCES = cryptographypreferences.cpp cryptographyprefsbase.ui  kgpgselkey.cpp
-kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_cryptography_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_cryptography_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_cryptography.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/highlight/Makefile.am b/kopete/plugins/highlight/Makefile.am
index 0340c2f5..c05b9698 100644
--- a/kopete/plugins/highlight/Makefile.am
+++ b/kopete/plugins/highlight/Makefile.am
@@ -7,12 +7,12 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_highlight.la kcm_kopete_highlight.la
 
 kopete_highlight_la_SOURCES = highlightplugin.cpp highlightconfig.cpp filter.cpp
-kopete_highlight_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_highlight_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_highlight_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_highlight_la_SOURCES = highlightprefsbase.ui highlightpreferences.cpp filter.cpp highlightconfig.cpp
-kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_highlight_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_highlight_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_highlight.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/history/Makefile.am b/kopete/plugins/history/Makefile.am
index c0066373..ec87074d 100644
--- a/kopete/plugins/history/Makefile.am
+++ b/kopete/plugins/history/Makefile.am
@@ -7,12 +7,12 @@ kde_module_LTLIBRARIES = kopete_history.la kcm_kopete_history.la
 kopete_history_la_SOURCES = historyplugin.cpp historydialog.cpp historyviewer.ui\
 	historylogger.cpp converter.cpp historyguiclient.cpp historyconfig.kcfgc
 
-kopete_history_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_KUTILS)
+kopete_history_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_TDEUTILS)
 kopete_history_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_history_la_SOURCES = historyprefsui.ui historypreferences.cpp  historyconfig.kcfgc
-kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_KUTILS)
-kcm_kopete_history_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_TDEUTILS)
+kcm_kopete_history_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_history.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/latex/Makefile.am b/kopete/plugins/latex/Makefile.am
index 74b977df..32198ae9 100644
--- a/kopete/plugins/latex/Makefile.am
+++ b/kopete/plugins/latex/Makefile.am
@@ -7,12 +7,12 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_latex.la kcm_kopete_latex.la
 
 kopete_latex_la_SOURCES = latexplugin.cpp latexconfig.kcfgc latexguiclient.cpp
-kopete_latex_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_latex_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_latex_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_latex_la_SOURCES = latexprefsbase.ui latexpreferences.cpp latexconfig.kcfgc
-kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_latex_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_latex_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_latex.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/motionautoaway/Makefile.am b/kopete/plugins/motionautoaway/Makefile.am
index 8f8bbaa3..2b349ca4 100644
--- a/kopete/plugins/motionautoaway/Makefile.am
+++ b/kopete/plugins/motionautoaway/Makefile.am
@@ -10,7 +10,7 @@ kopete_motionaway_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_motionaway_la_SOURCES = motionawayprefs.ui motionawaypreferences.cpp motionawayconfig.kcfgc
 kcm_kopete_motionaway_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
-kcm_kopete_motionaway_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_motionaway_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 
 
diff --git a/kopete/plugins/netmeeting/Makefile.am b/kopete/plugins/netmeeting/Makefile.am
index 27c5b0cb..54b08a5b 100644
--- a/kopete/plugins/netmeeting/Makefile.am
+++ b/kopete/plugins/netmeeting/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/protocols/msn $(all_incl
 kde_module_LTLIBRARIES = kopete_netmeeting.la kcm_kopete_netmeeting.la
 
 kopete_netmeeting_la_SOURCES     = netmeetingplugin.cpp netmeetinginvitation.cpp netmeetingguiclient.cpp
-kopete_netmeeting_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_netmeeting_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_netmeeting_la_LIBADD      = $(top_builddir)/kopete/libkopete/libkopete.la $(top_builddir)/kopete/protocols/msn/libkopete_msn_shared.la
 
 service_DATA = kopete_netmeeting.desktop
@@ -15,8 +15,8 @@ mydatadir = $(kde_datadir)/kopete_netmeeting
 mydata_DATA = netmeetingchatui.rc
 
 kcm_kopete_netmeeting_la_SOURCES = netmeetingprefs_ui.ui netmeetingpreferences.cpp
-kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_netmeeting_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_netmeeting_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 
 kcm_DATA = kopete_netmeeting_config.desktop
diff --git a/kopete/plugins/nowlistening/Makefile.am b/kopete/plugins/nowlistening/Makefile.am
index 69dbb38e..ac968eab 100644
--- a/kopete/plugins/nowlistening/Makefile.am
+++ b/kopete/plugins/nowlistening/Makefile.am
@@ -5,12 +5,12 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(XMMS_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
 
 kopete_nowlistening_la_SOURCES = nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
-kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_nowlistening_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
-kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_nowlistening_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_nowlistening_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_nowlistening.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/smpppdcs/Makefile.am b/kopete/plugins/smpppdcs/Makefile.am
index fe8792fc..54544d78 100644
--- a/kopete/plugins/smpppdcs/Makefile.am
+++ b/kopete/plugins/smpppdcs/Makefile.am
@@ -20,7 +20,7 @@ kcm_kopete_smpppdcs_la_SOURCES = smpppdcsprefs.ui smpppdcspreferences.cpp \
 	smpppdcsconfig.kcfgc
 kcm_kopete_smpppdcs_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
 kcm_kopete_smpppdcs_la_LIBADD  = libsmpppdclient/libsmpppdclient.la \
-	../../libkopete/libkopete.la $(LIB_KUTILS)
+	../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_smpppdcs.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/smpppdcs/unittest/Makefile.am b/kopete/plugins/smpppdcs/unittest/Makefile.am
index 3fc4fcee..b17fca53 100644
--- a/kopete/plugins/smpppdcs/unittest/Makefile.am
+++ b/kopete/plugins/smpppdcs/unittest/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 check_PROGRAMS = smpppdcstests
 
 smpppdcstests_SOURCES = main.cpp clienttest.cpp
-smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -ltdeunittestgui
 
 noinst_HEADERS = clienttest.h
diff --git a/kopete/plugins/statistics/Makefile.am b/kopete/plugins/statistics/Makefile.am
index e7cb9c25..1a27e4f3 100644
--- a/kopete/plugins/statistics/Makefile.am
+++ b/kopete/plugins/statistics/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kopete_statistics.la
 
 kopete_statistics_la_SOURCES = statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel
 
-kopete_statistics_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML)
+kopete_statistics_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML)
 kopete_statistics_la_LIBADD      = ../../libkopete/libkopete.la -lsqlite3
 
 service_DATA = kopete_statistics.desktop
diff --git a/kopete/plugins/texteffect/Makefile.am b/kopete/plugins/texteffect/Makefile.am
index 7f721dee..7f4c7d2e 100644
--- a/kopete/plugins/texteffect/Makefile.am
+++ b/kopete/plugins/texteffect/Makefile.am
@@ -6,12 +6,12 @@ INCLUDES = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_texteffect.la kcm_kopete_texteffect.la
 
 kopete_texteffect_la_SOURCES     = texteffectplugin.cpp texteffectconfig.cpp
-kopete_texteffect_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_texteffect_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_texteffect_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_texteffect_la_SOURCES = texteffectconfig.cpp texteffectprefs.ui texteffectpreferences.cpp
-kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_texteffect_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_texteffect_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_texteffect.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/translator/Makefile.am b/kopete/plugins/translator/Makefile.am
index fd58d26f..8c8be5bc 100644
--- a/kopete/plugins/translator/Makefile.am
+++ b/kopete/plugins/translator/Makefile.am
@@ -6,12 +6,12 @@ kde_module_LTLIBRARIES = kopete_translator.la kcm_kopete_translator.la
 
 kopete_translator_la_SOURCES     = translatorplugin.cpp  \
     translatordialog.cpp translatorguiclient.cpp translatorlanguages.cpp
-kopete_translator_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kopete_translator_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_KIO)
+kopete_translator_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_translator_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_TDEIO)
 
 kcm_kopete_translator_la_SOURCES = translatorprefsbase.ui translatorprefs.cpp translatorlanguages.cpp
-kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_translator_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_translator_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_translator.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 223d1d70..d5102bb9 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -278,7 +278,7 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ
 	TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
 	TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
 
-	// KIO is async and we use a sync API, so use the processEvents hack to work around that
+	// TDEIO is async and we use a sync API, so use the processEvents hack to work around that
 	// FIXME: We need to make the libkopete API async to get rid of this processEvents.
 	//        It often causes crashes in the code. - Martijn
 	while ( !m_completed[ job ] )
@@ -314,7 +314,7 @@ TQString TranslatorPlugin::babelTranslateMessage( const TQString &msg, const TQS
 	TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
 	TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
 
-	// KIO is async and we use a sync API, so use the processEvents hack to work around that
+	// TDEIO is async and we use a sync API, so use the processEvents hack to work around that
 	// FIXME: We need to make the libkopete API async to get rid of this processEvents.
 	//        It often causes crashes in the code. - Martijn
 	while ( !m_completed[ job ] )
diff --git a/kopete/plugins/webpresence/DESIGN b/kopete/plugins/webpresence/DESIGN
index e84fca85..a13b17f4 100644
--- a/kopete/plugins/webpresence/DESIGN
+++ b/kopete/plugins/webpresence/DESIGN
@@ -4,7 +4,7 @@ What It Does
 Provides a view of the current state of your contact list as a webpage.
 
 How It Does It
-Every so often, it writes a file containing a snapshot of who is online and who is not in your contactlist to a location you specify.  This can be a local file, an FTP server, a HTTP server, or anywhere else that KIO can access.
+Every so often, it writes a file containing a snapshot of who is online and who is not in your contactlist to a location you specify.  This can be a local file, an FTP server, a HTTP server, or anywhere else that TDEIO can access.
 
 Use TDEIO::NetAccess to upload the files!
 
diff --git a/kopete/plugins/webpresence/Makefile.am b/kopete/plugins/webpresence/Makefile.am
index eb91a345..ff55a95f 100644
--- a/kopete/plugins/webpresence/Makefile.am
+++ b/kopete/plugins/webpresence/Makefile.am
@@ -6,12 +6,12 @@ kde_module_LTLIBRARIES = kopete_webpresence.la kcm_kopete_webpresence.la
 
 kopete_webpresence_la_SOURCES     = webpresenceplugin.cpp
 
-kopete_webpresence_la_LDFLAGS     = -module  -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_webpresence_la_LDFLAGS     = -module  -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_webpresence_la_LIBADD      = ../../libkopete/libkopete.la $(LIBXML_LIBS) $(LIBXSLT_LIBS)
 
 kcm_kopete_webpresence_la_SOURCES = webpresencepreferences.cpp webpresenceprefs.ui
-kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_webpresence_la_LIBADD  = ../../libkopete/libkopete.la  $(LIB_KUTILS)
+kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_webpresence_la_LIBADD  = ../../libkopete/libkopete.la  $(LIB_TDEUTILS)
 
 service_DATA = kopete_webpresence.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/protocols/gadu/Makefile.am b/kopete/protocols/gadu/Makefile.am
index 442f8aea..f8741e94 100644
--- a/kopete/protocols/gadu/Makefile.am
+++ b/kopete/protocols/gadu/Makefile.am
@@ -22,7 +22,7 @@ kopete_gadu_la_SOURCES = gaduaway.cpp gadueditcontact.cpp gaducommands.cpp \
 			 gaducontactlist.cpp gadurichtextformat.cpp \
 			 gadudccserver.cpp gadudcctransaction.cpp gadudcc.cpp
 
-kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lgadu
+kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lgadu
 kopete_gadu_la_LIBADD  = ./ui/libgaduui.la \
 		       $(top_builddir)/kopete/libkopete/libkopete.la \
 		       $(GG_LIBS)
diff --git a/kopete/protocols/groupwise/Makefile.am b/kopete/protocols/groupwise/Makefile.am
index 51ac5463..955637aa 100644
--- a/kopete/protocols/groupwise/Makefile.am
+++ b/kopete/protocols/groupwise/Makefile.am
@@ -12,9 +12,9 @@ kde_module_LTLIBRARIES =  kopete_groupwise.la
 kopete_groupwise_la_SOURCES = gwprotocol.cpp gwcontact.cpp gwaccount.cpp \
 		gwbytestream.cpp gwconnector.cpp gwmessagemanager.cpp gwcontactlist.cpp
 kopete_groupwise_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
-	$(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+	$(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_groupwise_la_LIBADD = ui/libkopetegroupwiseui.la \
-	libgroupwise/libgroupwise.la ../../libkopete/libkopete.la $(LIB_KIO)
+	libgroupwise/libgroupwise.la ../../libkopete/libkopete.la $(LIB_TDEIO)
 
 service_DATA = kopete_groupwise.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/protocols/irc/Makefile.am b/kopete/protocols/irc/Makefile.am
index 93b5d46f..fb386b8d 100644
--- a/kopete/protocols/irc/Makefile.am
+++ b/kopete/protocols/irc/Makefile.am
@@ -22,11 +22,11 @@ kopete_irc_la_SOURCES = \
 	kcodecaction.cpp \
 	ksparser.cpp
 
-kopete_irc_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML)
+kopete_irc_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML)
 kopete_irc_la_LIBADD      = ../../libkopete/libkopete.la \
 		./ui/libkopeteircui.la \
 		./libkirc/libkirc.la \
-		$(LIB_KIO)
+		$(LIB_TDEIO)
 
 service_DATA = kopete_irc.desktop irc.protocol
 servicedir = $(kde_servicesdir)
diff --git a/kopete/protocols/irc/libkirc/Makefile.am b/kopete/protocols/irc/libkirc/Makefile.am
index e2ebe543..e1f30df8 100644
--- a/kopete/protocols/irc/libkirc/Makefile.am
+++ b/kopete/protocols/irc/libkirc/Makefile.am
@@ -14,7 +14,7 @@ libkirc_la_SOURCES = \
 	kirctransferserver.cpp \
 	ksslsocket.cpp
 libkirc_la_LDFLAGS = -no-undefined $(KDE_PLUGIN) $(all_libraries)
-libkirc_la_LIBADD = $(LIB_KIO)
+libkirc_la_LIBADD = $(LIB_TDEIO)
 
 AM_CPPFLAGS = -I$(top_srcdir)/kopete/protocols/irc $(KOPETE_INCLUDES) $(all_includes)
 METASOURCES = AUTO
diff --git a/kopete/protocols/jabber/Makefile.am b/kopete/protocols/jabber/Makefile.am
index 34337e63..40f24e0c 100644
--- a/kopete/protocols/jabber/Makefile.am
+++ b/kopete/protocols/jabber/Makefile.am
@@ -44,7 +44,7 @@ kopete_jabber_la_SOURCES = \
 	jabbertransport.cpp\
 	jabberbookmarks.cpp
 
-kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_jabber_la_LIBADD  = $(top_builddir)/kopete/libkopete/libkopete.la \
 	ui/libkopetejabberui.la \
 	libiris/iris/include/libiris.la \
diff --git a/kopete/protocols/jabber/tdeioslave/Makefile.am b/kopete/protocols/jabber/tdeioslave/Makefile.am
index af69843f..ed5b3da3 100644
--- a/kopete/protocols/jabber/tdeioslave/Makefile.am
+++ b/kopete/protocols/jabber/tdeioslave/Makefile.am
@@ -13,8 +13,8 @@ INCLUDES = \
 kde_module_LTLIBRARIES = tdeio_jabberdisco.la
 
 tdeio_jabberdisco_la_SOURCES = jabberdisco.cpp
-tdeio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO)
-tdeio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_TDEIO)
+tdeio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 noinst_HEADERS = jabberdisco.h
 
diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.h b/kopete/protocols/jabber/tdeioslave/jabberdisco.h
index a2bc92a4..c5817ec6 100644
--- a/kopete/protocols/jabber/tdeioslave/jabberdisco.h
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.h
@@ -1,6 +1,6 @@
 
 /***************************************************************************
-                   Jabber Service Discovery KIO Slave
+                   Jabber Service Discovery TDEIO Slave
                              -------------------
     begin                : Wed June 1 2005
     copyright            : (C) 2005 by Till Gerken <[email protected]>
diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol
index 7708d95f..bcdc35be 100644
--- a/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol
@@ -12,42 +12,42 @@ Icon=remote
 Description=A TDEIO slave for Jabber Service Discovery
 Description[be]=Модуль tdeioslave для пошуку сервісаў Jabber
 Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ
-Description[bs]=KIO slave za otkrivanje Jabber servisa
-Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber
+Description[bs]=TDEIO slave za otkrivanje Jabber servisa
+Description[ca]=Un esclau TDEIO pel servei de de descoberta del Jabber
 Description[cs]=Pomocný protokol pro zjišťování služeb Jabber
 Description[da]=En tdeioslave til at opdage jabber service
 Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten
 Description[el]=Ένα tdeioslave για την ανίχνευση υπηρεσίας Jabber
 Description[es]=Un «tdeioslave» para el servicio de descubrimiento jabber
-Description[et]=Jabberi teenuste tuvastamise KIO-moodul
-Description[eu]=Jabber aurkikuntza zerbitzureako KIO morroi bat
-Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber
+Description[et]=Jabberi teenuste tuvastamise TDEIO-moodul
+Description[eu]=Jabber aurkikuntza zerbitzureako TDEIO morroi bat
+Description[fa]=یک پیرو TDEIO برای خدمت اکتشافی Jabber
 Description[fr]=Un module d'entrée / sortie pour la recherche de service Jabber
-Description[gl]=Un KIO slave para Jabber Service Discovery
+Description[gl]=Un TDEIO slave para Jabber Service Discovery
 Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához
 Description[is]=tdeioslave fyrir Jabber þjónustu uppgötvun
-Description[it]=Un KIO slave per il servizio di discovery per Jabber
-Description[ja]=Jabber Service Discovery の KIO スレーブ
-Description[ka]=KIO slave Jabber სერვისის დირექტორიისთვის
-Description[kk]=Jabber қызметін байқау KIO slave қызметі
-Description[km]=KIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber
+Description[it]=Un TDEIO slave per il servizio di discovery per Jabber
+Description[ja]=Jabber Service Discovery の TDEIO スレーブ
+Description[ka]=TDEIO slave Jabber სერვისის დირექტორიისთვის
+Description[kk]=Jabber қызметін байқау TDEIO slave қызметі
+Description[km]=TDEIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber
 Description[lt]=Priedas (tdeioslave) FISH protokolui
 Description[nb]=En tdeioslave for Jabber tjenestesøk
 Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten
 Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ
 Description[nl]=Een tdeioslave voor Jabber Service Discovery
-Description[nn]=Ein KIO-slave for Jabber-tenesteoppdaging
-Description[pl]=Wtyczka protokołu KIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery)
+Description[nn]=Ein TDEIO-slave for Jabber-tenesteoppdaging
+Description[pl]=Wtyczka protokołu TDEIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery)
 Description[pt]=Um 'tdeioslave' para a Descoberta de Serviços do Jabber
-Description[pt_BR]=Um KIO-Slave para a descoberta de serviço do Jabber
-Description[ru]=Обработчик KIO для обнаружения служб Jabber
-Description[sk]=KIO otrok pre Jabber Service Discovery
-Description[sl]=KIO slave za odkrivanje storitev za Jabber
-Description[sr]=KIO слуга за Jabber Service Discovery
-Description[sr@Latn]=KIO sluga za Jabber Service Discovery
+Description[pt_BR]=Um TDEIO-Slave para a descoberta de serviço do Jabber
+Description[ru]=Обработчик TDEIO для обнаружения служб Jabber
+Description[sk]=TDEIO otrok pre Jabber Service Discovery
+Description[sl]=TDEIO slave za odkrivanje storitev za Jabber
+Description[sr]=TDEIO слуга за Jabber Service Discovery
+Description[sr@Latn]=TDEIO sluga za Jabber Service Discovery
 Description[sv]=En I/O-slav för Jabber tjänstupptäckt
 Description[tr]=Jabber Servis Bulucu için KIOSlave
 Description[uk]=Підлеглий В/В для виявлення служби Jabber
-Description[zh_CN]=Jabber 服务发现的 KIO slave
-Description[zh_HK]=用於發現 Jabber 服務的 KIO slave
+Description[zh_CN]=Jabber 服务发现的 TDEIO slave
+Description[zh_HK]=用於發現 Jabber 服務的 TDEIO slave
 Description[zh_TW]=Jabber 服務的 tdeioslave
diff --git a/kopete/protocols/meanwhile/Makefile.am b/kopete/protocols/meanwhile/Makefile.am
index 54728267..20a03725 100644
--- a/kopete/protocols/meanwhile/Makefile.am
+++ b/kopete/protocols/meanwhile/Makefile.am
@@ -28,7 +28,7 @@ kopete_meanwhile_la_SOURCES = \
 	meanwhileplugin.cpp
 
 kopete_meanwhile_la_LDFLAGS = -no-undefined -module \
-	$(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+	$(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 kopete_meanwhile_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \
 	ui/libkopetemeanwhileui.la $(MEANWHILE_LIBS)
diff --git a/kopete/protocols/msn/Makefile.am b/kopete/protocols/msn/Makefile.am
index da3fbcb1..5248d295 100644
--- a/kopete/protocols/msn/Makefile.am
+++ b/kopete/protocols/msn/Makefile.am
@@ -25,13 +25,13 @@ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp \
 	p2p.cpp messageformatter.cpp incomingtransfer.cpp outgoingtransfer.cpp \
 	webcam.cpp
 
-libkopete_msn_shared_la_LIBADD  = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(WEBCAM_LIBMINICWRAPPER) ../../libkopete/avdevice/libkopete_videodevice.la   $(LIB_KIO)
-libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
+libkopete_msn_shared_la_LIBADD  = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(WEBCAM_LIBMINICWRAPPER) ../../libkopete/avdevice/libkopete_videodevice.la   $(LIB_TDEIO)
+libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
 
 kopete_msn_la_SOURCES = dummy.cpp webcam.cpp
 kopete_msn_la_LIBADD = libkopete_msn_shared.la
 
-kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
+kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/
 
 dummy.cpp: $(srcdir)/Makefile.am
 	echo '#include "kdemacros.h"' > $@
diff --git a/kopete/protocols/msn/config/Makefile.am b/kopete/protocols/msn/config/Makefile.am
index f01cb0f1..2d84950e 100644
--- a/kopete/protocols/msn/config/Makefile.am
+++ b/kopete/protocols/msn/config/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kcm_kopete_msn.la
 
 kcm_kopete_msn_la_SOURCES = msnprefs.ui msnpreferences.cpp
-kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_msn_la_LIBADD  = ../../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_msn_la_LIBADD  = ../../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_msn_config.desktop
 servicedir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index 40d45b51..e58c3800 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -679,7 +679,7 @@ void MSNContact::setDisplayPicture(KTempFile *f)
 	f->setAutoDelete(false);
 	delete f;
 
-	//let the time to KIO to copy the file
+	//let the time to TDEIO to copy the file
 	connect(j, TQT_SIGNAL(result(TDEIO::Job *)) , this, TQT_SLOT(slotEmitDisplayPictureChanged() ));
 }
 
diff --git a/kopete/protocols/msn/msnsecureloginhandler.h b/kopete/protocols/msn/msnsecureloginhandler.h
index ea7a87b0..5dc4a277 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.h
+++ b/kopete/protocols/msn/msnsecureloginhandler.h
@@ -27,7 +27,7 @@ namespace TDEIO
 
 /**
  * This class handle the login process. It connect to the .NET Password service and retrive the ticket(tweener) to login.
- * Use KIO.
+ * Use TDEIO.
  *
  * @author Michaël Larouche <[email protected]>
 */
diff --git a/kopete/protocols/oscar/Makefile.am b/kopete/protocols/oscar/Makefile.am
index c782e8c1..93f1f859 100644
--- a/kopete/protocols/oscar/Makefile.am
+++ b/kopete/protocols/oscar/Makefile.am
@@ -12,4 +12,4 @@ libkopete_oscar_la_SOURCES = oscaraccount.cpp oscarcontact.cpp oscarmyselfcontac
 	oscarvisibilitybase.ui oscarvisibilitydialog.cpp \
 	oscarversionupdater.cpp
 libkopete_oscar_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(all_libraries)
-libkopete_oscar_la_LIBADD  = $(LIB_KIO) $(top_builddir)/kopete/libkopete/libkopete.la ./liboscar/liboscar.la
+libkopete_oscar_la_LIBADD  = $(LIB_TDEIO) $(top_builddir)/kopete/libkopete/libkopete.la ./liboscar/liboscar.la
diff --git a/kopete/protocols/oscar/aim/Makefile.am b/kopete/protocols/oscar/aim/Makefile.am
index 616a5501..5d1cc8b6 100644
--- a/kopete/protocols/oscar/aim/Makefile.am
+++ b/kopete/protocols/oscar/aim/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = kopete_aim.la
 
 kopete_aim_la_SOURCES = aimprotocol.cpp aimaccount.cpp aimcontact.cpp aimuserinfo.cpp aimjoinchat.cpp aimchatsession.cpp
 
-kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_aim_la_LIBADD  = ../libkopete_oscar.la ui/libkopeteaimui.la \
 	$(top_builddir)/kopete/libkopete/libkopete.la
 
diff --git a/kopete/protocols/oscar/icq/Makefile.am b/kopete/protocols/oscar/icq/Makefile.am
index dc2e491a..81d1f488 100644
--- a/kopete/protocols/oscar/icq/Makefile.am
+++ b/kopete/protocols/oscar/icq/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kopete_icq.la
 kopete_icq_la_SOURCES = icqpresence.cpp icqaccount.cpp icqcontact.cpp icqprotocol.cpp
 # icquserinfo.cpp icqreadaway.cpp icqsendsmsdialog.cpp
 
-kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_icq_la_LIBADD  = ../libkopete_oscar.la \
 	$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteicqui.la
 
diff --git a/kopete/protocols/oscar/liboscar/tests/Makefile.am b/kopete/protocols/oscar/liboscar/tests/Makefile.am
index 2e1fad6a..72fd8d64 100644
--- a/kopete/protocols/oscar/liboscar/tests/Makefile.am
+++ b/kopete/protocols/oscar/liboscar/tests/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 check_PROGRAMS = tdeunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest
 
 tdeunittest_SOURCES = main.cpp tdeunittest.cpp chatnavtests.cpp
-tdeunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdeunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 tdeunittest_LDADD = $(LIB_TDECORE) ../liboscar.la
 
 clientstream_test_SOURCES = clientstream_test.cpp
diff --git a/kopete/protocols/oscar/liboscar/tests/tdeunittest.h b/kopete/protocols/oscar/liboscar/tests/tdeunittest.h
index d3ceee97..61f891e8 100644
--- a/kopete/protocols/oscar/liboscar/tests/tdeunittest.h
+++ b/kopete/protocols/oscar/liboscar/tests/tdeunittest.h
@@ -24,8 +24,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef KUNITTEST_H
-#define KUNITTEST_H
+#ifndef TDEUNITTEST_H
+#define TDEUNITTEST_H
 
 #include "tester.h"
 
diff --git a/kopete/protocols/sms/Makefile.am b/kopete/protocols/sms/Makefile.am
index 6a42aebc..9fbd17c5 100644
--- a/kopete/protocols/sms/Makefile.am
+++ b/kopete/protocols/sms/Makefile.am
@@ -15,7 +15,7 @@ kopete_sms_la_SOURCES = smsaddcontactpage.cpp smscontact.cpp smseditaccountwidge
 kopete_sms_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
 kopete_sms_la_LIBADD  = ./ui/libkopetesmsui.la \
 	./services/libkopetesmsservices.la \
-	../../libkopete/libkopete.la  $(LIB_KIO)
+	../../libkopete/libkopete.la  $(LIB_TDEIO)
 
 service_DATA = kopete_sms.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/protocols/testbed/Makefile.am b/kopete/protocols/testbed/Makefile.am
index f7da072c..4bc8e209 100644
--- a/kopete/protocols/testbed/Makefile.am
+++ b/kopete/protocols/testbed/Makefile.am
@@ -7,9 +7,9 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(srcdir)/ui -Iui $(all_includes)
 noinst_HEADERS = testbedprotocol.h testbedcontact.h testbedaccount.h testbedaddcontactpage.h testbededitaccountwidget.h testbedfakeserver.h testbedincomingmessage.h
 kde_module_LTLIBRARIES =  kopete_testbed.la
 kopete_testbed_la_SOURCES = testbedprotocol.cpp testbedcontact.cpp testbedaccount.cpp testbedaddcontactpage.cpp testbedaddui.ui testbededitaccountwidget.cpp testbedaccountpreferences.ui testbedfakeserver.cpp testbedincomingmessage.cpp
-kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_testbed_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \
-	ui/libkopetetestbedui.la ../../libkopete/libkopete.la $(LIB_KIO)
+	ui/libkopetetestbedui.la ../../libkopete/libkopete.la $(LIB_TDEIO)
 
 service_DATA = kopete_testbed.desktop
 servicedir= $(kde_servicesdir)
diff --git a/kopete/protocols/winpopup/Makefile.am b/kopete/protocols/winpopup/Makefile.am
index 2bb8a143..ac798166 100644
--- a/kopete/protocols/winpopup/Makefile.am
+++ b/kopete/protocols/winpopup/Makefile.am
@@ -11,9 +11,9 @@ kde_module_LTLIBRARIES = kopete_wp.la
 noinst_HEADERS = wpprotocol.h wpeditaccount.h wpaccount.h wpuserinfo.h wpcontact.h wpaddcontact.h
 
 kopete_wp_la_SOURCES = wpprotocol.cpp wpcontact.cpp  wpaddcontact.cpp wpeditaccount.cpp  wpaccount.cpp wpuserinfo.cpp
-kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_wp_la_LIBADD = ../../libkopete/libkopete.la ./ui/libkopetewpui.la \
-	./libwinpopup/libwinpopup.la $(LIB_KIO)
+	./libwinpopup/libwinpopup.la $(LIB_TDEIO)
 
 service_DATA = kopete_wp.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/protocols/yahoo/Makefile.am b/kopete/protocols/yahoo/Makefile.am
index 384188a9..a0ef0fe7 100644
--- a/kopete/protocols/yahoo/Makefile.am
+++ b/kopete/protocols/yahoo/Makefile.am
@@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = kopete_yahoo.la
 kopete_yahoo_la_SOURCES = yahooprotocol.cpp yahoocontact.cpp \
 	yahooaddcontact.cpp yahooaccount.cpp yahooeditaccount.cpp yahooconferencemessagemanager.cpp \
 	yahoochatsession.cpp yahooverifyaccount.cpp yahoowebcam.cpp
-kopete_yahoo_la_LDFLAGS     = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_yahoo_la_LDFLAGS     = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_yahoo_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \
 	$(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteyahooui.la libkyahoo/libkyahoo.la