Rename a number of libraries and executables to avoid conflicts with KDE4

127 files changed, 339 insertions, 339 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d9d5cd..e376de1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,7 @@ option( BUILD_KMILO "Build kmilo" ${BUILD_ALL} )
 option( BUILD_KREGEXPEDITOR "Build kregexpeditor" ${BUILD_ALL} )
 option( BUILD_KSIM "Build ksim" ${BUILD_ALL} )
 option( BUILD_KTIMER "Build ktimer" ${BUILD_ALL} )
-option( BUILD_KWALLET "Build kwallet" ${BUILD_ALL} )
+option( BUILD_KWALLET "Build tdewallet" ${BUILD_ALL} )
 
 option( BUILD_SUPERKARAMBA "Build superkaramba" ${BUILD_ALL} )
 
@@ -173,7 +173,7 @@ tde_conditional_add_subdirectory( BUILD_KMILO kmilo )
 tde_conditional_add_subdirectory( BUILD_KREGEXPEDITOR kregexpeditor )
 tde_conditional_add_subdirectory( BUILD_KSIM ksim )
 tde_conditional_add_subdirectory( BUILD_KTIMER ktimer )
-tde_conditional_add_subdirectory( BUILD_KWALLET kwallet )
+tde_conditional_add_subdirectory( BUILD_KWALLET tdewallet )
 tde_conditional_add_subdirectory( BUILD_SUPERKARAMBA superkaramba )
 
 
diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt
index fa15179..c0ea58a 100644
--- a/ark/CMakeLists.txt
+++ b/ark/CMakeLists.txt
@@ -39,7 +39,7 @@ tde_add_library( ark_common STATIC_PIC
 
 tde_add_tdeinit_executable( ark AUTOMOC
   SOURCES main.cpp arkapp.cpp mainwindow.cpp
-  LINK ark_common-static khtml-shared
+  LINK ark_common-static tdehtml-shared
 )
 
 
@@ -49,12 +49,12 @@ tde_add_kpart( libarkpart AUTOMOC
   SOURCES ark_part.cpp arkfactory.cpp zip.cpp
     tar.cpp filelistview.cpp arch.cpp lha.cpp
     compressedfile.cpp zoo.cpp rar.cpp ar.cpp
-    arkutils.cpp archiveformatdlg.cpp
+    artdeutils.cpp archiveformatdlg.cpp
     arkwidget.cpp searchbar.cpp addition.ui
     extraction.ui general.ui arkviewer.cpp
     sevenzip.cpp extractiondialog.cpp ace.cpp
     tarlistingthread.cpp arj.cpp
-  LINK ark_common-static khtml-shared
+  LINK ark_common-static tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/ark/Makefile.am b/ark/Makefile.am
index 14f33f5..aa26f03 100644
--- a/ark/Makefile.am
+++ b/ark/Makefile.am
@@ -27,7 +27,7 @@ libarkpart_la_COMPILE_FIRST = settings.h
 libarkpart_la_SOURCES = ark_part.cpp arkfactory.cpp zip.cpp tar.cpp \
                         filelistview.cpp arch.cpp lha.cpp \
                         compressedfile.cpp zoo.cpp rar.cpp \
-                        ar.cpp arkutils.cpp archiveformatdlg.cpp \
+                        ar.cpp artdeutils.cpp archiveformatdlg.cpp \
                         arkwidget.cpp searchbar.cpp \
                         addition.ui extraction.ui general.ui \
                         arkviewer.cpp sevenzip.cpp extractiondialog.cpp \
diff --git a/ark/arch.cpp b/ark/arch.cpp
index 18a589a..cd3d186 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -47,7 +47,7 @@
 // ark includes
 #include "arch.h"
 #include "arkwidget.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 // the archive types
diff --git a/ark/arj.cpp b/ark/arj.cpp
index 146df76..79574b1 100644
--- a/ark/arj.cpp
+++ b/ark/arj.cpp
@@ -42,7 +42,7 @@
 #include "arj.h"
 #include "arkwidget.h"
 #include "settings.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 ArjArch::ArjArch( ArkWidget *_gui, const TQString & _fileName )
diff --git a/ark/ark_part.h b/ark/ark_part.h
index 6ec3202..1057395 100644
--- a/ark/ark_part.h
+++ b/ark/ark_part.h
@@ -23,10 +23,10 @@
 #ifndef ARK_PART_H
 #define ARK_PART_H
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <kparts/statusbarextension.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/statusbarextension.h>
+#include <tdeparts/factory.h>
 #include <kaction.h>
 #include <kprogress.h>
 
diff --git a/ark/ark_part.rc b/ark/ark_part.rc
index 086765f..44605ca 100644
--- a/ark/ark_part.rc
+++ b/ark/ark_part.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="8">
+<kpartgui name="ark_tdeparts" version="8">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
     <Action name="deselect_all" icon="ark_deselectall"/>
diff --git a/ark/ark_part_readonly.rc b/ark/ark_part_readonly.rc
index 84f4f02..c325723 100644
--- a/ark/ark_part_readonly.rc
+++ b/ark/ark_part_readonly.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="ark_kparts" version="7">
+<kpartgui name="ark_tdeparts" version="7">
 <ActionProperties>
     <Action name="select_all" icon="ark_selectall"/>
 </ActionProperties>
diff --git a/ark/arkfactory.h b/ark/arkfactory.h
index 51b4933..5207ac4 100644
--- a/ark/arkfactory.h
+++ b/ark/arkfactory.h
@@ -21,7 +21,7 @@
 
 #ifndef ARKFACTORY_H
 #define ARKFACTORY_H
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
 class ArkFactory : public KParts::Factory
 {
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index 13dbfbe..7a2dda9 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -22,7 +22,7 @@
 #include "arkviewer.h"
 
 #include <klocale.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kmimetype.h>
 #include <kdebug.h>
 #include <kurl.h>
diff --git a/ark/arkviewer.h b/ark/arkviewer.h
index 5fc3849..af04c80 100644
--- a/ark/arkviewer.h
+++ b/ark/arkviewer.h
@@ -23,7 +23,7 @@
  */
 
 #include <kdialogbase.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 class ArkViewer : public KDialogBase
 {
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index 5931f8b..c49760d 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -75,7 +75,7 @@
 #include "extractiondialog.h"
 #include "arkwidget.h"
 #include "filelistview.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "archiveformatinfo.h"
 #include "compressedfile.h"
 #include "searchbar.h"
diff --git a/ark/arkutils.cpp b/ark/artdeutils.cpp
index 52049d0..dbf5395 100644
--- a/ark/arkutils.cpp
+++ b/ark/artdeutils.cpp
@@ -72,7 +72,7 @@
 // TQt includes
 #include <tqfile.h>
 
-#include "arkutils.h"
+#include "artdeutils.h"
 
 TQString ArkUtils::getTimeStamp(const TQString &_month,
                             const TQString &_day,
diff --git a/ark/arkutils.h b/ark/artdeutils.h
index baed64b..baed64b 100644
--- a/ark/arkutils.h
+++ b/ark/artdeutils.h
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index 8057828..9974252 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -48,7 +48,7 @@
 #include <kurlpixmapprovider.h>
 #include <kdebug.h>
 
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "settings.h"
 
 ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
diff --git a/ark/lha.cpp b/ark/lha.cpp
index 045be09..f0074aa 100644
--- a/ark/lha.cpp
+++ b/ark/lha.cpp
@@ -49,7 +49,7 @@
 #include "settings.h"
 #include "arch.h"
 #include "lha.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 LhaArch::LhaArch( ArkWidget *_gui, const TQString & _fileName )
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 2c9a957..21ffb08 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -32,8 +32,8 @@
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kparts/componentfactory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/browserextension.h>
 #include <kkeydialog.h>
 #include <kcombobox.h>
 #include <kio/netaccess.h>
diff --git a/ark/mainwindow.h b/ark/mainwindow.h
index d448e8c..c878942 100644
--- a/ark/mainwindow.h
+++ b/ark/mainwindow.h
@@ -31,8 +31,8 @@
 
 // KDE includes
 #include <kmainwindow.h>
-#include <kparts/mainwindow.h>
-#include <kparts/part.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/part.h>
 #include <kprogress.h>
 
 class ArkWidget;
diff --git a/ark/rar.cpp b/ark/rar.cpp
index 2b015f5..500b338 100644
--- a/ark/rar.cpp
+++ b/ark/rar.cpp
@@ -49,7 +49,7 @@
 #include "arch.h"
 #include "settings.h"
 #include "rar.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName )
diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp
index 3ddf02f..c683f67 100644
--- a/ark/sevenzip.cpp
+++ b/ark/sevenzip.cpp
@@ -39,7 +39,7 @@
 #include "sevenzip.h"
 #include "arkwidget.h"
 #include "settings.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 SevenZipArch::SevenZipArch( ArkWidget *gui, const TQString &filename )
diff --git a/ark/zoo.cpp b/ark/zoo.cpp
index f94abdb..c9814b4 100644
--- a/ark/zoo.cpp
+++ b/ark/zoo.cpp
@@ -46,7 +46,7 @@
 #include "arkwidget.h"
 #include "arch.h"
 #include "zoo.h"
-#include "arkutils.h"
+#include "artdeutils.h"
 #include "filelistview.h"
 
 static TQString fixTime( const TQString &_strTime );
diff --git a/doc/kwallet/CMakeLists.txt b/doc/tdewallet/CMakeLists.txt
index 7edec8e..d75cc35 100644
--- a/doc/kwallet/CMakeLists.txt
+++ b/doc/tdewallet/CMakeLists.txt
@@ -9,5 +9,5 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kwallet )
+tde_create_handbook( DESTINATION tdewallet )
 
diff --git a/doc/kwallet/Makefile.am b/doc/tdewallet/Makefile.am
index 085981d..085981d 100644
--- a/doc/kwallet/Makefile.am
+++ b/doc/tdewallet/Makefile.am
diff --git a/doc/kwallet/cr22-action-wallet_closed.png b/doc/tdewallet/cr22-action-wallet_closed.png
index 57558ac..57558ac 100644
--- a/doc/kwallet/cr22-action-wallet_closed.png
+++ b/doc/tdewallet/cr22-action-wallet_closed.png
diff --git a/doc/kwallet/cr22-action-wallet_open.png b/doc/tdewallet/cr22-action-wallet_open.png
index 55a447f..55a447f 100644
--- a/doc/kwallet/cr22-action-wallet_open.png
+++ b/doc/tdewallet/cr22-action-wallet_open.png
diff --git a/doc/kwallet/edit1.png b/doc/tdewallet/edit1.png
index 1d0fe7c..1d0fe7c 100644
--- a/doc/kwallet/edit1.png
+++ b/doc/tdewallet/edit1.png
diff --git a/doc/kwallet/edit2.png b/doc/tdewallet/edit2.png
index 05b6dd8..05b6dd8 100644
--- a/doc/kwallet/edit2.png
+++ b/doc/tdewallet/edit2.png
diff --git a/doc/kwallet/edit3.png b/doc/tdewallet/edit3.png
index 9292870..9292870 100644
--- a/doc/kwallet/edit3.png
+++ b/doc/tdewallet/edit3.png
diff --git a/doc/kwallet/index.docbook b/doc/tdewallet/index.docbook
index 96a9a59..dcc9304 100644
--- a/doc/kwallet/index.docbook
+++ b/doc/tdewallet/index.docbook
@@ -1,16 +1,16 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kwallet "<application>KWallet</application>">
-  <!ENTITY kwalletmanager "<application>KWallet Manager</application>">
+  <!ENTITY tdewallet "<application>KWallet</application>">
+  <!ENTITY tdewalletmanager "<application>KWallet Manager</application>">
   <!ENTITY package "tdeutils">
-  <!ENTITY kappname "&kwallet;">
+  <!ENTITY kappname "&tdewallet;">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title>The &kwallet; Handbook</title>
+<title>The &tdewallet; Handbook</title>
 
 <authorgroup>
 <author>
@@ -58,15 +58,15 @@ to manage.  Remembering them is difficult, writing them down on paper or in
 a text file is insecure, and using tools such at PGP is tedious and
 inconvenient.</para>
 
-<para>&kwallet; saves this sensitive data for you in a strongly encrypted
+<para>&tdewallet; saves this sensitive data for you in a strongly encrypted
 file, accessible by all applications, and protected with a master
 password that you define.</para>
 
 <tip>
-<para>&kwallet; supports multiple wallets, so 
+<para>&tdewallet; supports multiple wallets, so 
 for the most secure operation, you should use one wallet for local
 passwords, and another for network passwords and form data.  You can
-configure this behavior in the &kwallet; &kcontrolcenter; module, however
+configure this behavior in the &tdewallet; &kcontrolcenter; module, however
 the default setting is to store everything in one wallet.</para>
 </tip>
 
@@ -76,20 +76,20 @@ be accessed.</para>
 
 </chapter>
 
-<chapter id="kwalletmanager">
-<title>&kwalletmanager;</title>
+<chapter id="tdewalletmanager">
+<title>&tdewalletmanager;</title>
 
-<para>&kwalletmanager; serves a number of functions.  Firstly it allows you to see if
+<para>&tdewalletmanager; serves a number of functions.  Firstly it allows you to see if
 any wallets are open, which wallets those are, and which applications are
 using each wallet.  You can disconnect an application's access to a wallet
-from within the &kwalletmanager;.</para>
+from within the &tdewalletmanager;.</para>
 
 <para>You may also manage the wallets installed on the system, creating and
 deleting wallets and manipulating their contents (changing keys, ...).</para>
 
-<para>Normally the &kwalletmanager; application is launched when
+<para>Normally the &tdewalletmanager; application is launched when
 &kde; starts and remains in iconic form in the system tray. Alternatively, 
-when a wallet is opened, the &kwalletmanager; application will be
+when a wallet is opened, the &tdewalletmanager; application will be
 launched.  A system tray icon indicates that a wallet is open:
  <mediaobject>
    <imageobject>
@@ -108,22 +108,22 @@ wallet:
 
 </para>
 
-<para>Click once on the system tray wallet icon to display the &kwalletmanager;
+<para>Click once on the system tray wallet icon to display the &tdewalletmanager;
 window showing all available wallets as icons which reflect their
 current status, either open or closed.</para>
 <para>
 <mediaobject>
    <imageobject>
-     <imagedata fileref="kwalletmanager.png"/>
+     <imagedata fileref="tdewalletmanager.png"/>
    </imageobject>
  </mediaobject></para>
 
 
-<sect1 id="kwalletmanager-context-menu">
-<title>The &kwalletmanager; Context Menu</title>
+<sect1 id="tdewalletmanager-context-menu">
+<title>The &tdewalletmanager; Context Menu</title>
 
 <para><mousebutton>Right</mousebutton> clicking on a wallet in the
-&kwalletmanager; window offers 
+&tdewalletmanager; window offers 
 the following functions:</para>
 
 <variablelist>
@@ -184,10 +184,10 @@ connected applications will appear in a submenu.</para></listitem>
 </variablelist>
 </sect1>
 
-<sect1 id="kwalletmanager-wallet-window">
+<sect1 id="tdewalletmanager-wallet-window">
 <title>The Wallet Window</title>
 
-<para>Double clicking on a wallet in the &kwalletmanager; window will open a new
+<para>Double clicking on a wallet in the &tdewalletmanager; window will open a new
 window displaying that wallet's contents. A wallet may contain any number
 of folders, which allow storing of password information. By default a wallet
 will contain folders named Form Data and Passwords.
@@ -237,19 +237,19 @@ locations.</para>
 
 </chapter>
 
-<chapter id="kwallet-kcontrol-module">
-<title>Configuring &kwallet;</title>
+<chapter id="tdewallet-kcontrol-module">
+<title>Configuring &tdewallet;</title>
 
 <sect1 id="wallet-preferences">
 <title><guilabel>Wallet Preferences</guilabel></title>
 
-<para>&kwallet; contains a small configuration panel with several options
-that allow you to tune &kwallet; to your personal preferences.  The
-default settings for &kwallet; are sufficient for most users.</para>
+<para>&tdewallet; contains a small configuration panel with several options
+that allow you to tune &tdewallet; to your personal preferences.  The
+default settings for &tdewallet; are sufficient for most users.</para>
 
 <para>Check the box to enable or disable the &kde; wallet subsystem
-entirely.  If this box is unchecked, then &kwallet; is entirely disabled and
-none of the other options here have any effect, nor will &kwallet; record
+entirely.  If this box is unchecked, then &tdewallet; is entirely disabled and
+none of the other options here have any effect, nor will &tdewallet; record
 any information, or offer to fill in forms for you.</para>
 
 <variablelist>
@@ -353,7 +353,7 @@ context menu that appears, or by simply selecting it and pressing the
 <chapter id="advanced-features">
 <title>Advanced Features</title>
 
-<para>Wallets can be dragged from the &kwalletmanager; window.  This allows
+<para>Wallets can be dragged from the &tdewalletmanager; window.  This allows
 you to drag the wallet to a file browser window, where you can choose to
 copy, move, or link the wallet, as desired.</para>
 
@@ -369,7 +369,7 @@ copying of data to portable devices.</para>
 <chapter id="credits-and-licenses">
 <title>Credits and Licenses</title>
 
-<para>&kwallet; &copy; 2003 &George.Staikos;</para>
+<para>&tdewallet; &copy; 2003 &George.Staikos;</para>
 <para>Documentation &copy; &Lauri.Watts; and &George.Staikos;</para>
 
 <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
diff --git a/doc/kwallet/password1.png b/doc/tdewallet/password1.png
index d5cb22a..d5cb22a 100644
--- a/doc/kwallet/password1.png
+++ b/doc/tdewallet/password1.png
diff --git a/doc/kwallet/password2.png b/doc/tdewallet/password2.png
index c116e93..c116e93 100644
--- a/doc/kwallet/password2.png
+++ b/doc/tdewallet/password2.png
diff --git a/doc/kwallet/kwalletmanager.png b/doc/tdewallet/tdewalletmanager.png
index 67c7220..67c7220 100644
--- a/doc/kwallet/kwalletmanager.png
+++ b/doc/tdewallet/tdewalletmanager.png
diff --git a/kcalc/knumber/tests/Makefile.am b/kcalc/knumber/tests/Makefile.am
index 857a6d8..faa3aa7 100644
--- a/kcalc/knumber/tests/Makefile.am
+++ b/kcalc/knumber/tests/Makefile.am
@@ -29,4 +29,4 @@ METASOURCES = AUTO
 
 knumbertest_SOURCES = knumbertest.cpp
 knumbertest_LDADD = ../libknumber.la $(LIB_QT) $(LIBGMP)
-knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+knumbertest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am
index f4f8ad6..38014b3 100644
--- a/kcharselect/Makefile.am
+++ b/kcharselect/Makefile.am
@@ -3,7 +3,7 @@ LDADD	= $(LIB_KFILE)
 bin_PROGRAMS = kcharselect
 
 kcharselect_SOURCES = kcharselectdia.cc main.cc
-kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kcharselect_METASOURCES = kcharselectdia.moc
 
 updatedir = $(kde_datadir)/kconf_update
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp
index d5df7ec..7281251 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/kdelirc/kcmlirc/addaction.cpp
@@ -352,7 +352,7 @@ void AddAction::updateObjects()
 
 		QCStringList theObjects = theClient->remoteObjects(*i);
 		for(QCStringList::iterator j = theObjects.begin(); j != theObjects.end(); ++j)
-			if(*j != "ksycoca" && *j != "qt")// && getFunctions(*i, *j).count())
+			if(*j != "tdesycoca" && *j != "qt")// && getFunctions(*i, *j).count())
 				new KListViewItem(a, *j);
 	}
 	updateFunctions();
diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp
index be113e6..3b38b0c 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/kdelirc/kcmlirc/editaction.cpp
@@ -342,7 +342,7 @@ void EditAction::updateDCOPObjects()
 	QCStringList theObjects = theClient->remoteObjects(nameProgramMap[theDCOPApplications->currentText()].utf8());
 	if(!theObjects.size() && theDCOPApplications->currentText() == (*theAction).program()) theDCOPObjects->insertItem((*theAction).object());
 	for(QCStringList::iterator j = theObjects.begin(); j != theObjects.end(); ++j)
-		if(*j != "ksycoca" && *j != "qt" && AddAction::getFunctions(nameProgramMap[theDCOPApplications->currentText()], *j).count())
+		if(*j != "tdesycoca" && *j != "qt" && AddAction::getFunctions(nameProgramMap[theDCOPApplications->currentText()], *j).count())
 			theDCOPObjects->insertItem(TQString::fromUtf8(*j));
 	updateDCOPFunctions();
 }
diff --git a/kdelirc/kdelirc/Makefile.am b/kdelirc/kdelirc/Makefile.am
index a9796a6..764a620 100644
--- a/kdelirc/kdelirc/Makefile.am
+++ b/kdelirc/kdelirc/Makefile.am
@@ -34,7 +34,7 @@ INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkdelirc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE�s XML GUI builing
diff --git a/kdessh/Makefile.am b/kdessh/Makefile.am
index f69974f..f716244 100644
--- a/kdessh/Makefile.am
+++ b/kdessh/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES= $(all_includes)
 ## kdessh
 bin_PROGRAMS = 	kdessh
 kdessh_SOURCES = kdessh.cpp sshdlg.cpp
-kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdessh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kdessh_LDADD   = $(LIB_TDEUI) -ltdesu
 kdessh_METASOURCES =  AUTO
 noinst_HEADERS = sshdlg.h
diff --git a/kdf/Makefile.am b/kdf/Makefile.am
index 866e345..2ddf348 100644
--- a/kdf/Makefile.am
+++ b/kdf/Makefile.am
@@ -9,11 +9,11 @@ libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cp
 	disks.cpp listview.cpp optiondialog.cpp stdoption.cpp
 
 kdf_SOURCES = kdf.cpp 
-kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kdf_LDADD = libkdf_common.la $(LIB_KFILE)
 
 kwikdisk_SOURCES = kwikdisk.cpp 
-kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kwikdisk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kwikdisk_LDADD = libkdf_common.la $(LIB_KFILE)
 
 kde_module_LTLIBRARIES = kcm_kdf.la
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index 309dab9..f3a0cb4 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -44,7 +44,7 @@
 #include <kprinter.h>
 #include <ksavefile.h>
 #include <kstatusbar.h>
-#include <kspell.h>
+#include <tdespell.h>
 #include <kurldrag.h>
 
 #include "ktextfiledlg.h"
@@ -61,8 +61,8 @@ TQPtrList<TopLevel> *TopLevel::windowList = 0;
 int default_open =  TopLevel::OPEN_READWRITE;
 
 TopLevel::TopLevel (TQWidget *, const char *name)
-  : KMainWindow ( 0,name ), kspellconfigOptions(0),
-  eframe(0), newWindow(false), kspell(0)
+  : KMainWindow ( 0,name ), tdespellconfigOptions(0),
+  eframe(0), newWindow(false), tdespell(0)
 {
   if (!windowList)
   {
@@ -385,24 +385,24 @@ void TopLevel::spellcheck()
 {
   if (!eframe) return;
 
-  if (kspell) return; // In progress
+  if (tdespell) return; // In progress
 
   statusBar()->changeItem(i18n("Spellcheck:  Started."), ID_GENERAL);
 
   initSpellConfig();
-  kspell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this),
-	TQT_SLOT( spell_started(KSpell *)), kspellconfigOptions);
+  tdespell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this),
+	TQT_SLOT( spell_started(KSpell *)), tdespellconfigOptions);
 
-  connect (kspell, TQT_SIGNAL ( death()),
+  connect (tdespell, TQT_SIGNAL ( death()),
           this, TQT_SLOT ( spell_finished( )));
 
-  connect (kspell, TQT_SIGNAL (progress (unsigned int)),
+  connect (tdespell, TQT_SIGNAL (progress (unsigned int)),
           this, TQT_SLOT (spell_progress (unsigned int)));
-  connect (kspell, TQT_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)),
+  connect (tdespell, TQT_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)),
           eframe, TQT_SLOT (misspelling (const TQString &, const TQStringList &, unsigned int)));
-  connect (kspell, TQT_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)),
+  connect (tdespell, TQT_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)),
           eframe, TQT_SLOT (corrected (const TQString &, const TQString &, unsigned int)));
-  connect (kspell, TQT_SIGNAL (done(const TQString&)),
+  connect (tdespell, TQT_SIGNAL (done(const TQString&)),
 		 this, TQT_SLOT (spell_done(const TQString&)));
 }
 
@@ -410,8 +410,8 @@ void TopLevel::spellcheck()
 void TopLevel::spell_started( KSpell *)
 {
    eframe->spellcheck_start();
-   kspell->setProgressResolution(2);
-   kspell->check(eframe->text());
+   tdespell->setProgressResolution(2);
+   tdespell->check(eframe->text());
 }
 
 
@@ -427,7 +427,7 @@ void TopLevel::spell_progress (unsigned int percent)
 void TopLevel::spell_done(const TQString& newtext)
 {
   eframe->spellcheck_stop();
-  if (kspell->dlgResult() == 0)
+  if (tdespell->dlgResult() == 0)
   {
      eframe->setText( newtext);
      statusBar()->changeItem (i18n("Spellcheck:  Aborted."), ID_GENERAL);
@@ -436,7 +436,7 @@ void TopLevel::spell_done(const TQString& newtext)
   {
      statusBar()->changeItem (i18n("Spellcheck:  Complete."), ID_GENERAL);
   }
-  kspell->cleanUp();
+  tdespell->cleanUp();
 }
 
 // Replace ISpell with the name of the actual spell checker.
@@ -455,10 +455,10 @@ TQString TopLevel::replaceISpell(TQString msg, int client)
 
 void TopLevel::spell_finished( )
 {
-  KSpell::spellStatus status = kspell->status();
-  int client = kspellconfigOptions->client();
-  delete kspell;
-  kspell = 0;
+  KSpell::spellStatus status = tdespell->status();
+  int client = tdespellconfigOptions->client();
+  delete tdespell;
+  tdespell = 0;
   if (status == KSpell::Error)
   {
      KMessageBox::sorry(this, replaceISpell(i18n("ISpell could not be started.\n"
@@ -831,7 +831,7 @@ void TopLevel::showSettings()
     return;
 
   initSpellConfig();
-  TDEConfigDialog* dialog = new SettingsDialog(this, "settings", Prefs::self(), kspellconfigOptions);
+  TDEConfigDialog* dialog = new SettingsDialog(this, "settings", Prefs::self(), tdespellconfigOptions);
 
   connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateSettings()));
   dialog->show();
@@ -839,8 +839,8 @@ void TopLevel::showSettings()
 
 void TopLevel::initSpellConfig()
 {
-  if (!kspellconfigOptions)
-     kspellconfigOptions = new KSpellConfig(0 , "SpellingSettings", 0, false );
+  if (!tdespellconfigOptions)
+     tdespellconfigOptions = new KSpellConfig(0 , "SpellingSettings", 0, false );
 }
 
 void TopLevel::search_again()
diff --git a/kedit/kedit.h b/kedit/kedit.h
index 56c4ccd..b931615 100644
--- a/kedit/kedit.h
+++ b/kedit/kedit.h
@@ -117,7 +117,7 @@ protected:
     void initSpellConfig();
 
 private:
-    KSpellConfig *kspellconfigOptions;
+    KSpellConfig *tdespellconfigOptions;
     
 public:  // Should not be!
     KEdit *eframe;
@@ -138,7 +138,7 @@ private:
 
     TDEConfig *config;
 
-    KSpell *kspell; // Current spell checking object
+    KSpell *tdespell; // Current spell checking object
 
     /*
      * The source, the destination of the copy, and the open mode
diff --git a/kfloppy/Makefile.am b/kfloppy/Makefile.am
index 2cac206..57974ca 100644
--- a/kfloppy/Makefile.am
+++ b/kfloppy/Makefile.am
@@ -1,4 +1,4 @@
-kfloppy_LDFLAGS	= $(all_libraries)  $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kfloppy_LDFLAGS	= $(all_libraries)  $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kfloppy_LDADD =  $(LIB_TDEUI) -lm
 INCLUDES =	$(all_includes)
 
diff --git a/kgpg/CMakeLists.txt b/kgpg/CMakeLists.txt
index 4d976df..3bd5905 100644
--- a/kgpg/CMakeLists.txt
+++ b/kgpg/CMakeLists.txt
@@ -40,7 +40,7 @@ tde_add_executable( kgpg AUTOMOC
     keyexport.ui sourceselect.ui
     kgpgsettings.kcfgc conf_servers.ui
     conf_ui2.ui conf_misc.ui
-  LINK kabc-shared kutils-shared tdeprint-shared
+  LINK kabc-shared tdeutils-shared tdeprint-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kgpg/Makefile.am b/kgpg/Makefile.am
index 5af8eab..7cb6316 100644
--- a/kgpg/Makefile.am
+++ b/kgpg/Makefile.am
@@ -11,7 +11,7 @@ kgpg_SOURCES = kgpgoptions.cpp listkeys.cpp popuppublic.cpp kgpgview.cpp \
 		keyproperties.ui conf_encryption.ui conf_decryption.ui conf_gpg.ui dcopiface.skel \
 		keyinfowidget.cpp groupedit.ui kgpgrevokewidget.ui newkey.ui adduid.ui 	keyexport.ui \
 		sourceselect.ui kgpgsettings.kcfgc conf_servers.ui conf_ui2.ui conf_misc.ui
-kgpg_LDADD   =  $(LIB_KIO) $(LIB_KABC) -lkutils -ltdeprint
+kgpg_LDADD   =  $(LIB_KIO) $(LIB_KABC) -ltdeutils -ltdeprint
 
 pics_DATA= kgpg_anim.gif kgpg_docked.png  kgpg_docked.gif kgpg_blank.png  kgpg_fill.png
 picsdir=$(kde_datadir)/kgpg/pics
@@ -28,7 +28,7 @@ kde_kcfg_DATA = kgpg.kcfg
 METASOURCES = AUTO
 
 # the library search path.
-kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kgpg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 appsdir = $(kde_datadir)/kgpg
 apps_DATA = kgpg.rc listkeys.rc tips
diff --git a/khexedit/Makefile.am b/khexedit/Makefile.am
index 87c0fe3..576c08b 100644
--- a/khexedit/Makefile.am
+++ b/khexedit/Makefile.am
@@ -20,7 +20,7 @@ draglabel.h progress.h hexeditstate.h chartabledialog.h hexdrag.h \
 exportdialog.h fileinfodialog.h converterdialog.h listview.h searchbar.h
 
 khexedit_METASOURCES = AUTO
-khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+khexedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 khexedit_LDADD = $(LIB_KIO) $(LIB_TDEPRINT)
 
 xdg_apps_DATA = khexedit.desktop
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index c33700c..b0360a3 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -426,7 +426,7 @@ void COptionDialog::setupFilePage( void )
 {
   TQString text;
   TQFrame *page = addPage( i18n("Files"), i18n("File Management"),
-			  BarIcon("kmultiple", KIcon::SizeMedium ) );
+			  BarIcon("tdemultiple", KIcon::SizeMedium ) );
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
diff --git a/khexedit/parts/kbytesedit/CMakeLists.txt b/khexedit/parts/kbytesedit/CMakeLists.txt
index 53f0cda..aece7ca 100644
--- a/khexedit/parts/kbytesedit/CMakeLists.txt
+++ b/khexedit/parts/kbytesedit/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 tde_add_kpart( libkbyteseditwidget AUTOMOC
   SOURCES kbyteseditwidget.cpp
   DESTINATION ${PLUGIN_INSTALL_DIR}
-  LINK khexeditcommon-shared kparts-shared
+  LINK khexeditcommon-shared tdeparts-shared
 )
 
 
diff --git a/khexedit/parts/kpart/CMakeLists.txt b/khexedit/parts/kpart/CMakeLists.txt
index af4d5b5..9efb479 100644
--- a/khexedit/parts/kpart/CMakeLists.txt
+++ b/khexedit/parts/kpart/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 tde_add_kpart( libkhexedit2part AUTOMOC
   SOURCES khepart.cpp khebrowserextension.cpp
     khepartfactory.cpp
-  LINK khexeditcommon-shared kparts-shared
+  LINK khexeditcommon-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/khexedit/parts/kpart/khebrowserextension.h b/khexedit/parts/kpart/khebrowserextension.h
index 3115b8e..8096bef 100644
--- a/khexedit/parts/kpart/khebrowserextension.h
+++ b/khexedit/parts/kpart/khebrowserextension.h
@@ -19,7 +19,7 @@
 #define KHEBROWSEREXTENSION_H
 
 // kde specific
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 namespace KHE
 {
diff --git a/khexedit/parts/kpart/khepart.h b/khexedit/parts/kpart/khepart.h
index 0ce0391..ccbd038 100644
--- a/khexedit/parts/kpart/khepart.h
+++ b/khexedit/parts/kpart/khepart.h
@@ -19,7 +19,7 @@
 #define KHEPART_H
 
 // kde specific
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 // app specific
 #include "kbigbuffer.h"
 
diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h
index a411acb..9d12317 100644
--- a/khexedit/parts/kpart/khepartfactory.h
+++ b/khexedit/parts/kpart/khepartfactory.h
@@ -18,7 +18,7 @@
 #ifndef KHEPARTFACTORY_H
 #define KHEPARTFACTORY_H
 
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
 class TDEInstance;
 class TDEAboutData;
diff --git a/kjots/Makefile.am b/kjots/Makefile.am
index 38f23df..cc0862b 100644
--- a/kjots/Makefile.am
+++ b/kjots/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = $(all_includes)
-AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 LDADD =  $(LIB_KFILE) $(LIB_TDEPRINT)
 
 bin_PROGRAMS = kjots
diff --git a/klaptopdaemon/Makefile.am b/klaptopdaemon/Makefile.am
index bc58d54..bfcab8c 100644
--- a/klaptopdaemon/Makefile.am
+++ b/klaptopdaemon/Makefile.am
@@ -4,30 +4,30 @@ lib_LTLIBRARIES = libkcmlaptop.la
 SUBDIRS = pics applnk
 
 libkcmlaptop_la_SOURCES = portable.cpp smapidev.c daemon_state.cpp wake_laptop.cpp krichtextlabel.cpp
-libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkcmlaptop_la_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 libkcmlaptop_la_LIBADD  = $(LIB_TDEUI) 
 
 MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c
 kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel  
-kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kded_klaptopdaemon_la_LIBADD   = $(LIB_TDEUI) $(LIB_XSS) libkcmlaptop.la
 
 klaptop_acpi_helper_SOURCES = acpi_helper.cpp
 klaptop_acpi_helper_LDADD = $(LIB_QT)
 
 klaptop_check_SOURCES = laptop_check.cpp 
-klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+klaptop_check_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 klaptop_check_LDADD = $(LIB_KFILE) $(LIB_TDEUI) libkcmlaptop.la
 
 kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
 	acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp  
-kcm_laptop_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -module
+kcm_laptop_la_LDFLAGS  = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module
 kcm_laptop_la_LIBADD = $(LIB_KFILE) $(LIB_TDEUI) libkcmlaptop.la
 kcm_laptop_la_COMPILE_FIRST = crcresult.h
 
 AM_CPPFLAGS = $(all_includes)
 
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 KDE_OPTIONS = nofinal
 
diff --git a/kmilo/delli8k/README b/kmilo/delli8k/README
index 80ae5b0..7ece288 100644
--- a/kmilo/delli8k/README
+++ b/kmilo/delli8k/README
@@ -15,7 +15,7 @@ The code in this module is heavily based on:
     - the Thinkpad plug-in by Jonathan Riddell (jr@jriddell.org)
 
 Also, for the Dell specific implementations, code was taken from the 
-i8kutils package of Massimo Dal Zotto <dz@debian.org> which can be
+i8tdeutils package of Massimo Dal Zotto <dz@debian.org> which can be
 downloaded from http://www.debian.org/~dz/i8k/
 
 LICENSE:
@@ -42,7 +42,7 @@ COMPATIBILITY:
 
 This plug-in should work on any Linux distribution that has the i8k module
 loaded or compiled into the kernel. Compatibility is really dependant on
-the i8kutils package of Massimo Dal Zotto <dz@debian.org> which can be
+the i8tdeutils package of Massimo Dal Zotto <dz@debian.org> which can be
 downloaded from http://www.debian.org/~dz/i8k/. Currently (20041122), this
 should support:
 
diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp
index 1b777e2..fa2f4a8 100644
--- a/kmilo/kmilod/kmilod.cpp
+++ b/kmilo/kmilod/kmilod.cpp
@@ -35,7 +35,7 @@
 #include <kservicetype.h>
 #include <kservice.h>
 #include <kconfig.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include "kmilointerface.h"
 #include "defaultskin.h"
diff --git a/kregexpeditor/CMakeLists.txt b/kregexpeditor/CMakeLists.txt
index ee0eca5..1ebb963 100644
--- a/kregexpeditor/CMakeLists.txt
+++ b/kregexpeditor/CMakeLists.txt
@@ -77,7 +77,7 @@ tde_add_library( kregexpeditorcommon SHARED AUTOMOC
     emacsregexpconverter.cpp
     regexphighlighter.cpp util.cpp
   VERSION 1.0.0
-  LINK kio-shared kmultiformlistbox-static
+  LINK kio-shared tdemultiformlistbox-static
     kwidgetstreamer-static
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kregexpeditor/KMultiFormListBox/CMakeLists.txt b/kregexpeditor/KMultiFormListBox/CMakeLists.txt
index 31f4b3e..67bfa33 100644
--- a/kregexpeditor/KMultiFormListBox/CMakeLists.txt
+++ b/kregexpeditor/KMultiFormListBox/CMakeLists.txt
@@ -27,14 +27,14 @@ add_definitions(
 )
 
 
-##### kmultiformlistbox (static) ################
-
-tde_add_library( kmultiformlistbox STATIC_PIC AUTOMOC
-  SOURCES ccp.cpp kmultiformlistboxentry.cpp
-    kmultiformlistbox.cpp
-    kmultiformlistbox-multivisible.cpp
-    kmultiformlistboxfactory.cpp indexWindow.cpp
-    kmultiformlistbox-windowed.cpp
+##### tdemultiformlistbox (static) ################
+
+tde_add_library( tdemultiformlistbox STATIC_PIC AUTOMOC
+  SOURCES ccp.cpp tdemultiformlistboxentry.cpp
+    tdemultiformlistbox.cpp
+    tdemultiformlistbox-multivisible.cpp
+    tdemultiformlistboxfactory.cpp indexWindow.cpp
+    tdemultiformlistbox-windowed.cpp
     widgetwindow.cpp windowlistboxitem.cpp
 )
 
@@ -43,8 +43,8 @@ tde_add_library( kmultiformlistbox STATIC_PIC AUTOMOC
 
 install(
   FILES
-    kmultiformlistbox.h
-    kmultiformlistboxentry.h
-    kmultiformlistboxfactory.h
+    tdemultiformlistbox.h
+    tdemultiformlistboxentry.h
+    tdemultiformlistboxfactory.h
   DESTINATION ${INCLUDE_INSTALL_DIR}
 )
diff --git a/kregexpeditor/KMultiFormListBox/Makefile.am b/kregexpeditor/KMultiFormListBox/Makefile.am
index 5ee885f..3f2a395 100644
--- a/kregexpeditor/KMultiFormListBox/Makefile.am
+++ b/kregexpeditor/KMultiFormListBox/Makefile.am
@@ -1,15 +1,15 @@
 AM_CPPFLAGS = -DQT_NO_CAST_ASCII
-noinst_LTLIBRARIES  = libkmultiformlistbox.la
+noinst_LTLIBRARIES  = libtdemultiformlistbox.la
 
 INCLUDES= -I$(srcdir)/../KWidgetStreamer $(all_includes)
 
-include_HEADERS = kmultiformlistboxentry.h kmultiformlistbox.h \
-	kmultiformlistboxfactory.h 
-noinst_HEADERS = ccp.h indexWindow.h kmultiformlistbox-multivisible.h \
-	kmultiformlistbox-windowed.h widgetwindow.h windowlistboxitem.h
-libkmultiformlistbox_la_SOURCES = ccp.cpp kmultiformlistboxentry.cpp \
-	kmultiformlistbox.cpp kmultiformlistbox-multivisible.cpp \
-	kmultiformlistboxfactory.cpp indexWindow.cpp \
-	kmultiformlistbox-windowed.cpp widgetwindow.cpp windowlistboxitem.cpp
+include_HEADERS = tdemultiformlistboxentry.h tdemultiformlistbox.h \
+	tdemultiformlistboxfactory.h 
+noinst_HEADERS = ccp.h indexWindow.h tdemultiformlistbox-multivisible.h \
+	tdemultiformlistbox-windowed.h widgetwindow.h windowlistboxitem.h
+libtdemultiformlistbox_la_SOURCES = ccp.cpp tdemultiformlistboxentry.cpp \
+	tdemultiformlistbox.cpp tdemultiformlistbox-multivisible.cpp \
+	tdemultiformlistboxfactory.cpp indexWindow.cpp \
+	tdemultiformlistbox-windowed.cpp widgetwindow.cpp windowlistboxitem.cpp
 
 METASOURCES = AUTO
diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp
index be65d35..8197d2c 100644
--- a/kregexpeditor/KMultiFormListBox/ccp.cpp
+++ b/kregexpeditor/KMultiFormListBox/ccp.cpp
@@ -19,7 +19,7 @@
 // ccp = Cut-Copy-Paste
 //---------------------
 
-#include "kmultiformlistbox-multivisible.h"
+#include "tdemultiformlistbox-multivisible.h"
 #include "ccp.h"
 #include <tqobjectlist.h>
 #include <tqpopupmenu.h>
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
index 3dcab67..5c67526 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
@@ -21,10 +21,10 @@
   #include <tqmessagebox.h>
 #else
   #include <kmessagebox.h>
-  #include "kmultiformlistbox-multivisible.moc"
+  #include "tdemultiformlistbox-multivisible.moc"
 #endif
 
-#include "kmultiformlistbox-multivisible.h"
+#include "tdemultiformlistbox-multivisible.h"
 #include "indexWindow.h"
 #include "ccp.h"
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h
index 04a3f75..5077496 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.h
@@ -22,11 +22,11 @@
 // To make an instance of the widget, you need to inherit the classes
 // `KMultiFormListBoxFactory' and `KMultiFormListBoxEntry'.
 // ------------------------------------------------------------------------
-#ifndef __kmultiformlistboxmultivisble
-#define __kmultiformlistboxmultivisble
+#ifndef __tdemultiformlistboxmultivisble
+#define __tdemultiformlistboxmultivisble
 
 // -------------------------------- includes ------------------------------
-#include "kmultiformlistbox.h"
+#include "tdemultiformlistbox.h"
 //-------------------------------------------------------------------------
 
 /**
@@ -132,5 +132,5 @@ private:
 };
 
 
-#endif /* kmultiformlistboxmultivisble */
+#endif /* tdemultiformlistboxmultivisble */
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-shower.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-shower.h
index 15f3af5..03cec37 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-shower.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-shower.h
@@ -15,8 +15,8 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#ifndef __kmultiformlistboxshower
-#define __kmultiformlistboxshower
+#ifndef __tdemultiformlistboxshower
+#define __tdemultiformlistboxshower
 
 // -------------------------------- includes ------------------------------
 //-------------------------------------------------------------------------
@@ -49,5 +49,5 @@ public:
 };
 
 
-#endif /* kmultiformlistboxshower */
+#endif /* tdemultiformlistboxshower */
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
index 8d3ffe3..35627d6 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
@@ -21,7 +21,7 @@
   #include <kmessagebox.h>
   #include <kpushbutton.h>
   #include <kstdguiitem.h>
-  #include "kmultiformlistbox-windowed.moc"
+  #include "tdemultiformlistbox-windowed.moc"
 #endif
 
 #include "widgetwindow.h"
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h
index f86f6a4..b2c0484 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h
@@ -15,8 +15,8 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#ifndef __kmultiformlistboxwindowed
-#define __kmultiformlistboxwindowed
+#ifndef __tdemultiformlistboxwindowed
+#define __tdemultiformlistboxwindowed
 
 #ifdef TQT_ONLY
   #include "compat.h"
@@ -25,8 +25,8 @@
   #include <klistbox.h>
 #endif
 
-#include "kmultiformlistboxfactory.h"
-#include "kmultiformlistbox.h"
+#include "tdemultiformlistboxfactory.h"
+#include "tdemultiformlistbox.h"
 class WindowListboxItem;
 
 
@@ -80,5 +80,5 @@ private slots:
 };
 
 
-#endif /* kmultiformlistboxwindowed */
+#endif /* tdemultiformlistboxwindowed */
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp
index 58b82da..33eda27 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp
@@ -16,11 +16,11 @@
  *  Boston, MA 02110-1301, USA.
  **/
 #ifndef TQT_ONLY
-  #include "kmultiformlistbox.moc"
+  #include "tdemultiformlistbox.moc"
 #endif
 
-#include "kmultiformlistbox-multivisible.h"
-#include "kmultiformlistbox-windowed.h"
+#include "tdemultiformlistbox-multivisible.h"
+#include "tdemultiformlistbox-windowed.h"
 
 KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiFormListBoxType tp, TQWidget *parent,
 																		  bool showUpDownButtons, bool showHelpButton, TQString addButtonText,
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h
index 89a6d0a..1151581 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h
@@ -15,12 +15,12 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#ifndef __kmultiformlistbox
-#define __kmultiformlistbox
+#ifndef __tdemultiformlistbox
+#define __tdemultiformlistbox
 
-#include "kmultiformlistboxfactory.h"
-#include "kmultiformlistbox-shower.h"
-#include "kmultiformlistboxentry.h"
+#include "tdemultiformlistboxfactory.h"
+#include "tdemultiformlistbox-shower.h"
+#include "tdemultiformlistboxentry.h"
 #include <tqptrlist.h>
 #include <tqlayout.h>
 #include <tqscrollview.h>
@@ -122,5 +122,5 @@ private:
 };
 
 
-#endif /* kmultiformlistbox */
+#endif /* tdemultiformlistbox */
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.cpp
index 5631078..ee3e5c5 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.cpp
@@ -17,10 +17,10 @@
  **/
 
 #ifndef TQT_ONLY
-  #include "kmultiformlistboxentry.moc"
+  #include "tdemultiformlistboxentry.moc"
 #endif
 
-#include "kmultiformlistboxentry.h"
+#include "tdemultiformlistboxentry.h"
 //----------------------------------------------------------------------
 // This function is needed to signal which of the KMultiFormListBox entries
 // the Idx button was invoked from.
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h
index b3750bb..957f3ab 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxentry.h
@@ -15,8 +15,8 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#ifndef __kmultiformlistboxentry
-#define __kmultiformlistboxentry
+#ifndef __tdemultiformlistboxentry
+#define __tdemultiformlistboxentry
 
 #include <tqpoint.h>
 #include <tqwidget.h>
@@ -70,5 +70,5 @@ signals:
 
 };
 
-#endif /* kmultiformlistboxentry */
+#endif /* tdemultiformlistboxentry */
 
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxfactory.cpp
index 08a800a..d4414cf 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxfactory.cpp
@@ -15,7 +15,7 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#include "kmultiformlistboxfactory.h"
+#include "tdemultiformlistboxfactory.h"
 #include <tqframe.h>
 
 TQWidget *KMultiFormListBoxFactory::separator(TQWidget *parent) {
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxfactory.h
index dc0bcce..314c0e0 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistboxfactory.h
@@ -16,8 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 // -------------------------------- includes ------------------------------
-#ifndef __kmultiformlistboxfactory
-#define __kmultiformlistboxfactory
+#ifndef __tdemultiformlistboxfactory
+#define __tdemultiformlistboxfactory
 #include <tqobject.h>
 #include "kwidgetstreamer.h"
 class KMultiFormListBoxEntry;
@@ -66,5 +66,5 @@ public:
   virtual TQWidget *separator(TQWidget *parent);
 };
 
-#endif /* kmultiformlistbox */
+#endif /* tdemultiformlistbox */
 
diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.h b/kregexpeditor/KMultiFormListBox/widgetwindow.h
index eea6500..2312653 100644
--- a/kregexpeditor/KMultiFormListBox/widgetwindow.h
+++ b/kregexpeditor/KMultiFormListBox/widgetwindow.h
@@ -26,7 +26,7 @@
   #include <klistbox.h>
 #endif
 
-#include "kmultiformlistbox-windowed.h"
+#include "tdemultiformlistbox-windowed.h"
 
 /**
    @internal
diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
index 04ee2a6..721257c 100644
--- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
+++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
@@ -16,7 +16,7 @@
  *  Boston, MA 02110-1301, USA.
  **/
 #include "kwidgetstreamer.h"
-#include "kmultiformlistbox.h"
+#include "tdemultiformlistbox.h"
 #include <tqobjectlist.h>
 #include <tqvariant.h>
 
diff --git a/kregexpeditor/Makefile.am b/kregexpeditor/Makefile.am
index 916ef42..22460b6 100644
--- a/kregexpeditor/Makefile.am
+++ b/kregexpeditor/Makefile.am
@@ -28,7 +28,7 @@ libkregexpeditorcommon_la_SOURCES = \
   emacsregexpconverter.cpp regexphighlighter.cpp util.cpp
 
 libkregexpeditorcommon_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
-libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libkmultiformlistbox.la \
+libkregexpeditorcommon_la_LIBADD = KMultiFormListBox/libtdemultiformlistbox.la \
 	KWidgetStreamer/libkwidgetstreamer.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 METASOURCES = AUTO
@@ -46,7 +46,7 @@ libkregexpeditorgui_la_LIBADD = libkregexpeditorcommon.la
 
 bin_PROGRAMS = kregexpeditor
 kregexpeditor_SOURCES = main.cpp
-kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kregexpeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kregexpeditor_LDADD =  libkregexpeditorcommon.la $(LIB_KIO)
 kregexpeditor_INCLUDES =  $(all_includes)
 
diff --git a/kregexpeditor/characterswidget.h b/kregexpeditor/characterswidget.h
index 8100f0a..1450d97 100644
--- a/kregexpeditor/characterswidget.h
+++ b/kregexpeditor/characterswidget.h
@@ -24,7 +24,7 @@
 #include <kdialogbase.h>
 #endif
 
-#include <kmultiformlistbox.h>
+#include <tdemultiformlistbox.h>
 #include "regexpwidget.h"
 #include <tqvgroupbox.h>
 
diff --git a/kregexpeditor/qt-only/qt-only.pro b/kregexpeditor/qt-only/qt-only.pro
index 9af8b97..536c98b 100644
--- a/kregexpeditor/qt-only/qt-only.pro
+++ b/kregexpeditor/qt-only/qt-only.pro
@@ -31,12 +31,12 @@ HEADERS += altnregexp.h \
            gen_qregexpparser.hh \
            indexWindow.h \
            infopage.h \
-           kmultiformlistbox-multivisible.h \
-           kmultiformlistbox-shower.h \
-           kmultiformlistbox-windowed.h \
-           kmultiformlistbox.h \
-           kmultiformlistboxentry.h \
-           kmultiformlistboxfactory.h \
+           tdemultiformlistbox-multivisible.h \
+           tdemultiformlistbox-shower.h \
+           tdemultiformlistbox-windowed.h \
+           tdemultiformlistbox.h \
+           tdemultiformlistboxentry.h \
+           tdemultiformlistboxfactory.h \
            kregexpeditorgui.h \
            kregexpeditorprivate.h \
            kwidgetstreamer.h \
@@ -96,11 +96,11 @@ SOURCES += altnregexp.cpp \
            gen_qregexplexer.cpp \
            indexWindow.cpp \
            infopage.cpp \
-           kmultiformlistbox-multivisible.cpp \
-           kmultiformlistbox-windowed.cpp \
-           kmultiformlistbox.cpp \
-           kmultiformlistboxentry.cpp \
-           kmultiformlistboxfactory.cpp \
+           tdemultiformlistbox-multivisible.cpp \
+           tdemultiformlistbox-windowed.cpp \
+           tdemultiformlistbox.cpp \
+           tdemultiformlistboxentry.cpp \
+           tdemultiformlistboxfactory.cpp \
            kregexpeditorgui.cpp \
            kregexpeditorprivate.cpp \
            kwidgetstreamer.cpp \
diff --git a/ktimer/Makefile.am b/ktimer/Makefile.am
index ad3d47d..9778bc7 100644
--- a/ktimer/Makefile.am
+++ b/ktimer/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = $(all_includes)
-AM_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS	= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 LDADD =  $(LIB_TDEUI) $(LIB_KFILE)
 
 bin_PROGRAMS = ktimer
diff --git a/kwallet/Makefile.am b/kwallet/Makefile.am
deleted file mode 100644
index 2c451ca..0000000
--- a/kwallet/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-INCLUDES= $(all_includes)
-
-SUBDIRS=. icons konfigurator
-
-bin_PROGRAMS = kwalletmanager
-kwalletmanager_SOURCES = walletwidget.ui kwalletmanager.cpp \
-			kwalletmanager.skel main.cpp kwalletpopup.cpp \
-			kwalleteditor.cpp kwmapeditor.cpp allyourbase.cpp \
-			kbetterthankdialogbase.ui
-kwalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kwalletmanager_LDADD   = $(LIB_KIO) -lkwalletclient
-METASOURCES = AUTO
-noinst_HEADERS = kwalletmanager.h kwalletpopup.h walletwidget.h kwalleteditor.h\
-		allyourbase.h kwmapeditor.h
-
-xdg_apps_DATA = kwalletmanager.desktop kwalletmanager-kwalletd.desktop
-
-KDE_ICON = kwalletmanager
-
-rc_DATA = kwalletmanager.rc kwalleteditor.rc
-rcdir = $(kde_datadir)/kwalletmanager
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kwalletmanager.pot
-
-kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h
diff --git a/kwallet/icons/Makefile.am b/kwallet/icons/Makefile.am
deleted file mode 100644
index 8bad46c..0000000
--- a/kwallet/icons/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-KDE_ICON = kwalletmanager
-
-pics_ICON = AUTO
-picsdir = $(kde_datadir)/kwalletmanager/icons
-
diff --git a/kwallet/konfigurator/Makefile.am b/kwallet/konfigurator/Makefile.am
deleted file mode 100644
index 74be145..0000000
--- a/kwallet/konfigurator/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-INCLUDES = $(all_includes)
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = kcm_kwallet.la
-kcm_kwallet_la_SOURCES = walletconfigwidget.ui konfigurator.cpp
-kcm_kwallet_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kwallet_la_LIBADD = $(LIB_TDEUI) -lkwalletclient
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kcmkwallet.pot
-
-xdg_apps_DATA = kwalletconfig.desktop
-
-kde_services_DATA = kwallet_config.desktop kwalletmanager_show.desktop
-
diff --git a/superkaramba/src/Makefile.am b/superkaramba/src/Makefile.am
index 1bdfd1b..374c552 100644
--- a/superkaramba/src/Makefile.am
+++ b/superkaramba/src/Makefile.am
@@ -40,7 +40,7 @@ superkaramba_SOURCES = main.cpp karamba.cpp meter.cpp bar.cpp sensor.cpp \
 
 # kde_cfg_DATA = superkaramba.kcfg
 
-superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+superkaramba_LDFLAGS = -Wl,-export-dynamic  $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 #superkaramba_LDADD = -lkio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
 superkaramba_LDADD = -lkio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
 
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index c61f6f8..466c1c3 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -39,8 +39,8 @@
 #include <tdeversion.h>
 #include <kdirwatch.h>
 
-#include <kparts/componentfactory.h>
-#include <kparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/part.h>
 
 #include <tqdir.h>
 #include <tqwidgetlist.h>
diff --git a/kwallet/CMakeLists.txt b/tdewallet/CMakeLists.txt
index ce23468..e4cedbe 100644
--- a/kwallet/CMakeLists.txt
+++ b/tdewallet/CMakeLists.txt
@@ -25,12 +25,12 @@ link_directories(
 )
 
 
-##### kwalletmanager (executable) ###############
+##### tdewalletmanager (executable) ###############
 
-tde_add_executable( kwalletmanager AUTOMOC
-  SOURCES walletwidget.ui kwalletmanager.cpp
-    kwalletmanager.skel main.cpp kwalletpopup.cpp
-    kwalleteditor.cpp kwmapeditor.cpp
+tde_add_executable( tdewalletmanager AUTOMOC
+  SOURCES walletwidget.ui tdewalletmanager.cpp
+    tdewalletmanager.skel main.cpp tdewalletpopup.cpp
+    tdewalleteditor.cpp kwmapeditor.cpp
     allyourbase.cpp kbetterthankdialogbase.ui
   LINK kio-shared
   DESTINATION ${BIN_INSTALL_DIR}
@@ -39,17 +39,17 @@ tde_add_executable( kwalletmanager AUTOMOC
 
 ##### icons #####################################
 
-tde_install_icons( kwalletmanager)
+tde_install_icons( tdewalletmanager)
 
 
 ##### other data ################################
 
-install( FILES kwalletmanager.rc kwalleteditor.rc
-  DESTINATION ${DATA_INSTALL_DIR}/kwalletmanager
+install( FILES tdewalletmanager.rc tdewalleteditor.rc
+  DESTINATION ${DATA_INSTALL_DIR}/tdewalletmanager
 )
 
-install( FILES kwalletmanager.desktop
-  kwalletmanager-kwalletd.desktop
+install( FILES tdewalletmanager.desktop
+  tdewalletmanager-tdewalletd.desktop
   DESTINATION ${XDG_APPS_INSTALL_DIR}
 )
 
diff --git a/tdewallet/Makefile.am b/tdewallet/Makefile.am
new file mode 100644
index 0000000..d3d62cd
--- /dev/null
+++ b/tdewallet/Makefile.am
@@ -0,0 +1,26 @@
+INCLUDES= $(all_includes)
+
+SUBDIRS=. icons konfigurator
+
+bin_PROGRAMS = tdewalletmanager
+tdewalletmanager_SOURCES = walletwidget.ui tdewalletmanager.cpp \
+			tdewalletmanager.skel main.cpp tdewalletpopup.cpp \
+			tdewalleteditor.cpp kwmapeditor.cpp allyourbase.cpp \
+			kbetterthankdialogbase.ui
+tdewalletmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdewalletmanager_LDADD   = $(LIB_KIO) -ltdewalletclient
+METASOURCES = AUTO
+noinst_HEADERS = tdewalletmanager.h tdewalletpopup.h walletwidget.h tdewalleteditor.h\
+		allyourbase.h kwmapeditor.h
+
+xdg_apps_DATA = tdewalletmanager.desktop tdewalletmanager-tdewalletd.desktop
+
+KDE_ICON = tdewalletmanager
+
+rc_DATA = tdewalletmanager.rc tdewalleteditor.rc
+rcdir = $(kde_datadir)/tdewalletmanager
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdewalletmanager.pot
+
+kbetterthankdialogbase.lo: kbetterthankdialogbase.ui kbetterthankdialogbase.ui.h
diff --git a/kwallet/TODO b/tdewallet/TODO
index 145fa7b..145fa7b 100644
--- a/kwallet/TODO
+++ b/tdewallet/TODO
diff --git a/kwallet/allyourbase.cpp b/tdewallet/allyourbase.cpp
index b75a04f..97b55d8 100644
--- a/kwallet/allyourbase.cpp
+++ b/tdewallet/allyourbase.cpp
@@ -29,14 +29,14 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 #include <tqdragobject.h>
 #include <tqfile.h>
 #include <tqptrlist.h>
 
 /****************
- *  KWalletFolderItem - ListView items to represent kwallet folders
+ *  KWalletFolderItem - ListView items to represent tdewallet folders
  */
 KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString &name, int entries)
 : KListViewItem(parent),_wallet(w),_name(name),_entries(entries) {
@@ -102,7 +102,7 @@ TQListViewItem* KWalletFolderItem::getItem(const TQString& key) {
 }
 
 bool KWalletFolderItem::acceptDrop(const TQMimeSource *mime) const {
-	return mime->provides("application/x-kwallet-entry") ||
+	return mime->provides("application/x-tdewallet-entry") ||
 		mime->provides("text/uri-list");
 }
 
@@ -118,7 +118,7 @@ KWalletFolderItem::~KWalletFolderItem() {
 }
 
 /****************
- *  KWalletContainerItem - ListView items to represent kwallet containers, i.e.
+ *  KWalletContainerItem - ListView items to represent tdewallet containers, i.e.
  *  passwords, maps, ...
  */
 KWalletContainerItem::KWalletContainerItem(TQListViewItem* parent, const TQString &name, KWallet::Wallet::EntryType type)
@@ -152,7 +152,7 @@ TQListViewItem *KWalletContainerItem::getItem(const TQString& key) {
 }
 
 /****************
- *  KWalletEntryItem - ListView items to represent kwallet entries
+ *  KWalletEntryItem - ListView items to represent tdewallet entries
  */
 KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename)
 : KListViewItem(parent, ename), _wallet(w), _oldName(ename) {
@@ -171,14 +171,14 @@ KWalletEntryItem::~KWalletEntryItem() {
  * KWalletItem - IconView items to represent wallets
  */
 KWalletItem::KWalletItem(TQIconView *parent, const TQString& walletName)
-: TQIconViewItem(parent, walletName, DesktopIcon("kwalletmanager")) {
+: TQIconViewItem(parent, walletName, DesktopIcon("tdewalletmanager")) {
 }
 
 KWalletItem::~KWalletItem() {
 }
 
 bool KWalletItem::acceptDrop(const TQMimeSource *mime) const {
-	return mime->provides("application/x-kwallet-folder") ||
+	return mime->provides("application/x-tdewallet-folder") ||
 		mime->provides("text/uri-list");
 }
 
@@ -246,7 +246,7 @@ static bool decodeFolder(KWallet::Wallet *_wallet, TQDataStream& ds) {
 
 void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst) {
 	Q_UNUSED(lst);
-	if (e->provides("application/x-kwallet-folder") || 
+	if (e->provides("application/x-tdewallet-folder") || 
 			e->provides("text/uri-list")) {
 
 		// FIXME: don't allow the drop if the wallet name is the same
@@ -262,8 +262,8 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst
 		TQFile file;
 		TQDataStream *ds = 0L;
 
-		if (e->provides("application/x-kwallet-folder")) {
-			TQByteArray edata = e->encodedData("application/x-kwallet-folder");
+		if (e->provides("application/x-tdewallet-folder")) {
+			TQByteArray edata = e->encodedData("application/x-tdewallet-folder");
 			if (!edata.isEmpty()) {
 				ds = new TQDataStream(edata, IO_ReadOnly);
 			}
@@ -327,7 +327,7 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst
 class KWalletEntryDrag : public TQStoredDrag {
 	public:
 		KWalletEntryDrag(TQWidget *dragSource, const char *name = 0L)
-			: TQStoredDrag("application/x-kwallet-entry", dragSource, name) {
+			: TQStoredDrag("application/x-tdewallet-entry", dragSource, name) {
 		}
 
 		virtual ~KWalletEntryDrag() {}
@@ -339,7 +339,7 @@ class KWalletEntryDrag : public TQStoredDrag {
 class KWalletFolderDrag : public TQStoredDrag {
 	public:
 		KWalletFolderDrag(TQWidget *dragSource, const char *name = 0L)
-			: TQStoredDrag("application/x-kwallet-folder", dragSource, name) {
+			: TQStoredDrag("application/x-tdewallet-folder", dragSource, name) {
 		}
 
 		virtual ~KWalletFolderDrag() {}
@@ -365,12 +365,12 @@ KWalletEntryList::~KWalletEntryList() {
 bool KWalletEntryList::acceptDrag(TQDropEvent* e) const {
 	TQListViewItem *i = itemAt(contentsToViewport(e->pos()));
 	if (i) {
-		if (e->provides("application/x-kwallet-entry") ||
+		if (e->provides("application/x-tdewallet-entry") ||
 				e->provides("text/uri-list")) {
 			return true;
 		}
 	}
-	if ((e->provides("application/x-kwallet-folder") &&
+	if ((e->provides("application/x-tdewallet-folder") &&
 			e->source() != viewport()) || 
 			e->provides("text/uri-list")) {
 		return true;
@@ -388,7 +388,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 	KWalletEntryList *el = 0L;
 	TQListViewItem *sel = 0L;
 
-	//detect if we are dragging from kwallet itself
+	//detect if we are dragging from tdewallet itself
 	if (e->source() && e->source()->parent() &&
 		!strcmp(e->source()->parent()->className(), "KWalletEntryList")) {
 
@@ -399,7 +399,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 			sel = el->selectedItem();
 	}
 
-	if (e->provides("application/x-kwallet-entry")) {
+	if (e->provides("application/x-tdewallet-entry")) {
 		//do nothing if we are in the same folder
 		if (sel && sel->parent()->parent() == 
 				KWalletEntryList::getItemFolder(item)) {
@@ -407,20 +407,20 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 			return;
 		}
 		isEntry = true;
-		TQByteArray data = e->encodedData("application/x-kwallet-entry");
+		TQByteArray data = e->encodedData("application/x-tdewallet-entry");
 		if (data.isEmpty()) {
 			e->ignore();
 			return;
 		}
 		ds = new TQDataStream(data, IO_ReadOnly);
-	} else if (e->provides("application/x-kwallet-folder")) {
+	} else if (e->provides("application/x-tdewallet-folder")) {
 		//do nothing if we are in the same wallet
 		if (this == el) {
 			e->ignore();
 			return;
 		}
 		isEntry = false;
-		TQByteArray data = e->encodedData("application/x-kwallet-folder");
+		TQByteArray data = e->encodedData("application/x-tdewallet-folder");
 		if (data.isEmpty()) {
 			e->ignore();
 			return;
@@ -488,7 +488,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 		fi->refresh();
 		delete(ds);
 		//delete source if we were moving, i.e., we are dragging
-		//from kwalletmanager and Control is not pressed
+		//from tdewalletmanager and Control is not pressed
 		if (ok && el && !(state & TQt::ControlButton) && sel) {
 			el->_wallet->removeEntry(sel->text(0));
 			delete sel;
@@ -498,7 +498,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 		ok = decodeFolder(_wallet, *ds);
 		delete ds;
 		//delete source if we were moving, i.e., we are dragging
-		//from kwalletmanager and Control is not pressed
+		//from tdewalletmanager and Control is not pressed
 		if (ok && el && !(state & TQt::ControlButton) && sel) {
 			KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(sel);
 			if (fi) {
@@ -535,8 +535,8 @@ void KWalletEntryList::contentsDropEvent(TQDropEvent *e) {
 }
 
 void KWalletEntryList::contentsDragEnterEvent(TQDragEnterEvent *e) {
-	if (e->provides("application/x-kwallet-entry") ||
-		e->provides("application/x-kwallet-folder") ||
+	if (e->provides("application/x-tdewallet-entry") ||
+		e->provides("application/x-tdewallet-folder") ||
 		e->provides("application/uri-list")) {
 		e->accept();
 	} else {
@@ -620,7 +620,7 @@ class KWalletIconDrag : public TQIconDrag {
 *   */
 KWalletIconView::KWalletIconView(TQWidget *parent, const char *name)
 : KIconView(parent, name) {
-	TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
+	TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
 	connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)));
 }
 
@@ -654,7 +654,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueList<TQIconDragIt
 		return;
 	}
 
-	TQString dest = TDEGlobal::dirs()->saveLocation("kwallet") + u.fileName();
+	TQString dest = TDEGlobal::dirs()->saveLocation("tdewallet") + u.fileName();
 	if (TQFile::exists(dest)) {
 		KMessageBox::sorry(viewport(), i18n("That wallet file already exists.  You cannot overwrite wallets."));
 		e->ignore();
@@ -676,7 +676,7 @@ void KWalletIconView::contentsMousePressEvent(TQMouseEvent *e) {
 
 TQDragObject *KWalletIconView::dragObject() {
 	KWalletIconDrag* id = new KWalletIconDrag(viewport(), "KWallet Drag");
-	TQString path = "file:" + TDEGlobal::dirs()->saveLocation("kwallet");
+	TQString path = "file:" + TDEGlobal::dirs()->saveLocation("tdewallet");
 	TQPoint pos = _mousePos;
 	for (TQIconViewItem *item = firstItem(); item; item = item->nextItem()) {
 		if (item->isSelected()) {
diff --git a/kwallet/allyourbase.h b/tdewallet/allyourbase.h
index c89276e..fe9bd05 100644
--- a/kwallet/allyourbase.h
+++ b/tdewallet/allyourbase.h
@@ -23,7 +23,7 @@
 
 #include <kiconview.h>
 #include <klistview.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
 
diff --git a/kwallet/hi128-app-kwalletmanager.png b/tdewallet/hi128-app-tdewalletmanager.png
index ccdd7c9..ccdd7c9 100644
--- a/kwallet/hi128-app-kwalletmanager.png
+++ b/tdewallet/hi128-app-tdewalletmanager.png
diff --git a/kwallet/hi128-app-kwalletmanager2.png b/tdewallet/hi128-app-tdewalletmanager2.png
index e3937db..e3937db 100644
--- a/kwallet/hi128-app-kwalletmanager2.png
+++ b/tdewallet/hi128-app-tdewalletmanager2.png
diff --git a/kwallet/hi16-app-kwalletmanager.png b/tdewallet/hi16-app-tdewalletmanager.png
index 4f9f4fd..4f9f4fd 100644
--- a/kwallet/hi16-app-kwalletmanager.png
+++ b/tdewallet/hi16-app-tdewalletmanager.png
diff --git a/kwallet/hi16-app-kwalletmanager2.png b/tdewallet/hi16-app-tdewalletmanager2.png
index b2f9004..b2f9004 100644
--- a/kwallet/hi16-app-kwalletmanager2.png
+++ b/tdewallet/hi16-app-tdewalletmanager2.png
diff --git a/kwallet/hi22-app-kwalletmanager.png b/tdewallet/hi22-app-tdewalletmanager.png
index 8bc4cdb..8bc4cdb 100644
--- a/kwallet/hi22-app-kwalletmanager.png
+++ b/tdewallet/hi22-app-tdewalletmanager.png
diff --git a/kwallet/hi32-app-kwalletmanager.png b/tdewallet/hi32-app-tdewalletmanager.png
index 69a7c1e..69a7c1e 100644
--- a/kwallet/hi32-app-kwalletmanager.png
+++ b/tdewallet/hi32-app-tdewalletmanager.png
diff --git a/kwallet/hi32-app-kwalletmanager2.png b/tdewallet/hi32-app-tdewalletmanager2.png
index 3cfc4e2..3cfc4e2 100644
--- a/kwallet/hi32-app-kwalletmanager2.png
+++ b/tdewallet/hi32-app-tdewalletmanager2.png
diff --git a/kwallet/hi48-app-kwalletmanager.png b/tdewallet/hi48-app-tdewalletmanager.png
index 5b46a87..5b46a87 100644
--- a/kwallet/hi48-app-kwalletmanager.png
+++ b/tdewallet/hi48-app-tdewalletmanager.png
diff --git a/kwallet/hi48-app-kwalletmanager2.png b/tdewallet/hi48-app-tdewalletmanager2.png
index 3ae286d..3ae286d 100644
--- a/kwallet/hi48-app-kwalletmanager2.png
+++ b/tdewallet/hi48-app-tdewalletmanager2.png
diff --git a/kwallet/hi64-app-kwalletmanager.png b/tdewallet/hi64-app-tdewalletmanager.png
index 38a581c..38a581c 100644
--- a/kwallet/hi64-app-kwalletmanager.png
+++ b/tdewallet/hi64-app-tdewalletmanager.png
diff --git a/kwallet/hi64-app-kwalletmanager2.png b/tdewallet/hi64-app-tdewalletmanager2.png
index 2e5be4b..2e5be4b 100644
--- a/kwallet/hi64-app-kwalletmanager2.png
+++ b/tdewallet/hi64-app-tdewalletmanager2.png
diff --git a/kwallet/icons/CMakeLists.txt b/tdewallet/icons/CMakeLists.txt
index a943e6a..68f67e2 100644
--- a/kwallet/icons/CMakeLists.txt
+++ b/tdewallet/icons/CMakeLists.txt
@@ -9,8 +9,8 @@
 #
 #################################################
 
-tde_install_icons( kwalletmanager)
+tde_install_icons( tdewalletmanager)
 
 tde_install_icons( 
-  DESTINATION ${DATA_INSTALL_DIR}/kwalletmanager/icons
+  DESTINATION ${DATA_INSTALL_DIR}/tdewalletmanager/icons
 )
diff --git a/tdewallet/icons/Makefile.am b/tdewallet/icons/Makefile.am
new file mode 100644
index 0000000..65d4236
--- /dev/null
+++ b/tdewallet/icons/Makefile.am
@@ -0,0 +1,5 @@
+KDE_ICON = tdewalletmanager
+
+pics_ICON = AUTO
+picsdir = $(kde_datadir)/tdewalletmanager/icons
+
diff --git a/kwallet/icons/cr22-action-folder_closed.png b/tdewallet/icons/cr22-action-folder_closed.png
index e3ebad3..e3ebad3 100644
--- a/kwallet/icons/cr22-action-folder_closed.png
+++ b/tdewallet/icons/cr22-action-folder_closed.png
diff --git a/kwallet/icons/cr22-action-folder_open.png b/tdewallet/icons/cr22-action-folder_open.png
index ea175b7..ea175b7 100644
--- a/kwallet/icons/cr22-action-folder_open.png
+++ b/tdewallet/icons/cr22-action-folder_open.png
diff --git a/kwallet/icons/cr22-action-wallet_closed.png b/tdewallet/icons/cr22-action-wallet_closed.png
index 57558ac..57558ac 100644
--- a/kwallet/icons/cr22-action-wallet_closed.png
+++ b/tdewallet/icons/cr22-action-wallet_closed.png
diff --git a/kwallet/icons/cr22-action-wallet_open.png b/tdewallet/icons/cr22-action-wallet_open.png
index 55a447f..55a447f 100644
--- a/kwallet/icons/cr22-action-wallet_open.png
+++ b/tdewallet/icons/cr22-action-wallet_open.png
diff --git a/kwallet/kbetterthankdialogbase.ui b/tdewallet/kbetterthankdialogbase.ui
index 65d8b5a..65d8b5a 100644
--- a/kwallet/kbetterthankdialogbase.ui
+++ b/tdewallet/kbetterthankdialogbase.ui
diff --git a/kwallet/kbetterthankdialogbase.ui.h b/tdewallet/kbetterthankdialogbase.ui.h
index e97ffd1..e97ffd1 100644
--- a/kwallet/kbetterthankdialogbase.ui.h
+++ b/tdewallet/kbetterthankdialogbase.ui.h
diff --git a/kwallet/konfigurator/CMakeLists.txt b/tdewallet/konfigurator/CMakeLists.txt
index e6af5e7..d9283f8 100644
--- a/kwallet/konfigurator/CMakeLists.txt
+++ b/tdewallet/konfigurator/CMakeLists.txt
@@ -22,24 +22,24 @@ link_directories(
 )
 
 
-##### kcm_kwallet (kpart) #######################
+##### kcm_tdewallet (kpart) #######################
 
-tde_add_kpart( kcm_kwallet AUTOMOC
+tde_add_kpart( kcm_tdewallet AUTOMOC
   SOURCES walletconfigwidget.ui konfigurator.cpp
-  LINK tdeui-shared kwalletclient-shared
+  LINK tdeui-shared tdewalletclient-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
 ##### other data ################################
 
-install( FILES kwalletconfig.desktop
+install( FILES tdewalletconfig.desktop
   DESTINATION ${XDG_APPS_INSTALL_DIR}
 )
 
 install(
   FILES
-    kwallet_config.desktop
-    kwalletmanager_show.desktop
+    tdewallet_config.desktop
+    tdewalletmanager_show.desktop
   DESTINATION ${SERVICES_INSTALL_DIR}
 )
diff --git a/tdewallet/konfigurator/Makefile.am b/tdewallet/konfigurator/Makefile.am
new file mode 100644
index 0000000..b7fa556
--- /dev/null
+++ b/tdewallet/konfigurator/Makefile.am
@@ -0,0 +1,15 @@
+INCLUDES = $(all_includes)
+METASOURCES = AUTO
+
+kde_module_LTLIBRARIES = kcm_tdewallet.la
+kcm_tdewallet_la_SOURCES = walletconfigwidget.ui konfigurator.cpp
+kcm_tdewallet_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+kcm_tdewallet_la_LIBADD = $(LIB_TDEUI) -ltdewalletclient
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/kcmtdewallet.pot
+
+xdg_apps_DATA = tdewalletconfig.desktop
+
+kde_services_DATA = tdewallet_config.desktop tdewalletmanager_show.desktop
+
diff --git a/kwallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp
index dd03591..230b4c9 100644
--- a/kwallet/konfigurator/konfigurator.cpp
+++ b/tdewallet/konfigurator/konfigurator.cpp
@@ -28,7 +28,7 @@
 #include <kgenericfactory.h>
 #include <kinputdialog.h>
 #include <kpopupmenu.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
@@ -38,20 +38,20 @@
 #include <tqspinbox.h>
 
 typedef KGenericFactory<KWalletConfig, TQWidget> KWalletFactory;
-K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet"))
+K_EXPORT_COMPONENT_FACTORY(kcm_tdewallet, KWalletFactory("kcmtdewallet"))
 
 KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&)
 : TDECModule(KWalletFactory::instance(), parent, name) {
 
 	TDEAboutData *about =
-		new TDEAboutData(I18N_NOOP("kcmkwallet"),
+		new TDEAboutData(I18N_NOOP("kcmtdewallet"),
 				I18N_NOOP("TDE Wallet Control Module"),
 				0, 0, TDEAboutData::License_GPL,
 				I18N_NOOP("(c) 2003 George Staikos"));
 		about->addAuthor("George Staikos", 0, "staikos@kde.org");
 	setAboutData( about );
 
-	_cfg = new TDEConfig("kwalletrc", false, false);
+	_cfg = new TDEConfig("tdewalletrc", false, false);
 
 	TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	vbox->add(_wcw = new WalletConfigWidget(this));
@@ -76,7 +76,7 @@ KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringL
 	updateWalletLists();
 	load();
 
-	if (DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
+	if (DCOPClient::mainClient()->isApplicationRegistered("tdewalletmanager")) {
 		_wcw->_launch->hide();
 	}
 
@@ -163,10 +163,10 @@ void KWalletConfig::newNetworkWallet() {
 
 
 void KWalletConfig::launchManager() {
-	if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
-		TDEApplication::startServiceByDesktopName("kwalletmanager_show");
+	if (!DCOPClient::mainClient()->isApplicationRegistered("tdewalletmanager")) {
+		TDEApplication::startServiceByDesktopName("tdewalletmanager_show");
 	} else {
-		DCOPRef r("kwalletmanager", "kwalletmanager-mainwindow#1");
+		DCOPRef r("tdewalletmanager", "tdewalletmanager-mainwindow#1");
 		r.send("show");
 		r.send("raise");
 	}
@@ -284,7 +284,7 @@ void KWalletConfig::save() {
 	}
 
 	_cfg->sync();
-	DCOPRef("kded", "kwalletd").call("reconfigure()");
+	DCOPRef("kded", "tdewalletd").call("reconfigure()");
 
 	emit changed(false);
 }
diff --git a/kwallet/konfigurator/konfigurator.h b/tdewallet/konfigurator/konfigurator.h
index 418d2e5..418d2e5 100644
--- a/kwallet/konfigurator/konfigurator.h
+++ b/tdewallet/konfigurator/konfigurator.h
diff --git a/kwallet/konfigurator/kwallet_config.desktop b/tdewallet/konfigurator/tdewallet_config.desktop
index d1bdf5b..a30297b 100644
--- a/kwallet/konfigurator/kwallet_config.desktop
+++ b/tdewallet/konfigurator/tdewallet_config.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Service
-Exec=kcmshell --caption %c kwalletconfig
-Icon=kwalletmanager
-DocPath=kwallet/index.html
+Exec=kcmshell --caption %c tdewalletconfig
+Icon=tdewalletmanager
+DocPath=tdewallet/index.html
 Name=TDE Wallet
 Name[ar]=محفظة كدى
 Name[bg]=Портфейл
diff --git a/kwallet/konfigurator/kwalletconfig.desktop b/tdewallet/konfigurator/tdewalletconfig.desktop
index 4dedee9..ccae543 100644
--- a/kwallet/konfigurator/kwalletconfig.desktop
+++ b/tdewallet/konfigurator/tdewalletconfig.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Icon=kwalletmanager
+Icon=tdewalletmanager
 Type=Application
-Exec=kcmshell kwalletconfig
-DocPath=kwallet/index.html
+Exec=kcmshell tdewalletconfig
+DocPath=tdewallet/index.html
 X-TDE-ModuleType=Library
-X-TDE-Library=kwallet
+X-TDE-Library=tdewallet
 X-TDE-ParentApp=kcontrol
 
 Name=TDE Wallet
diff --git a/kwallet/konfigurator/kwalletmanager_show.desktop b/tdewallet/konfigurator/tdewalletmanager_show.desktop
index 66ba71c..3de02d0 100644
--- a/kwallet/konfigurator/kwalletmanager_show.desktop
+++ b/tdewallet/konfigurator/tdewalletmanager_show.desktop
@@ -52,9 +52,9 @@ Name[uz]=Qopchiq boshqarish vositasi
 Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
 Name[zh_CN]=钱包管理工具
 Name[zh_TW]=錢包管理工具
-Exec=kwalletmanager --show %u
+Exec=tdewalletmanager --show %u
 MimeType=application/x-kde-wallet
 InitialPreference=6
-Icon=kwalletmanager
+Icon=tdewalletmanager
 Type=Service
 X-TDE-StartupNotify=true
diff --git a/kwallet/konfigurator/walletconfigwidget.ui b/tdewallet/konfigurator/walletconfigwidget.ui
index 5f51713..5f51713 100644
--- a/kwallet/konfigurator/walletconfigwidget.ui
+++ b/tdewallet/konfigurator/walletconfigwidget.ui
diff --git a/kwallet/kwalletmanager-kwalletd.desktop b/tdewallet/kwalletmanager-tdewalletd.desktop
index ca037fa..d4f9706 100644
--- a/kwallet/kwalletmanager-kwalletd.desktop
+++ b/tdewallet/kwalletmanager-tdewalletd.desktop
@@ -52,8 +52,8 @@ Name[uz]=Qopchiq boshqarish vositasi
 Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
 Name[zh_CN]=钱包管理工具
 Name[zh_TW]=錢包管理工具
-Exec=kwalletmanager --kwalletd
-Icon=kwalletmanager
+Exec=tdewalletmanager --tdewalletd
+Icon=tdewalletmanager
 Type=Application
 Terminal=false
 X-TDE-StartupNotify=false
diff --git a/kwallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp
index 2a9e332..2a9e332 100644
--- a/kwallet/kwmapeditor.cpp
+++ b/tdewallet/kwmapeditor.cpp
diff --git a/kwallet/kwmapeditor.h b/tdewallet/kwmapeditor.h
index 0fade7b..0fade7b 100644
--- a/kwallet/kwmapeditor.h
+++ b/tdewallet/kwmapeditor.h
diff --git a/kwallet/main.cpp b/tdewallet/main.cpp
index 5790ef9..2279783 100644
--- a/kwallet/main.cpp
+++ b/tdewallet/main.cpp
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 
-#include "kwalletmanager.h"
+#include "tdewalletmanager.h"
 
 
 class MyApp : public KUniqueApplication {
@@ -43,12 +43,12 @@ class MyApp : public KUniqueApplication {
 int main(int argc, char **argv) {
 	static KCmdLineOptions options[] = {
 		{"show", I18N_NOOP("Show window on startup"), 0},
-		{"kwalletd", I18N_NOOP("For use by kwalletd only"), 0},
+		{"tdewalletd", I18N_NOOP("For use by tdewalletd only"), 0},
 		{"+name", I18N_NOOP("A wallet name"), 0},
 		KCmdLineLastOption
 	};
 
-	TDEAboutData about("kwalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1",
+	TDEAboutData about("tdewalletmanager", I18N_NOOP("TDE Wallet Manager"), "1.1",
 		I18N_NOOP("TDE Wallet Management Tool"),
 		TDEAboutData::License_GPL,
 		I18N_NOOP("(c) 2003,2004 George Staikos"), 0,
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
 
 	a.setMainWidget(&wm);
 
-	TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
+	TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
@@ -79,8 +79,8 @@ int main(int argc, char **argv) {
 		wm.show();
 	}
 
-	if (args->isSet("kwalletd")) {
-		wm.kwalletdLaunch();
+	if (args->isSet("tdewalletd")) {
+		wm.tdewalletdLaunch();
 	}
 
 	for (int i = 0; i < args->count(); ++i) {
diff --git a/kwallet/kwalleteditor.cpp b/tdewallet/tdewalleteditor.cpp
index 83c69f8..f85294f 100644
--- a/kwallet/kwalleteditor.cpp
+++ b/tdewallet/tdewalleteditor.cpp
@@ -20,7 +20,7 @@
 
 
 #include "kbetterthankdialogbase.h"
-#include "kwalleteditor.h"
+#include "tdewalleteditor.h"
 #include "kwmapeditor.h"
 #include "allyourbase.h"
 
@@ -128,7 +128,7 @@ KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *pare
 	}
 
 	createActions();
-	createGUI("kwalleteditor.rc");
+	createGUI("tdewalleteditor.rc");
 	delete toolBar();
 
 	setCaption(wallet);
@@ -1127,11 +1127,11 @@ void KWalletEditor::setNewWallet(bool x) {
 void KWalletEditor::saveAs() {
 	KURL url = KFileDialog::getSaveURL(TQString(), "*.kwl", this);
 	if (!url.isEmpty()) {
-		// Sync() kwalletd
+		// Sync() tdewalletd
 		if (_nonLocal) {
 			TDEIO::NetAccess::file_copy(KURL(_walletName), url, 0600, false, false, this);
 		} else {
-			TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + _walletName + ".kwl";
+			TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + "/" + _walletName + ".kwl";
 			KURL destURL; destURL.setPath(path);
 			TDEIO::NetAccess::file_copy(destURL, url, 0600, false, false, this);
 		}
@@ -1139,5 +1139,5 @@ void KWalletEditor::saveAs() {
 }
 
 
-#include "kwalleteditor.moc"
+#include "tdewalleteditor.moc"
 
diff --git a/kwallet/kwalleteditor.h b/tdewallet/tdewalleteditor.h
index 9f63961..fa7ea25 100644
--- a/kwallet/kwalleteditor.h
+++ b/tdewallet/tdewalleteditor.h
@@ -22,7 +22,7 @@
 #define KWALLETEDITOR_H
 
 #include "walletwidget.h"
-#include <kwallet.h>
+#include <tdewallet.h>
 #include <kmainwindow.h>
 #include <tqstringlist.h>
 
diff --git a/kwallet/kwalleteditor.rc b/tdewallet/tdewalleteditor.rc
index 9c4faf5..76bd319 100644
--- a/kwallet/kwalleteditor.rc
+++ b/tdewallet/tdewalleteditor.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="kwalleteditor" version="2">
+<kpartgui name="tdewalleteditor" version="2">
   <MenuBar>
     <Menu name="file"><text>&amp;File</text>
       <Action name="create_folder"/>
diff --git a/kwallet/kwalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index 7457682..9e16b74 100644
--- a/kwallet/kwalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -18,9 +18,9 @@
 */
 
 
-#include "kwalletmanager.h"
-#include "kwalletpopup.h"
-#include "kwalleteditor.h"
+#include "tdewalletmanager.h"
+#include "tdewalletpopup.h"
+#include "tdewalleteditor.h"
 #include "allyourbase.h"
 
 #include <dcopclient.h>
@@ -37,7 +37,7 @@
 #include <kstandarddirs.h>
 #include <kstdaction.h>
 #include <ksystemtray.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 
 #include <tqaccel.h>
 #include <tqguardedptr.h>
@@ -48,17 +48,17 @@
 
 KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
 : KMainWindow(parent, name, f), DCOPObject("KWalletManager") {
-	TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
-	_kwalletdLaunch = false;
-	TQAccel *accel = new TQAccel(this, "kwalletmanager");
+	TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
+	_tdewalletdLaunch = false;
+	TQAccel *accel = new TQAccel(this, "tdewalletmanager");
 
 	TDEApplication::dcopClient()->setQtBridgeEnabled(false);
 	_shuttingDown = false;
-	TDEConfig cfg("kwalletrc"); // not sure why this setting isn't in kwalletmanagerrc...
+	TDEConfig cfg("tdewalletrc"); // not sure why this setting isn't in tdewalletmanagerrc...
 	TDEConfigGroup walletConfigGroup(&cfg, "Wallet");
 	_dcopRef = 0L;
 	if (walletConfigGroup.readBoolEntry("Launch Manager", true)) {
-		_tray = new KSystemTray(this, "kwalletmanager tray");
+		_tray = new KSystemTray(this, "tdewalletmanager tray");
 		_tray->setPixmap(loadSystemTrayIcon("wallet_closed"));
 		TQToolTip::add(_tray, i18n("TDE Wallet: No wallets open."));
 		connect(_tray, TQT_SIGNAL(quitSelected()), TQT_SLOT(shuttingDown()));
@@ -83,7 +83,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
 		_tray = 0L;
 	}
 
-	_iconView = new KWalletIconView(this, "kwalletmanager icon view");
+	_iconView = new KWalletIconView(this, "tdewalletmanager icon view");
 	connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(openWallet(TQIconViewItem*)));
 	connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&)));
 
@@ -91,7 +91,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
 	setCentralWidget(_iconView);
 	_iconView->setMinimumSize(320, 200);
 
-	_dcopRef = new DCOPRef("kded", "kwalletd");
+	_dcopRef = new DCOPRef("kded", "tdewalletd");
 	_dcopRef->dcopClient()->setNotifications(true);
 	connect(_dcopRef->dcopClient(),
 		TQT_SIGNAL(applicationRemoved(const TQCString&)),
@@ -112,7 +112,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
 	//        wallet closes before we are done opening.  We will then stay
 	//        open.  Must check that a wallet is still open here.
 
-	new KAction(i18n("&New Wallet..."), "kwalletmanager", 0, TQT_TQOBJECT(this),
+	new KAction(i18n("&New Wallet..."), "tdewalletmanager", 0, TQT_TQOBJECT(this),
 			TQT_SLOT(createWallet()), actionCollection(),
 			"wallet_create");
 	KAction *act = new KAction(i18n("Configure &Wallet..."), "configure",
@@ -131,7 +131,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f)
 	KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
 actionCollection());
 
-	createGUI("kwalletmanager.rc");
+	createGUI("tdewalletmanager.rc");
 	accel->connectItem(accel->insertItem(Key_Return), TQT_TQOBJECT(this), TQT_SLOT(openWallet()));
 	accel->connectItem(accel->insertItem(Key_Delete), TQT_TQOBJECT(this), TQT_SLOT(deleteWallet()));
 
@@ -141,7 +141,7 @@ actionCollection());
 		show();
 	}
 
-	kapp->setName("kwallet"); // hack to fix docs
+	kapp->setName("tdewallet"); // hack to fix docs
 }
 
 
@@ -152,8 +152,8 @@ KWalletManager::~KWalletManager() {
 }
 
 
-void KWalletManager::kwalletdLaunch() {
-	_kwalletdLaunch = true;
+void KWalletManager::tdewalletdLaunch() {
+	_tdewalletdLaunch = true;
 }
 
 
@@ -326,12 +326,12 @@ void KWalletManager::allWalletsClosed() {
 
 
 void KWalletManager::possiblyQuit() {
-	TDEConfig cfg("kwalletrc");
+	TDEConfig cfg("tdewalletrc");
 	cfg.setGroup("Wallet");
 	if (_windows.isEmpty() &&
 			!isVisible() &&
 			!cfg.readBoolEntry("Leave Manager Open", false) &&
-			_kwalletdLaunch) {
+			_tdewalletdLaunch) {
 		kapp->quit();
 	}
 }
@@ -399,7 +399,7 @@ void KWalletManager::shuttingDown() {
 
 
 void KWalletManager::setupWallet() {
-	TDEApplication::startServiceByDesktopName("kwallet_config");
+	TDEApplication::startServiceByDesktopName("tdewallet_config");
 }
 
 
@@ -420,4 +420,4 @@ TQPixmap KWalletManager::loadSystemTrayIcon(const TQString &icon) {
 }
 
 
-#include "kwalletmanager.moc"
+#include "tdewalletmanager.moc"
diff --git a/kwallet/kwalletmanager.desktop b/tdewallet/tdewalletmanager.desktop
index 15a8b05..915a341 100644
--- a/kwallet/kwalletmanager.desktop
+++ b/tdewallet/tdewalletmanager.desktop
@@ -52,12 +52,12 @@ Name[uz]=Qopchiq boshqarish vositasi
 Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
 Name[zh_CN]=钱包管理工具
 Name[zh_TW]=錢包管理工具
-Exec=kwalletmanager %u
+Exec=tdewalletmanager %u
 MimeType=application/x-kde-wallet;
 InitialPreference=6
-Icon=kwalletmanager
+Icon=tdewalletmanager
 Type=Application
 Terminal=false
 X-TDE-StartupNotify=false
 Categories=Qt;TDE;Settings;
-DocPath=kwallet/index.html
+DocPath=tdewallet/index.html
diff --git a/kwallet/kwalletmanager.h b/tdewallet/tdewalletmanager.h
index 1cec995..23103d5 100644
--- a/kwallet/kwalletmanager.h
+++ b/tdewallet/tdewalletmanager.h
@@ -41,7 +41,7 @@ class KWalletManager : public KMainWindow, public DCOPObject {
 
                 TQPixmap loadSystemTrayIcon(const TQString &icon);
 
-		void kwalletdLaunch();
+		void tdewalletdLaunch();
 
 	public slots:
 		void createWallet();
@@ -79,7 +79,7 @@ class KWalletManager : public KMainWindow, public DCOPObject {
 		KWalletIconView *_iconView;
 		DCOPRef *_dcopRef;
 		TQPtrList<KMainWindow> _windows;
-		bool _kwalletdLaunch;
+		bool _tdewalletdLaunch;
 };
 
 #endif
diff --git a/kwallet/kwalletmanager.rc b/tdewallet/tdewalletmanager.rc
index a1fd2c8..509e4b0 100644
--- a/kwallet/kwalletmanager.rc
+++ b/tdewallet/tdewalletmanager.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="kwalletmanager" version="3">
+<kpartgui name="tdewalletmanager" version="3">
   <MenuBar>
     <Menu name="file"><text>&amp;File</text>
       <Action name="wallet_create"/>
diff --git a/kwallet/kwalletpopup.cpp b/tdewallet/tdewalletpopup.cpp
index 032ec8a..05f142d 100644
--- a/kwallet/kwalletpopup.cpp
+++ b/tdewallet/tdewalletpopup.cpp
@@ -18,20 +18,20 @@
 */
 
 
-#include "kwalletpopup.h"
+#include "tdewalletpopup.h"
 
 #include <kaction.h>
 #include <kdebug.h>
 #include <kiconview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kwallet.h>
+#include <tdewallet.h>
 #include <kstdguiitem.h>
 
 KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char *name)
 : KPopupMenu(parent, name), _walletName(wallet) {
 	insertTitle(wallet);
-	KActionCollection *ac = new KActionCollection(this, "kwallet context actions");
+	KActionCollection *ac = new KActionCollection(this, "tdewallet context actions");
 	KAction *act;
 
 	act = new KAction(i18n("&New Wallet..."), 0, 0, TQT_TQOBJECT(this),
@@ -106,5 +106,5 @@ void KWalletPopup::disconnectApp(int id) {
 	KWallet::Wallet::disconnectApplication(_walletName, _appMap[id].latin1());
 }
 
-#include "kwalletpopup.moc"
+#include "tdewalletpopup.moc"
 
diff --git a/kwallet/kwalletpopup.h b/tdewallet/tdewalletpopup.h
index 8ef78b0..8ef78b0 100644
--- a/kwallet/kwalletpopup.h
+++ b/tdewallet/tdewalletpopup.h
diff --git a/kwallet/walletwidget.ui b/tdewallet/walletwidget.ui
index 9979097..9979097 100644
--- a/kwallet/walletwidget.ui
+++ b/tdewallet/walletwidget.ui