diff --git a/Makefile.am b/Makefile.am
index 1fa9998..dd5d960 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 SUBDIRS = part kxmleditor po doc 
 
 EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO kxmleditor.lsm admin
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 # not a GNU package. You can remove this line, if 
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 
diff --git a/README b/README
index 58af37c..009fdfa 100644
--- a/README
+++ b/README
@@ -8,13 +8,13 @@ KXML Editor is KParts application, and it must be installed properly to KDE dire
 
 Before ./configure, make and make install process, use
 
-export KDEDIR=/opt/kde3
+export TDEDIR=/opt/kde3
 export QTDIR=/usr/lib/qt3
 
 Of course look where is KDE and Qt path in your system and use correct directories.
 
 If you experience startup crash, check if library libxmleditorpart.so.1.0.0
-is exists in KDEDIR/lib directory.
+is exists in TDEDIR/lib directory.
 
 =======================================================================
 
diff --git a/configure.in.in b/configure.in.in
index 9a5fee9..9906eec 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,4 +1,5 @@
 #MIN_CONFIG
+KDE_ENABLE_HIDDEN_VISIBILITY
 
 AM_INIT_AUTOMAKE(kxmleditor,1.1.4)
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 05a9fba..52da3dc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 SUBDIRS = en 
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index e1a4f66..c26826e 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -1,9 +1,9 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 
-EXTRA_DIST = index.docbook screenshot.png xml.png setuptargz.png setupprintout.png setupdefaults.png setuptexteditor.png setuptreeview.png specprocinstrdlg.png texteditor.png kparts.png
+EXTRA_DIST = index.docbook screenshot.png xml.png setuptargz.png setupprintout.png setupdefaults.png setuptexteditor.png setuptreeview.png specprocinstrdlg.png texteditor.png tdeparts.png
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 
 KDE_LANG = en
 KDE_DOCS = kxmleditor
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 8785a5d..a61b5ec 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -299,7 +299,7 @@ main window.
 <screeninfo>Special processing instruction dialog</screeninfo>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="kparts.png" format="PNG" />
+	    <imagedata fileref="tdeparts.png" format="PNG" />
 	  </imageobject>
 	</mediaobject>
 </screenshot>
@@ -1455,8 +1455,8 @@ You may obtain &kxmleditor; from URL:
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
-kdelibs, or kdebase.
+.Libraries or other software that is not included in tdesupport,
+tdelibs, or tdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
 .Operating systems the app will run on. If your app is designed only for a
diff --git a/doc/en/kparts.png b/doc/en/tdeparts.png
similarity index 100%
rename from doc/en/kparts.png
rename to doc/en/tdeparts.png
diff --git a/kxmleditor/Makefile.am b/kxmleditor/Makefile.am
index 16a0017..f0ae227 100644
--- a/kxmleditor/Makefile.am
+++ b/kxmleditor/Makefile.am
@@ -1,10 +1,10 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 bin_PROGRAMS = kxmleditor
 
 kxmleditor_SOURCES = dcopiface_shell.skel dcopiface_shell.cpp 	kxmleditorshell.cpp 	main.cpp kxeshellmanager.cpp
 kxmleditor_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kxmleditor_LDADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP
+kxmleditor_LDADD = $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP
 
 EXTRA_DIST = main.cpp \
 	kxmleditor.desktop \
@@ -19,7 +19,7 @@ uninstall-local:
 	-rm -f $(kde_appsdir)/Applications/kxmleditor.desktop
 	-rmdir $(kde_appsdir)/Applications
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 # this 10 paths are KDE specific. Use them:
 # kde_htmldir       Where your docs should go to. (contains lang subdirs)
 # kde_appsdir       Where your application file (.kdelnk) should go to.
diff --git a/kxmleditor/kxmleditor.desktop b/kxmleditor/kxmleditor.desktop
index 556f62a..ed28f4d 100644
--- a/kxmleditor/kxmleditor.desktop
+++ b/kxmleditor/kxmleditor.desktop
@@ -2,11 +2,11 @@
 Type=Application
 Exec=kxmleditor -caption "%c" %i %m  
 Icon=kxmleditor.png
-DocPath=kxmleditor/index.html
+X-DocPath=kxmleditor/index.html
 Comment=XML editor
 Comment[fi]=XML-editori
 Terminal=false
 Name=KXML Editor
 MimeType=text/xml;
 Encoding=UTF-8
-Categories=Application;Development;TextEditor;KDE;
+Categories=Application;Development;TextEditor;TDE;
diff --git a/kxmleditor/kxmleditorshell.cpp b/kxmleditor/kxmleditorshell.cpp
index 8299bc3..5e6b2ba 100644
--- a/kxmleditor/kxmleditorshell.cpp
+++ b/kxmleditor/kxmleditorshell.cpp
@@ -25,18 +25,18 @@
 
 #include <klibloader.h>
 #include <kstdaction.h>
-#include <kapplication.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kstatusbar.h>
-#include <kparts/browserextension.h>
-#include <kparts/partmanager.h>
-#include <kmessagebox.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/partmanager.h>
+#include <tdemessagebox.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqevent.h>
 
@@ -60,10 +60,10 @@ KXMLEditorShell::KXMLEditorShell( const char * name, WFlags f )
 	KStdAction::open( this, SLOT(slotFileOpen()), actionCollection() );
 	m_pActFileOpenRecent = KStdAction::openRecent( this, SLOT(slotFileOpenRecent(const KURL&)), actionCollection() );
 	m_pActFileOpenRecent->loadEntries( instance()->config() );
-	m_pActReload = new KAction( i18n("Reloa&d"), "reload", Key_F5, this, SLOT(slotFileReload()), actionCollection(), "reload" );
+	m_pActReload = new TDEAction( i18n("Reloa&d"), "reload", Key_F5, this, SLOT(slotFileReload()), actionCollection(), "reload" );
 	
-	KToggleAction * pActToggleMainToolBar = KStdAction::showToolbar( this, SLOT(slotToggleMainToolBar()), actionCollection() );
-	KToggleAction * pActToggleStatusBar = KStdAction::showStatusbar( this, SLOT(slotToggleStatusBar()), actionCollection() );
+	TDEToggleAction * pActToggleMainToolBar = KStdAction::showToolbar( this, SLOT(slotToggleMainToolBar()), actionCollection() );
+	TDEToggleAction * pActToggleStatusBar = KStdAction::showStatusbar( this, SLOT(slotToggleStatusBar()), actionCollection() );
 	KStdAction::keyBindings( this, SLOT(slotConfigureKeys()), actionCollection() );
 	KStdAction::configureToolbars( this, SLOT(slotConfigureToolbars()), actionCollection() );
 
@@ -73,9 +73,9 @@ KXMLEditorShell::KXMLEditorShell( const char * name, WFlags f )
 
 	// L.V. moved to part pActPrint = KStdAction::print( 0, 0, actionCollection(), "print" );
 
-	pActCloseW = new KAction( i18n("&Close"), 0, 0, this,SLOT(slotActWindowClose()), actionCollection(), "window_close" );
-	pActCloseAllW = new KAction( i18n("Close &all"), 0, 0, this,SLOT(slotActWindowCloseAll()), actionCollection(), "window_close_all" );
-	pActCloseAllO = new KAction( i18n("Close all &others"), 0, 0, this,SLOT(slotActWindowCloseAllOthers()), actionCollection(), "window_close_all_others" );
+	pActCloseW = new TDEAction( i18n("&Close"), 0, 0, this,SLOT(slotActWindowClose()), actionCollection(), "window_close" );
+	pActCloseAllW = new TDEAction( i18n("Close &all"), 0, 0, this,SLOT(slotActWindowCloseAll()), actionCollection(), "window_close_all" );
+	pActCloseAllO = new TDEAction( i18n("Close all &others"), 0, 0, this,SLOT(slotActWindowCloseAllOthers()), actionCollection(), "window_close_all_others" );
 
 	//////////////////////////////
 	// CREATE STATUSBAR
@@ -247,7 +247,7 @@ bool KXMLEditorShell::queryClose()
 	return KParts::MainWindow::queryClose();
 }
 
-void KXMLEditorShell::saveProperties( KConfig * pConfig )
+void KXMLEditorShell::saveProperties( TDEConfig * pConfig )
 {
 	if (part())
 	{
@@ -256,7 +256,7 @@ void KXMLEditorShell::saveProperties( KConfig * pConfig )
 	KParts::MainWindow::saveProperties(pConfig);
 }
 
-void KXMLEditorShell::readProperties( KConfig * pConfig )
+void KXMLEditorShell::readProperties( TDEConfig * pConfig )
 {
 	KParts::MainWindow::readProperties(pConfig);
 
@@ -268,7 +268,7 @@ void KXMLEditorShell::readProperties( KConfig * pConfig )
 
 void KXMLEditorShell::slotEnableBrowserExtActions( const char * pszName, bool bEnabled )
 {
-	KAction * pAct = actionCollection()->action( pszName );
+	TDEAction * pAct = actionCollection()->action( pszName );
 	if ( pAct )
 		pAct->setEnabled( bEnabled );
 	else
@@ -391,7 +391,7 @@ void KXMLEditorShell::setPart(KParts::ReadWritePart* pPart)
 	}
 
 	// keep pointer to window menu
-	m_windowMenu = static_cast<KPopupMenu*>(factory()->container("window", this));
+	m_windowMenu = static_cast<TDEPopupMenu*>(factory()->container("window", this));
 	if(!m_windowMenu)
 		kdDebug() << "KXMLEditorShell::setPart - m_windowMenu is NULL" << endl;
 	else
@@ -424,7 +424,7 @@ void KXMLEditorShell::close()
 {
 	if (queryClose())
 	{
-		if (KMainWindow::memberList->count()==1)
+		if (TDEMainWindow::memberList->count()==1)
 			kapp->deref();
 		delete this;
 	}
@@ -432,7 +432,7 @@ void KXMLEditorShell::close()
 
 void KXMLEditorShell::slotActWindowCloseAllOthers()
 {
-	TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList);
+	TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList);
 	for (it.toFirst();it.current();++it)
 	{
 		if (it.current()!=this)
diff --git a/kxmleditor/kxmleditorshell.h b/kxmleditor/kxmleditorshell.h
index 1f0f0a1..b5f47e0 100644
--- a/kxmleditor/kxmleditorshell.h
+++ b/kxmleditor/kxmleditorshell.h
@@ -22,11 +22,11 @@
 #ifndef KXMLEDITORSHELL_H
 #define KXMLEDITORSHELL_H
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class KParts::ReadWritePart;
 class KXMLEditorShellIface;
-class KAction;
+class TDEAction;
 class KXEShellManager;
 
 
@@ -103,7 +103,7 @@ class KXMLEditorShell : public KParts::MainWindow
 		The application will try to start default mail client and prepare
 		new empty mail with currently opened file as an attachment.
 		The file have to be saved first on a disc.
-			@sa KApplication::invokeMailer()
+			@sa TDEApplication::invokeMailer()
 		*/
 		void mail();
 
@@ -128,24 +128,24 @@ class KXMLEditorShell : public KParts::MainWindow
 
 	protected:
 		virtual bool queryClose();
-		virtual void saveProperties( KConfig * );
-		virtual void readProperties( KConfig * );
+		virtual void saveProperties( TDEConfig * );
+		virtual void readProperties( TDEConfig * );
 
 		/** @short Stores pointer to currenly shown part. */
 		KParts::ReadWritePart * m_pPart;
 
 		/** @short Action for recently opened files. */
-		KRecentFilesAction * m_pActFileOpenRecent;
+		TDERecentFilesAction * m_pActFileOpenRecent;
 
 		/** @short Action for reloading the document currently open. */
-		KAction * m_pActReload;
+		TDEAction * m_pActReload;
 
 		/** @short Action for printing complete XML files.*/
-		// L.V. moved to part. KAction* pActPrint;
+		// L.V. moved to part. TDEAction* pActPrint;
 
-		KAction* pActCloseW;
-		KAction* pActCloseAllW;
-		KAction* pActCloseAllO;
+		TDEAction* pActCloseW;
+		TDEAction* pActCloseAllW;
+		TDEAction* pActCloseAllO;
 
 		/** @short DCOP interface pointer (if no such iface pointer == 0).*/
 		KXMLEditorShellIface * m_pKXEShellIface;
@@ -153,7 +153,7 @@ class KXMLEditorShell : public KParts::MainWindow
 		/** @short Stores pointer to window menu.
 
 		 This menu is expanded everytime new shell is shown. */
-		KPopupMenu* m_windowMenu;
+		TDEPopupMenu* m_windowMenu;
 
 		/** @short Returns currently shown part. */
 		KParts::ReadWritePart* part() const {return m_pPart;}
diff --git a/kxmleditor/main.cpp b/kxmleditor/main.cpp
index 0bbfc79..7c7726f 100644
--- a/kxmleditor/main.cpp
+++ b/kxmleditor/main.cpp
@@ -15,12 +15,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 
 //#include "kxmleditor.h"
@@ -28,7 +28,7 @@
 #include "kxmleditorshell.h"
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "+[File(s)]", I18N_NOOP("XML file(s) to open"), 0 },
   { 0, 0, 0 }
@@ -40,10 +40,10 @@ static KCmdLineOptions options[] =
 /** @short Main application function that starts-up the application */
 int main(int argc, char *argv[])
 {
-	KCmdLineArgs::init( argc, argv, new KXMLEditorAboutData() );
-	KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+	TDECmdLineArgs::init( argc, argv, new KXMLEditorAboutData() );
+	TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
-	KApplication app;
+	TDEApplication app;
 
   // comment the following lines to use KXMLEditorShell instead of KXMLEditorApp
 #if ! USE_KPART
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
     KXMLEditorApp *kxmleditor = new KXMLEditorApp();
     kxmleditor->show();
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 		if(args->count())
 			{ TQString strPath;
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 	}
 	else
 	{
-		KCmdLineArgs * pArgs = KCmdLineArgs::parsedArgs();
+		TDECmdLineArgs * pArgs = TDECmdLineArgs::parsedArgs();
 		KXMLEditorShell * pShell;
 		bool bNoCorrectInstance = true;
 		if ( pArgs->count() > 0 )
diff --git a/part/Makefile.am b/part/Makefile.am
index b02ac42..99e03e2 100644
--- a/part/Makefile.am
+++ b/part/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES =  libkxmleditorpart.la
 libkxmleditorpart_la_SOURCES = kxesearchdialogbase.ui kxesearchdialog.cpp kxeprocinstrdialogbase.ui kxeprocinstrdialog.cpp kxespecprocinstrdialogbase.ui kxespecprocinstrdialog.cpp kxeelementdialogbase.ui kxeelementdialog.cpp kxeattributedialogbase.ui kxeattributedialog.cpp kxechardatadialogbase.ui kxechardatadialog.cpp kxeattachdialogbase.ui kxechoosestringdialogbase.ui kxechoosestringdialog.cpp kxefilenewdialog.cpp kxeconfiguration.cpp kxesettings.cpp kxetreeviewsettingspage.ui kxetreeviewsettings.cpp kxenewfilesettingspage.ui kxenewfilesettings.cpp kxeprintsettingspage.ui kxeprintsettings.cpp kxearchiveextssettingspage.ui kxearchiveextssettings.cpp kxetextviewsettingspage.ui kxetextviewsettings.cpp kxe_treeviewitem.cpp kxe_treeview.cpp kxe_viewelement.cpp kxe_viewattributes.cpp kxesyntaxhighlighter.cpp kxetexteditordialogbase.ui kxetexteditordialog.cpp actions.cpp qdom_add.cpp kxecommand.cpp commands_file.cpp commands_edit.cpp commands_insert.cpp kxmleditorpart.cpp kxmleditorfactory.cpp dcopiface_part_ro.skel dcopiface_part_ro.cpp kxedocument.cpp
 
 libkxmleditorpart_la_LDFLAGS = -module $(all_libraries) -version-info 1:0:0
-libkxmleditorpart_la_LIBADD = $(LIB_KDEPRINT)
+libkxmleditorpart_la_LIBADD = $(LIB_TDEPRINT)
 
 SUBDIRS = pics icons
 
diff --git a/part/actions.cpp b/part/actions.cpp
index 7076e09..79aea8d 100644
--- a/part/actions.cpp
+++ b/part/actions.cpp
@@ -25,7 +25,7 @@
 #include <tqapplication.h>
 
 // include files for KDE
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <kdebug.h>
@@ -42,7 +42,7 @@ KXmlEditorComboAction::KXmlEditorComboAction(const TQString& text,
                                              const char *member,
                                              TQObject* parent,
                                              const char* name)
-    : KAction(text, accel, parent, name),
+    : TDEAction(text, accel, parent, name),
       m_pCombo(0)
 {
 	m_receiver = receiver;
@@ -61,12 +61,12 @@ TQComboBox* KXmlEditorComboAction::comboBox()
 
 int KXmlEditorComboAction::plug(TQWidget *w, int index)
 {
-  //  if ( !w->inherits( "KToolBar" ) );
+  //  if ( !w->inherits( "TDEToolBar" ) );
   //    return -1;
 
-  KToolBar *toolBar = (KToolBar *) w;
+  TDEToolBar *toolBar = (TDEToolBar *) w;
 
-  int id = KAction::getToolButtonID();
+  int id = TDEAction::getToolButtonID();
   //kdDebug() << "KXmlEditorComboAction::plug id=" << id << endl;
 
   m_pCombo = new TQComboBox( toolBar, "Path Combo" );
@@ -88,10 +88,10 @@ int KXmlEditorComboAction::plug(TQWidget *w, int index)
 
 void KXmlEditorComboAction::unplug(TQWidget *w)
 {
-//  if ( !w->inherits( "KToolBar" ) )
+//  if ( !w->inherits( "TDEToolBar" ) )
 //    return;
 
-  KToolBar *toolBar = (KToolBar *)w;
+  TDEToolBar *toolBar = (TDEToolBar *)w;
 
   int idx = findContainer( w );
   //kdDebug() << "KXmlEditorComboAction::unplug idx=" << idx << " menuId=" << menuId(idx) << endl;
@@ -218,7 +218,7 @@ int KXmlEditorComboAction::findItem( const TQString & text )
 }
 
 ToolbarLabel::ToolbarLabel(  const TQString& text )
-  : TQLabel( text, 0L, "kde toolbar widget" )	// Use this name for it to be styled!
+  : TQLabel( text, 0L, "tde toolbar widget" )	// Use this name for it to be styled!
 //  , m_mw(mw)
 {
   setBackgroundMode( TQt::PaletteButton );
diff --git a/part/actions.h b/part/actions.h
index 3956c74..f6d9af7 100644
--- a/part/actions.h
+++ b/part/actions.h
@@ -18,7 +18,7 @@
 #ifndef ACTIONS_H
 #define ACTIONS_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqlabel.h>
 class TQComboBox;
 
@@ -26,7 +26,7 @@ class TQComboBox;
   *@author Lumir Vanek
   */
 
-class KXmlEditorComboAction : public KAction
+class KXmlEditorComboAction : public TDEAction
 {
   Q_OBJECT
 public:
diff --git a/part/commands_edit.h b/part/commands_edit.h
index 776ebfc..423d695 100644
--- a/part/commands_edit.h
+++ b/part/commands_edit.h
@@ -19,7 +19,7 @@
 
 #include "kxecommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqobjectlist.h>
 
diff --git a/part/commands_file.cpp b/part/commands_file.cpp
index b19e15d..1767e88 100644
--- a/part/commands_file.cpp
+++ b/part/commands_file.cpp
@@ -17,7 +17,7 @@
 #include "commands_file.h"
 #include <tqstring.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 //////////////////////////////////////////////////////////////////////////////////////////
 ///////////		Setting Version & Encoding		//////////
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/part/commands_file.h b/part/commands_file.h
index 18c695a..cf0cf19 100644
--- a/part/commands_file.h
+++ b/part/commands_file.h
@@ -18,7 +18,7 @@
 #define COMMANDS_FILE_H
 
 #include "kxecommand.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 /** @file
 	This file contains all commands taken from menu File which
diff --git a/part/commands_insert.h b/part/commands_insert.h
index d0f5963..6e7c65f 100644
--- a/part/commands_insert.h
+++ b/part/commands_insert.h
@@ -17,7 +17,7 @@
 #ifndef COMMANDS_INSERT_H
 #define COMMANDS_INSERT_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kxecommand.h"
 #include "kxechardatadialog.h"
diff --git a/part/kxe_treeview.cpp b/part/kxe_treeview.cpp
index ce89961..e16b3c8 100644
--- a/part/kxe_treeview.cpp
+++ b/part/kxe_treeview.cpp
@@ -24,13 +24,13 @@
 #include "kxeconfiguration.h"
 #include "kxetreeviewsettings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kxmlgui.h>
 #include <kxmlguiclient.h>
-#include <kpopupmenu.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdepopupmenu.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
 
 // include files for TQt
 #include "qdom_add.h"
@@ -45,7 +45,7 @@ static const int autoOpenTimeout = 750;
 
 
 KXE_TreeView::KXE_TreeView( KXMLGUIClient * pGUIClient, TQWidget * pParent, const char * pszName )
-	: KListView(pParent,pszName),
+	: TDEListView(pParent,pszName),
 	  m_pGUIClient(pGUIClient),
 	  m_nBookmarkedItems(0)
 {
@@ -363,7 +363,7 @@ TQString KXE_TreeView::getSelectedPath() const
 
 void KXE_TreeView::contentsMousePressEvent( TQMouseEvent * pEvent )
 {
-	KListView::contentsMousePressEvent(pEvent);
+	TDEListView::contentsMousePressEvent(pEvent);
 
 	if ( pEvent->button() == RightButton )
 	{
@@ -668,7 +668,7 @@ void KXE_TreeView::rename( TQListViewItem * pItem, int nColumn )
 
 	KXE_TreeViewItem * pXMLItem = static_cast <KXE_TreeViewItem*> (pItem);
 	if ( pXMLItem->xmlNode()->isElement() )    // inplace-renaming only for items representing XML elements
-		KListView::rename( pItem, nColumn ); // inplace-renaming via base class functionality
+		TDEListView::rename( pItem, nColumn ); // inplace-renaming via base class functionality
 
 	else if(pXMLItem->xmlNode()->isCharacterData()) // launch dialog for editing text nodes
 		(dynamic_cast <KXMLEditorPart *> (m_pGUIClient))->slotXmlCharDataEdit();
@@ -698,16 +698,16 @@ KXE_TreeViewItem * KXE_TreeView::findCorrespondingItem( const TQDomNode & node )
 // Drag & Drop
 //////////////////////////////////////////////////////////////
 
-/** Overrides KListView::contentsMouseMoveEvent */
+/** Overrides TDEListView::contentsMouseMoveEvent */
 void KXE_TreeView::contentsMouseMoveEvent(TQMouseEvent *e)
 {
-	KListView::contentsMouseMoveEvent(e);
+	TDEListView::contentsMouseMoveEvent(e);
 
 	// exit, if dragging is disabled
 	if ( ! KXMLEditorFactory::configuration()->treeview()->enableDragging() )
 		return;
 
-  if(!m_bDrag || (e->pos() - m_dragPos).manhattanLength() <= KGlobalSettings::dndEventDelay())
+  if(!m_bDrag || (e->pos() - m_dragPos).manhattanLength() <= TDEGlobalSettings::dndEventDelay())
         return;
 
   m_bDrag = false;
@@ -732,10 +732,10 @@ void KXE_TreeView::contentsMouseMoveEvent(TQMouseEvent *e)
   pDrag->drag();
 }
 
-/** Overrides KListView::contentsMouseReleaseEvent */
+/** Overrides TDEListView::contentsMouseReleaseEvent */
 void KXE_TreeView::contentsMouseReleaseEvent(TQMouseEvent *e)
 {
-	KListView::contentsMouseReleaseEvent(e);
+	TDEListView::contentsMouseReleaseEvent(e);
   m_bDrag = false;
 }
 
@@ -904,7 +904,7 @@ KXE_TreeViewItem* KXE_TreeView::lastChild()
 
 void KXE_TreeView::keyPressEvent(TQKeyEvent *e)
 {
-	KListView::keyPressEvent(e);
+	TDEListView::keyPressEvent(e);
 	emit sigKeyPressed(e);
 }
 
diff --git a/part/kxe_treeview.h b/part/kxe_treeview.h
index 1b642f5..481797e 100644
--- a/part/kxe_treeview.h
+++ b/part/kxe_treeview.h
@@ -18,7 +18,7 @@
 #ifndef KXE_TREEVIEW_H
 #define KXE_TREEVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstrlist.h>
 
 class KXESearchDialog;
@@ -39,7 +39,7 @@ class KXE_TreeViewItem;
  * This is a listview, which displays the XML tree structure.
  * @short shows XML tree
  */
-class KXE_TreeView : public KListView
+class KXE_TreeView : public TDEListView
 {
 		Q_OBJECT
 
@@ -167,10 +167,10 @@ protected:
 	/** Finds the corresponding treeview item to the given node. */
 	KXE_TreeViewItem * findCorrespondingItem( const TQDomNode & node );
 
-	/** Overrides KListView::contentsMouseReleaseEvent */
+	/** Overrides TDEListView::contentsMouseReleaseEvent */
 	void contentsMouseReleaseEvent(TQMouseEvent *);
 
-	/** Overrides KListView::contentsMouseMoveEvent */
+	/** Overrides TDEListView::contentsMouseMoveEvent */
 	void contentsMouseMoveEvent(TQMouseEvent *);
 
 	/** Overrides TQScrollView::contentsDragEnterEvent */
diff --git a/part/kxe_treeviewitem.cpp b/part/kxe_treeviewitem.cpp
index c6537b0..4163497 100644
--- a/part/kxe_treeviewitem.cpp
+++ b/part/kxe_treeviewitem.cpp
@@ -25,7 +25,7 @@
 
 #include <tqregexp.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
@@ -41,7 +41,7 @@ KXE_TreeViewItem::KXE_TreeViewItem( const TQDomNode & xmlNode, TQListViewItem *
 	initChilds();
 }
 
-KXE_TreeViewItem::KXE_TreeViewItem( const TQDomNode & xmlNode, KListView * pParent,  TQListViewItem* pAfter)
+KXE_TreeViewItem::KXE_TreeViewItem( const TQDomNode & xmlNode, TDEListView * pParent,  TQListViewItem* pAfter)
 	: TQListViewItem(pParent,pAfter),
 	  m_xmlNode(xmlNode),
 	  m_pPrevSibling(0),
@@ -325,6 +325,6 @@ void KXE_TreeViewItem::startRename( int iCol )
 	// If the given column is set to be in-place renameable in this item's view,
 	// we can start renaming in-place.
 	// Remember: This function is only reached for items representing XML elements.
-	if ( (reinterpret_cast<KListView*> ( listView() ))->isRenameable( iCol ) )
+	if ( (reinterpret_cast<TDEListView*> ( listView() ))->isRenameable( iCol ) )
 		TQListViewItem::startRename( iCol );
 }
diff --git a/part/kxe_treeviewitem.h b/part/kxe_treeviewitem.h
index 20430f8..ee1c7f1 100644
--- a/part/kxe_treeviewitem.h
+++ b/part/kxe_treeviewitem.h
@@ -22,7 +22,7 @@
 #include <tqpixmap.h>
 #include <tqdom.h>
 
-class KListView;
+class TDEListView;
 
 /**
  * This is a tree item, which represents one XML node (see @ref TQDomNode and its childclasses).
@@ -33,7 +33,7 @@ class KXE_TreeViewItem : public TQListViewItem
 {
 	public:
 
-		KXE_TreeViewItem( const TQDomNode & xmlNode, KListView * pParent,  TQListViewItem* pAfter=NULL);
+		KXE_TreeViewItem( const TQDomNode & xmlNode, TDEListView * pParent,  TQListViewItem* pAfter=NULL);
 		KXE_TreeViewItem( const TQDomNode & xmlNode, TQListViewItem * pParent );
 		KXE_TreeViewItem( const TQDomNode & xmlNode, TQListViewItem * pParent, TQListViewItem * pAfter );
     ~KXE_TreeViewItem();
diff --git a/part/kxe_viewattributes.cpp b/part/kxe_viewattributes.cpp
index 0a4d3f3..59084cf 100644
--- a/part/kxe_viewattributes.cpp
+++ b/part/kxe_viewattributes.cpp
@@ -19,9 +19,9 @@
 
 #include "kxeattributedialog.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KXE_ViewAttributes::KXE_ViewAttributes( TQWidget * pParent, const char * pszName )
 	: TQTable( 0, 3, pParent, pszName )
diff --git a/part/kxe_viewelement.cpp b/part/kxe_viewelement.cpp
index 39271b9..2c7b4ba 100644
--- a/part/kxe_viewelement.cpp
+++ b/part/kxe_viewelement.cpp
@@ -23,7 +23,7 @@
 #include "kxeconfiguration.h"
 #include "kxetextviewsettings.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktextedit.h>
 
 #include <tqdom.h>
@@ -35,7 +35,7 @@
 
 #define CONFIG_SPLITTER_SIZES "View Element splitter sizes"
 
-KXE_ViewElement::KXE_ViewElement( TQWidget * pParent, KConfig *pConfig, const char * pszName )
+KXE_ViewElement::KXE_ViewElement( TQWidget * pParent, TDEConfig *pConfig, const char * pszName )
 	: TQSplitter( TQt::Vertical, pParent, pszName )
 {
 	setOpaqueResize(true);
diff --git a/part/kxe_viewelement.h b/part/kxe_viewelement.h
index f838079..219c4fa 100644
--- a/part/kxe_viewelement.h
+++ b/part/kxe_viewelement.h
@@ -25,7 +25,7 @@
 // forward declarations
 class KXE_ViewAttributes;
 class KTextEdit;
-class KConfig;
+class TDEConfig;
 class KXESyntaxHighlighter;
 
 
@@ -41,7 +41,7 @@ class KXE_ViewElement : public TQSplitter
 
 	public:
 
-		KXE_ViewElement( TQWidget * pParent, KConfig *pConfig, const char * pszName = 0 );
+		KXE_ViewElement( TQWidget * pParent, TDEConfig *pConfig, const char * pszName = 0 );
 		~KXE_ViewElement();
 
 		/** Returns a pointer to the currently selected attribute or a null pointer. */
@@ -68,7 +68,7 @@ class KXE_ViewElement : public TQSplitter
 		KTextEdit * m_pViewPlainXML;
 
 		/** configuration used to store splitter sizes */
-		KConfig *m_pConfig;
+		TDEConfig *m_pConfig;
 
 		/** Syntax highlighter for m_pViewPlainXML */
 		KXESyntaxHighlighter *m_pSyntaxHighlighter;
diff --git a/part/kxearchiveextssettings.cpp b/part/kxearchiveextssettings.cpp
index 9f51882..7344552 100644
--- a/part/kxearchiveextssettings.cpp
+++ b/part/kxearchiveextssettings.cpp
@@ -18,8 +18,8 @@
 #include "kxearchiveextssettings.h"
 #include "kxearchiveextssettingspage.h"
 
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 
 #include <tqframe.h>
 #include <tqlistbox.h>
@@ -35,13 +35,13 @@ KXEArchiveExtsSettings::KXEArchiveExtsSettings( TQObject * pParent, const char *
 }
 
 
-void KXEArchiveExtsSettings::write( KConfig * pConfig ) const
+void KXEArchiveExtsSettings::write( TDEConfig * pConfig ) const
 {
 	pConfig->writeEntry( CONF_ENTRY_NAME_EXTS_TARGZ, m_lstExtensions );
 }
 
 
-void KXEArchiveExtsSettings::read( const KConfig * pConfig )
+void KXEArchiveExtsSettings::read( const TDEConfig * pConfig )
 {
 	m_lstExtensions = pConfig->readListEntry( CONF_ENTRY_NAME_EXTS_TARGZ );
 }
diff --git a/part/kxearchiveextssettings.h b/part/kxearchiveextssettings.h
index 107fc77..9cf9bc8 100644
--- a/part/kxearchiveextssettings.h
+++ b/part/kxearchiveextssettings.h
@@ -63,11 +63,11 @@ class KXEArchiveExtsSettings : public KXESettings
 		/**
 		 * Derived from @ref KXESettings
 		 */
-		virtual void write( KConfig * ) const;
+		virtual void write( TDEConfig * ) const;
 		/**
 		 * Derived from @ref KXESettings
 		 */
-		virtual void read( const KConfig * );
+		virtual void read( const TDEConfig * );
 		/**
 		 * Derived from @ref KXESettings
 		 */
diff --git a/part/kxeattributedialog.cpp b/part/kxeattributedialog.cpp
index 80f66ed..a9fba96 100644
--- a/part/kxeattributedialog.cpp
+++ b/part/kxeattributedialog.cpp
@@ -19,7 +19,7 @@
 
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpushbutton.h>
 #include <tqlabel.h>
diff --git a/part/kxechardatadialog.cpp b/part/kxechardatadialog.cpp
index 434c156..eb1f5c2 100644
--- a/part/kxechardatadialog.cpp
+++ b/part/kxechardatadialog.cpp
@@ -23,7 +23,7 @@
 #include <tqtextedit.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KXECharDataDialog::KXECharDataDialog( TQWidget * pParent, const char * pszName, bool fModal, WFlags fl )
 	: KXECharDataDialogBase( pParent, pszName, fModal, fl )
diff --git a/part/kxeconfiguration.cpp b/part/kxeconfiguration.cpp
index a06e90e..6e8c425 100644
--- a/part/kxeconfiguration.cpp
+++ b/part/kxeconfiguration.cpp
@@ -22,8 +22,8 @@
 #include "kxeprintsettings.h"
 #include "kxearchiveextssettings.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 
@@ -51,10 +51,10 @@ KXEConfiguration::~KXEConfiguration()
 		delete m_pDialog;
 }
 
-void KXEConfiguration::store( KConfig * pConfig ) const
+void KXEConfiguration::store( TDEConfig * pConfig ) const
 {
 	if ( ! pConfig )
-		pConfig = KGlobal::config();
+		pConfig = TDEGlobal::config();
 
 	m_pTreeView->store( pConfig );
 	m_pTextView->store( pConfig );
@@ -64,10 +64,10 @@ void KXEConfiguration::store( KConfig * pConfig ) const
 }
 
 
-void KXEConfiguration::restore( KConfig * pConfig )
+void KXEConfiguration::restore( TDEConfig * pConfig )
 {
 	if ( ! pConfig )
-		pConfig = KGlobal::config();
+		pConfig = TDEGlobal::config();
 
 	m_pTreeView->restore( pConfig );
 	m_pTextView->restore( pConfig );
@@ -101,7 +101,7 @@ void KXEConfiguration::showDialog()
 		// - tree view properties page
 		pFrame = m_pDialog->addPage( m_pTreeView->dialogPageName(),
 		                             m_pTreeView->dialogPageHeader(),
-		                             KGlobal::instance()->iconLoader()->loadIcon( m_pTreeView->dialogPageIcon(), KIcon::NoGroup, KIcon::SizeMedium ) );
+		                             TDEGlobal::instance()->iconLoader()->loadIcon( m_pTreeView->dialogPageIcon(), TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 		pLayout = new TQVBoxLayout( pFrame );
 		pPage = m_pTreeView->dialogPage( pFrame );
 		pLayout->addWidget( pPage );
@@ -110,7 +110,7 @@ void KXEConfiguration::showDialog()
 		// - text view properties page
 		pFrame = m_pDialog->addPage( m_pTextView->dialogPageName(),
 		                             m_pTextView->dialogPageHeader(),
-		                             KGlobal::instance()->iconLoader()->loadIcon( m_pTextView->dialogPageIcon(), KIcon::NoGroup, KIcon::SizeMedium ) );
+		                             TDEGlobal::instance()->iconLoader()->loadIcon( m_pTextView->dialogPageIcon(), TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 		pLayout = new TQVBoxLayout( pFrame );
 		pPage = m_pTextView->dialogPage( pFrame );
 		pLayout->addWidget( pPage );
@@ -119,7 +119,7 @@ void KXEConfiguration::showDialog()
 		// - new file settings page
 		pFrame = m_pDialog->addPage( m_pNewFile->dialogPageName(),
 		                             m_pNewFile->dialogPageHeader(),
-		                             KGlobal::instance()->iconLoader()->loadIcon( m_pNewFile->dialogPageIcon(), KIcon::NoGroup, KIcon::SizeMedium ) );
+		                             TDEGlobal::instance()->iconLoader()->loadIcon( m_pNewFile->dialogPageIcon(), TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 		pLayout = new TQVBoxLayout( pFrame );
 		pPage = m_pNewFile->dialogPage( pFrame );
 		pLayout->addWidget( pPage );
@@ -128,7 +128,7 @@ void KXEConfiguration::showDialog()
 		// - printing's settings page
 		pFrame = m_pDialog->addPage( m_pPrint->dialogPageName(),
 		                             m_pPrint->dialogPageHeader(),
-		                             KGlobal::instance()->iconLoader()->loadIcon( m_pPrint->dialogPageIcon(), KIcon::NoGroup, KIcon::SizeMedium ) );
+		                             TDEGlobal::instance()->iconLoader()->loadIcon( m_pPrint->dialogPageIcon(), TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 		pLayout = new TQVBoxLayout( pFrame );
 		pPage = m_pPrint->dialogPage( pFrame );
 		pLayout->addWidget( pPage );
@@ -137,7 +137,7 @@ void KXEConfiguration::showDialog()
 		// - archive extensions page
 		pFrame = m_pDialog->addPage( m_pArcExts->dialogPageName(),
 		                             m_pArcExts->dialogPageHeader(),
-		                             KGlobal::instance()->iconLoader()->loadIcon( m_pArcExts->dialogPageIcon(), KIcon::NoGroup, KIcon::SizeMedium ) );
+		                             TDEGlobal::instance()->iconLoader()->loadIcon( m_pArcExts->dialogPageIcon(), TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 		pLayout = new TQVBoxLayout( pFrame );
 		pPage = m_pArcExts->dialogPage( pFrame );
 		pLayout->addWidget( pPage );
diff --git a/part/kxeconfiguration.h b/part/kxeconfiguration.h
index a0569c8..44acfe7 100644
--- a/part/kxeconfiguration.h
+++ b/part/kxeconfiguration.h
@@ -26,7 +26,7 @@ class KXENewFileSettings;
 class KXEPrintSettings;
 class KXEArchiveExtsSettings;
 
-class KConfig;
+class TDEConfig;
 class KDialogBase;
 
 /**
@@ -57,19 +57,19 @@ class KXEConfiguration : public TQObject
 		~KXEConfiguration();
 
 		/**
-		 * Stores all configuration to the given @ref KConfig object by
+		 * Stores all configuration to the given @ref TDEConfig object by
 		 * using @ref KXESettings's @ref store function.
-		 * If no @ref KConfig object is given, @ref KGlobal::config is
+		 * If no @ref TDEConfig object is given, @ref TDEGlobal::config is
 		 * used.
 		 */
-		void store( KConfig * pConfig = 0 ) const;
+		void store( TDEConfig * pConfig = 0 ) const;
 		/**
-		 * Restores all configuration from the given @ref KConfig object
+		 * Restores all configuration from the given @ref TDEConfig object
 		 * by using @ref KXESettings's @ref restore function.
-		 * If no @ref KConfig object is given, @ref KGlobal::config is
+		 * If no @ref TDEConfig object is given, @ref TDEGlobal::config is
 		 * used.
 		 */
-		void restore( KConfig * pConfig = 0 );
+		void restore( TDEConfig * pConfig = 0 );
 		/**
 		 * Shows the configuration dialog.
 		 * If there is no one yet, it is created by.
diff --git a/part/kxedocument.cpp b/part/kxedocument.cpp
index 52394fa..c990d10 100644
--- a/part/kxedocument.cpp
+++ b/part/kxedocument.cpp
@@ -24,16 +24,16 @@
 #include "commands_file.h"
 
 
-#include <kfile.h>
+#include <tdefile.h>
 #include <ktar.h>
 #include <kzip.h>
 #include <kfilterdev.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kcommand.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 
diff --git a/part/kxedocument.h b/part/kxedocument.h
index 7379086..83039bf 100644
--- a/part/kxedocument.h
+++ b/part/kxedocument.h
@@ -16,7 +16,7 @@
 
 #include <tqobject.h>
 #include <tqdom.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kxmlguiclient.h>
 
 #define SCHEMA_NAMESPACE 		"http://www.w3.org/2001/XMLSchema-instance"
diff --git a/part/kxeelementdialog.cpp b/part/kxeelementdialog.cpp
index ef807c0..adfadfd 100644
--- a/part/kxeelementdialog.cpp
+++ b/part/kxeelementdialog.cpp
@@ -23,7 +23,7 @@
 
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KXEElementDialog::KXEElementDialog( TQWidget * pParent, const char * pszName, bool fModal, WFlags fl )
 	: KXEElementDialogBase( pParent, pszName, fModal, fl )
diff --git a/part/kxenewfilesettings.cpp b/part/kxenewfilesettings.cpp
index cc9a4fc..cdf78fa 100644
--- a/part/kxenewfilesettings.cpp
+++ b/part/kxenewfilesettings.cpp
@@ -18,8 +18,8 @@
 #include "kxenewfilesettings.h"
 #include "kxenewfilesettingspage.h"
 
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqframe.h>
@@ -48,7 +48,7 @@ KXENewFileSettings::KXENewFileSettings( TQObject * pParent, const char * pszName
 }
 
 
-void KXENewFileSettings::write( KConfig * pConfig ) const
+void KXENewFileSettings::write( TDEConfig * pConfig ) const
 {
 	pConfig->writeEntry( CONF_ENTRY_NAME_DFLT_VERSION, m_strDfltVersion );
 	pConfig->writeEntry( CONF_ENTRY_NAME_DFLT_ENCODING, m_strDfltEncoding );
@@ -56,7 +56,7 @@ void KXENewFileSettings::write( KConfig * pConfig ) const
 }
 
 
-void KXENewFileSettings::read( const KConfig * pConfig )
+void KXENewFileSettings::read( const TDEConfig * pConfig )
 {
 	m_strDfltVersion = pConfig->readEntry( CONF_ENTRY_NAME_DFLT_VERSION, DFLT_VALUE_DFLT_VERSION );
 	m_strDfltEncoding = pConfig->readEntry( CONF_ENTRY_NAME_DFLT_ENCODING, DFLT_VALUE_DFLT_ENCODING );
@@ -166,7 +166,7 @@ TQStringList KXENewFileSettings::encodings()
 // function(s) to set this settings group data //
 /////////////////////////////////////////////////
 
-void KXENewFileSettings::setNewFileCreaBehav( NewFileCreationBehaviour enmNewFileCreaBehav, KConfig * pConfig )
+void KXENewFileSettings::setNewFileCreaBehav( NewFileCreationBehaviour enmNewFileCreaBehav, TDEConfig * pConfig )
 {
 	// if the data really has been changed
 	if ( m_enmNewFileCreaBehav != enmNewFileCreaBehav )
diff --git a/part/kxenewfilesettings.h b/part/kxenewfilesettings.h
index 647f080..e53f4a0 100644
--- a/part/kxenewfilesettings.h
+++ b/part/kxenewfilesettings.h
@@ -57,7 +57,7 @@ class KXENewFileSettings : public KXESettings
 		 * @ref m_pDialogPage), stores this value to the given config.file
 		 * and emits the signal @ref KXESettings::sigChanged.
 		 */
-		void setNewFileCreaBehav( NewFileCreationBehaviour, KConfig * );
+		void setNewFileCreaBehav( NewFileCreationBehaviour, TDEConfig * );
 
 		/**
 		 * Derived from @ref KXESettings
@@ -81,11 +81,11 @@ class KXENewFileSettings : public KXESettings
 		/**
 		 * Derived from @ref KXESettings
 		 */
-		virtual void write( KConfig * ) const;
+		virtual void write( TDEConfig * ) const;
 		/**
 		 * Derived from @ref KXESettings
 		 */
-		virtual void read( const KConfig * );
+		virtual void read( const TDEConfig * );
 		/**
 		 * Derived from @ref KXESettings
 		 */
diff --git a/part/kxeprintsettings.cpp b/part/kxeprintsettings.cpp
index 61451fe..b09f280 100644
--- a/part/kxeprintsettings.cpp
+++ b/part/kxeprintsettings.cpp
@@ -18,9 +18,9 @@
 #include "kxeprintsettings.h"
 #include "kxeprintsettingspage.h"
 
-#include <klocale.h>
-#include <kconfig.h>
-#include <kfontcombo.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
+#include <tdefontcombo.h>
 
 #include <tqframe.h>
 #include <tqspinbox.h>
@@ -54,7 +54,7 @@ KXEPrintSettings::KXEPrintSettings( TQObject * pParent, const char * pszName )
 }
 
 
-void KXEPrintSettings::write( KConfig * pConfig ) const
+void KXEPrintSettings::write( TDEConfig * pConfig ) const
 {
 	pConfig->writeEntry( CONF_ENTRY_NAME_FONTFAMILY, m_strFontFamily );
 	pConfig->writeEntry( CONF_ENTRY_NAME_FONTSIZE, m_iFontSize );
@@ -64,7 +64,7 @@ void KXEPrintSettings::write( KConfig * pConfig ) const
 }
 
 
-void KXEPrintSettings::read( const KConfig * pConfig )
+void KXEPrintSettings::read( const TDEConfig * pConfig )
 {
 	m_strFontFamily = pConfig->readEntry( CONF_ENTRY_NAME_FONTFAMILY, DFLT_VALUE_FONTFAMILY );
 	m_iFontSize = pConfig->readNumEntry( CONF_ENTRY_NAME_FONTSIZE, DFLT_VALUE_FONTSIZE );
diff --git a/part/kxeprintsettings.h b/part/kxeprintsettings.h
index 0b24a0f..a66d627 100644
--- a/part/kxeprintsettings.h
+++ b/part/kxeprintsettings.h
@@ -63,11 +63,11 @@ class KXEPrintSettings : public KXESettings
 		/**
 		 * Derived from @ref KXESettings
 		 */
-		virtual void write( KConfig * ) const;
+		virtual void write( TDEConfig * ) const;
 		/**
 		 * Derived from @ref KXESettings
 		 */
-		virtual void read( const KConfig * );
+		virtual void read( const TDEConfig * );
 		/**
 		 * Derived from @ref KXESettings
 		 */
diff --git a/part/kxeprintsettingspage.ui b/part/kxeprintsettingspage.ui
index 69d6eb1..ee75c62 100644
--- a/part/kxeprintsettingspage.ui
+++ b/part/kxeprintsettingspage.ui
@@ -41,7 +41,7 @@
 Choose the font family you want to be used on printing your XML documents.</string>
             </property>
         </widget>
-        <widget class="KFontCombo">
+        <widget class="TDEFontCombo">
             <property name="name">
                 <cstring>m_pFontFamily</cstring>
             </property>
@@ -222,7 +222,7 @@ You can determine wether you want a footline to be printed on every page when pr
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
diff --git a/part/kxeprocinstrdialog.cpp b/part/kxeprocinstrdialog.cpp
index 1210beb..ef5287b 100644
--- a/part/kxeprocinstrdialog.cpp
+++ b/part/kxeprocinstrdialog.cpp
@@ -24,8 +24,8 @@
 
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 KXEProcInstrDialog::KXEProcInstrDialog( TQWidget * pParent, const char * pszName, bool fModal, WFlags fl )
 	: KXEProcInstrDialogBase( pParent, pszName, fModal, fl )
diff --git a/part/kxesettings.cpp b/part/kxesettings.cpp
index 59b71f0..d367cbd 100644
--- a/part/kxesettings.cpp
+++ b/part/kxesettings.cpp
@@ -17,7 +17,7 @@
 
 #include "kxesettings.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KXESettings::KXESettings( const TQString & strConfigGroup,  TQObject * pParent, const char * pszName )
  : TQObject( pParent, pszName ),
@@ -27,18 +27,18 @@ KXESettings::KXESettings( const TQString & strConfigGroup,  TQObject * pParent,
 	connect( this, SIGNAL(sigDialogPageChanged()), this, SLOT(slotDialogPageChanged()) );
 }
 
-void KXESettings::setConfigGroup( KConfig * pConfig ) const
+void KXESettings::setConfigGroup( TDEConfig * pConfig ) const
 {
 	pConfig->setGroup( m_strConfigGroup );
 }
 
-void KXESettings::store( KConfig * pConfig ) const
+void KXESettings::store( TDEConfig * pConfig ) const
 {
 	setConfigGroup( pConfig );
 	write( pConfig );
 }
 
-void KXESettings::restore( KConfig * pConfig )
+void KXESettings::restore( TDEConfig * pConfig )
 {
 	setConfigGroup( pConfig );
 	read( pConfig );
diff --git a/part/kxesettings.h b/part/kxesettings.h
index b1a98ea..f8713b6 100644
--- a/part/kxesettings.h
+++ b/part/kxesettings.h
@@ -20,7 +20,7 @@
 
 #include <tqobject.h>
 
-class KConfig;
+class TDEConfig;
 class TQFrame;
 
 /**
@@ -45,26 +45,26 @@ class KXESettings : public TQObject
 		KXESettings( const TQString & strConfigGroup, TQObject * pParent = 0, const char * pszName = 0 );
 
 		/**
-		 * Stores this settings to the given @ref KConfig object, by doing the
+		 * Stores this settings to the given @ref TDEConfig object, by doing the
 		 * following things:
 		 *
 		 * - set the config group by calling @ref setConfigGroup
-		 * - write the data to the given @ref KConfig object by calling @ref write
+		 * - write the data to the given @ref TDEConfig object by calling @ref write
 		 *   (which is implemented in the child class)
 		 */
-		void store( KConfig * ) const;
+		void store( TDEConfig * ) const;
 		/**
-		 * Restores the settings from the given @ref KConfig object, by doing
+		 * Restores the settings from the given @ref TDEConfig object, by doing
 		 * following things:
 		 *
 		 * - set the config group by calling @ref setConfigGroup
-		 * - read the data from the given @ref KConfig object by calling @ref read
+		 * - read the data from the given @ref TDEConfig object by calling @ref read
 		 *   (which is implemented in the child class)
 		 * - try to update the corresponding config.page by calling @ref updatePage
 		 *   (implemented in the child class)
 		 * - emit the signal sigChanged
 		 */
-		void restore( KConfig * );
+		void restore( TDEConfig * );
 		/**
 		 * If the data in the corresponding configuration dialog page has been
 		 * changed (@ref m_bPageChanged), this data gets applied by the
@@ -122,15 +122,15 @@ class KXESettings : public TQObject
 	protected:
 
 		/**
-		 * Overide this function and write your settings to the given KConfig object.
+		 * Overide this function and write your settings to the given TDEConfig object.
 		 * You mustn't change the config group.
 		 */
-		virtual void write( KConfig * ) const = 0;
+		virtual void write( TDEConfig * ) const = 0;
 		/**
-		 * Overide this function and read the settings from the given KConfig object.
+		 * Overide this function and read the settings from the given TDEConfig object.
 		 * You mustn't change the config group.
 		 */
-		virtual void read( const KConfig * ) = 0;
+		virtual void read( const TDEConfig * ) = 0;
 		/**
 		 * Override this function to set this object's data to the data in the
 		 * corresponding configuration dialog page, if a page has already been
@@ -145,10 +145,10 @@ class KXESettings : public TQObject
 		 virtual void updatePage() const = 0;
 
 		/**
-		 * Sets the config group of the given @ref KConfig object to
+		 * Sets the config group of the given @ref TDEConfig object to
 		 * this setting's config group (@ref m_strConfigGroup).
 		 */
-		void setConfigGroup( KConfig * ) const;
+		void setConfigGroup( TDEConfig * ) const;
 
 		/**
 		 * This flag is set to true if the data in the corresponding configuration
diff --git a/part/kxetexteditordialog.cpp b/part/kxetexteditordialog.cpp
index 6e3fa39..18c782c 100644
--- a/part/kxetexteditordialog.cpp
+++ b/part/kxetexteditordialog.cpp
@@ -24,9 +24,9 @@
 #include <tqdom.h>
 #include <tqpushbutton.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 KXETextEditorDialog::KXETextEditorDialog(TQWidget *parent, const char *name)
diff --git a/part/kxetextviewsettings.cpp b/part/kxetextviewsettings.cpp
index afcb528..94f5eda 100644
--- a/part/kxetextviewsettings.cpp
+++ b/part/kxetextviewsettings.cpp
@@ -18,8 +18,8 @@
 #include "kxetextviewsettings.h"
 #include "kxetextviewsettingspage.h"
 
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kcolorbutton.h>
 #include <tqcheckbox.h>
@@ -71,7 +71,7 @@ KXETextViewSettings::KXETextViewSettings( TQObject * pParent, const char * pszNa
 }
 
 
-void KXETextViewSettings::write( KConfig * pConfig ) const
+void KXETextViewSettings::write( TDEConfig * pConfig ) const
 {
 	pConfig->writeEntry( CONF_ENTRY_NAME_COLOR_DEFAULT_TEXT, m_colorDfltText );
 	pConfig->writeEntry( CONF_ENTRY_NAME_COLOR_ELEMENT_NAMES, m_colorElemNames );
@@ -85,7 +85,7 @@ void KXETextViewSettings::write( KConfig * pConfig ) const
 }
 
 
-void KXETextViewSettings::read( const KConfig * pConfig )
+void KXETextViewSettings::read( const TDEConfig * pConfig )
 {
 	const TQColor tempColor1 = DFLT_VALUE_COLOR_DEFAULT_TEXT;
 	m_colorDfltText = pConfig->readColorEntry( CONF_ENTRY_NAME_COLOR_DEFAULT_TEXT, &tempColor1 );
diff --git a/part/kxetextviewsettings.h b/part/kxetextviewsettings.h
index 8b08d92..ab30df7 100644
--- a/part/kxetextviewsettings.h
+++ b/part/kxetextviewsettings.h
@@ -69,11 +69,11 @@ class KXETextViewSettings : public KXESettings
 		/**
 		 * Derived from @ref KXESettings
 		 */
-		virtual void write( KConfig * ) const;
+		virtual void write( TDEConfig * ) const;
 		/**
 		 * Derived from @ref KXESettings
 		 */
-		virtual void read( const KConfig * );
+		virtual void read( const TDEConfig * );
 		/**
 		 * Derived from @ref KXESettings
 		 */
diff --git a/part/kxetreeviewsettings.cpp b/part/kxetreeviewsettings.cpp
index 6a3529e..7c6f5d6 100644
--- a/part/kxetreeviewsettings.cpp
+++ b/part/kxetreeviewsettings.cpp
@@ -18,8 +18,8 @@
 #include "kxetreeviewsettings.h"
 #include "kxetreeviewsettingspage.h"
 
-#include <klocale.h>
-#include <kconfig.h>
+#include <tdelocale.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqframe.h>
@@ -59,7 +59,7 @@ KXETreeViewSettings::KXETreeViewSettings( TQObject * pParent, const char * pszNa
 {
 }
 
-void KXETreeViewSettings::write( KConfig * pConfig ) const
+void KXETreeViewSettings::write( TDEConfig * pConfig ) const
 {
 	pConfig->writeEntry( CONF_ENTRY_NAME_ITEMS_ON_DEMAND, m_bCreateItemsOnDemand );
 	pConfig->writeEntry( CONF_ENTRY_NAME_DFLT_EXP_LEVEL, m_iDfltExpLevel );
@@ -69,7 +69,7 @@ void KXETreeViewSettings::write( KConfig * pConfig ) const
 	pConfig->writeEntry( CONF_ENTRY_NAME_ELEM_DISPL_MODE, m_enmElemDisplMode );
 }
 
-void KXETreeViewSettings::read( const KConfig * pConfig )
+void KXETreeViewSettings::read( const TDEConfig * pConfig )
 {
 	m_bCreateItemsOnDemand = pConfig->readBoolEntry( CONF_ENTRY_NAME_ITEMS_ON_DEMAND, DFLT_VALUE_ITEMS_ON_DEMAND );
 	m_iDfltExpLevel = pConfig->readNumEntry( CONF_ENTRY_NAME_DFLT_EXP_LEVEL, DFLT_VALUE_DFLT_EXP_LEVEL );
diff --git a/part/kxetreeviewsettings.h b/part/kxetreeviewsettings.h
index 6839cfc..ee016f6 100644
--- a/part/kxetreeviewsettings.h
+++ b/part/kxetreeviewsettings.h
@@ -71,11 +71,11 @@ class KXETreeViewSettings : public KXESettings
 		/**
 		 * Derived from @ref KXESettings
 		 */
-		virtual void write( KConfig * ) const;
+		virtual void write( TDEConfig * ) const;
 		/**
 		 * Derived from @ref KXESettings
 		 */
-		virtual void read( const KConfig * );
+		virtual void read( const TDEConfig * );
 		/**
 		 * Derived from @ref KXESettings
 		 */
diff --git a/part/kxmleditorabout.h b/part/kxmleditorabout.h
index 67478f0..05b54dd 100644
--- a/part/kxmleditorabout.h
+++ b/part/kxmleditorabout.h
@@ -18,8 +18,8 @@
 #ifndef KXMLEDITORABOUT_H
 #define KXMLEDITORABOUT_H
 
-#include <kaboutdata.h>
-#include <klocale.h>
+#include <tdeaboutdata.h>
+#include <tdelocale.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -27,15 +27,15 @@
 
 static const char *description = I18N_NOOP("KXML Editor is an utility to display and edit XML files");
 
-class KXMLEditorAboutData : public KAboutData
+class KXMLEditorAboutData : public TDEAboutData
 {
 	public:
 		KXMLEditorAboutData()
-		 : KAboutData( "kxmleditor",
+		 : TDEAboutData( "kxmleditor",
 		               I18N_NOOP("KXML Editor"),
 		               VERSION,
 		               description,
-		               KAboutData::License_GPL,
+		               TDEAboutData::License_GPL,
 		               "(c) 2001-2004, The KXML Editor Developers",
 		               0,
 		               "http://kxmleditor.sourceforge.net",
diff --git a/part/kxmleditorfactory.cpp b/part/kxmleditorfactory.cpp
index 7479d31..5f57ea8 100644
--- a/part/kxmleditorfactory.cpp
+++ b/part/kxmleditorfactory.cpp
@@ -32,7 +32,7 @@ extern "C"
 	}
 } 
 
-KInstance * KXMLEditorFactory::s_instance = 0L;
+TDEInstance * KXMLEditorFactory::s_instance = 0L;
 KXEConfiguration * KXMLEditorFactory::s_pKXEConfig = 0L;
 
 KXMLEditorFactory::KXMLEditorFactory( TQObject * pParent, const char * pszName )
@@ -86,11 +86,11 @@ KParts::Part * KXMLEditorFactory::createPartObject( TQWidget * pParentWidget, co
 	return pPart;
 }
 
-KInstance * KXMLEditorFactory::instance()
+TDEInstance * KXMLEditorFactory::instance()
 {
 	if ( ! s_instance )
 	{
-		s_instance = new KInstance( new KXMLEditorAboutData() );
+		s_instance = new TDEInstance( new KXMLEditorAboutData() );
 	}
 	return s_instance;
 }
diff --git a/part/kxmleditorfactory.h b/part/kxmleditorfactory.h
index fa33d61..9a19bf2 100644
--- a/part/kxmleditorfactory.h
+++ b/part/kxmleditorfactory.h
@@ -22,9 +22,9 @@
 #ifndef KXMLEDITORFACTORY_H
 #define KXMLEDITORFACTORY_H
 
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
-class KInstance;
+class TDEInstance;
 class KXEConfiguration;
 /**
 	@brief Factory for creating our parts.
@@ -42,11 +42,11 @@ class KXMLEditorFactory : public KParts::Factory
 		/** @short Creates part object, depending on given part class */
 		virtual KParts::Part * createPartObject( TQWidget * pParentWidget = 0, const char * pszWidgetName = 0, TQObject * pParent = 0, const char * pszName = 0, const char * pszClassName = "KParts::Part", const TQStringList & args = TQStringList() );
 
-		static KInstance * instance();
+		static TDEInstance * instance();
 		static KXEConfiguration * configuration();
 
 	private:
-		static KInstance * s_instance;
+		static TDEInstance * s_instance;
 
 		/** @brief Our configuration - the same for all parts. */
 		static KXEConfiguration * s_pKXEConfig;
diff --git a/part/kxmleditorpart.cpp b/part/kxmleditorpart.cpp
index 33a8e51..671486f 100644
--- a/part/kxmleditorpart.cpp
+++ b/part/kxmleditorpart.cpp
@@ -48,21 +48,21 @@
 
 #include <kinstance.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kaction.h>
+#include <tdelocale.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <ktar.h>
 #include <kzip.h>
-#include <ktempfile.h>
-#include <kconfig.h>
+#include <tdetempfile.h>
+#include <tdeconfig.h>
 #include <kurlrequester.h>
 #include <kcommand.h>
-#include <ktoolbar.h>
-#include <kfiledialog.h>
+#include <tdetoolbar.h>
+#include <tdefiledialog.h>
 
 #include <tqregexp.h>
 #include <tqtextcodec.h>
@@ -121,43 +121,43 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge
 	// edit actions
 	m_pActEditFind = KStdAction::find( this, SLOT(slotEditFind()), actionCollection());
 	m_pActEditFindNext = KStdAction::findNext( this, SLOT(slotEditFindNext()), actionCollection());
-	m_pActEditDeselect = new KAction( i18n("D&eselect Node"), CTRL+Key_E, this,
+	m_pActEditDeselect = new TDEAction( i18n("D&eselect Node"), CTRL+Key_E, this,
 	                                SLOT(slotEditDeselect()), actionCollection(), "deselect" );
 
 	// view actions
-	m_pActViewNodeUp = new KAction( i18n("To &Parent Node"), "up", 0, this,
+	m_pActViewNodeUp = new TDEAction( i18n("To &Parent Node"), "up", 0, this,
 	                                SLOT(slotViewNodeUp()), actionCollection(), "treeitem_up" );
 
-	m_pActViewExpNode = new KToolBarPopupAction( i18n("&Expand Node"), "expand_node", CTRL+Key_Plus, this,
+	m_pActViewExpNode = new TDEToolBarPopupAction( i18n("&Expand Node"), "expand_node", CTRL+Key_Plus, this,
 	                                             SLOT(slotViewExpNode()), actionCollection(), "treeitem_expand" );
-	KPopupMenu * pMenuExpNode = m_pActViewExpNode->popupMenu();
+	TDEPopupMenu * pMenuExpNode = m_pActViewExpNode->popupMenu();
 	connect( pMenuExpNode, SIGNAL(activated(int)), this, SLOT(slotViewExpNode(int)) );
 	for ( uint i = 1; i <= 8; i++ )
 		pMenuExpNode->insertItem( i18n("Expand To Level %1").arg(i), i-1 );
 
-	m_pActViewColNode = new KToolBarPopupAction( i18n("&Collapse Node"), "collapse_node", CTRL+Key_Minus, this,
+	m_pActViewColNode = new TDEToolBarPopupAction( i18n("&Collapse Node"), "collapse_node", CTRL+Key_Minus, this,
 	                                             SLOT(slotViewColNode()), actionCollection(), "treeitem_collapse" );
-	KPopupMenu * pMenuColNode = m_pActViewColNode->popupMenu();
+	TDEPopupMenu * pMenuColNode = m_pActViewColNode->popupMenu();
 	connect( pMenuColNode, SIGNAL(activated(int)), this, SLOT(slotViewColNode(int)) );
 	for ( uint i = 0; i <= 7; i++ )
 		pMenuColNode->insertItem( i18n("Collapse To Level %1").arg(i), i );
 
 	// bookmark actions
-	m_pActBookmarksToggle = new KAction( i18n("&Toggle Bookmark"), "bookmark_add", CTRL+Key_B, this,
+	m_pActBookmarksToggle = new TDEAction( i18n("&Toggle Bookmark"), "bookmark_add", CTRL+Key_B, this,
 	                                   SLOT(slotBookmarksToggle()), actionCollection(), "bookmark_toggle" );
-	m_pActBookmarksPrev = new KAction( i18n("&Previous Bookmark"), "bookmark_prev", SHIFT+Key_F5, this,
+	m_pActBookmarksPrev = new TDEAction( i18n("&Previous Bookmark"), "bookmark_prev", SHIFT+Key_F5, this,
 	                                   SLOT(slotBookmarksPrev()), actionCollection(), "bookmark_prev" );
-	m_pActBookmarksNext = new KAction( i18n("&Next Bookmark"), "bookmark_next", Key_F5, this,
+	m_pActBookmarksNext = new TDEAction( i18n("&Next Bookmark"), "bookmark_next", Key_F5, this,
 	                                   SLOT(slotBookmarksNext()), actionCollection(), "bookmark_next" );
 
 	// settings actions
-	new KAction( i18n("&Configure KXMLEditor..."), "configure", 0, this,
+	new TDEAction( i18n("&Configure KXMLEditor..."), "configure", 0, this,
 	             SLOT (slotConfigure()), actionCollection(), "configure" );
 
 	// path toolbar
 	m_pActPathCombo = new KXmlEditorComboAction( i18n("Path Bar"), 0, this,
 	                                             SLOT(slotPathSelected(const TQString &)), actionCollection(), "path_combo" );
-	new KAction( i18n("Clear Path Bar"), BarIcon("locationbar_erase", 16), 0, this,
+	new TDEAction( i18n("Clear Path Bar"), BarIcon("locationbar_erase", 16), 0, this,
 	             SLOT(slotPathClear()), actionCollection(), "path_clear" );
 	TQLabel *m_locationLabel = new ToolbarLabel( i18n("Path: ") );
 	new KWidgetAction( m_locationLabel, i18n("Path: "), 0, this, 0, actionCollection(), "path_label" );
@@ -182,11 +182,11 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge
 	else
 	{
 		// document specific actions here
-		m_pActVersionEncoding = new KAction( i18n("&Version && Encoding..."), 0, 0, this, SLOT(slotActVersionEncoding()), actionCollection(), "xml_ins_spec_procins" );
-		m_pActAttachSchema = new KAction(i18n("Attach Schema..."),0,0,this,SLOT(slotActAttachSchema()), actionCollection(), "xml_attach_schema");
-		m_pActDetachSchema = new KAction(i18n("Detach Schema"),0,0,this,SLOT(slotActDetachSchema()), actionCollection(), "xml_detach_schema");
-		m_pActAttachStylesheet = new KAction(i18n("Attach Stylesheet..."),0,0,this,SLOT(slotActAttachStylesheet()), actionCollection(), "xml_attach_stylesheet");
-		m_pActDetachStylesheet = new KAction(i18n("Detach Stylesheet"),0,0,this,SLOT(slotActDetachStylesheet()), actionCollection(), "xml_detach_stylesheet");
+		m_pActVersionEncoding = new TDEAction( i18n("&Version && Encoding..."), 0, 0, this, SLOT(slotActVersionEncoding()), actionCollection(), "xml_ins_spec_procins" );
+		m_pActAttachSchema = new TDEAction(i18n("Attach Schema..."),0,0,this,SLOT(slotActAttachSchema()), actionCollection(), "xml_attach_schema");
+		m_pActDetachSchema = new TDEAction(i18n("Detach Schema"),0,0,this,SLOT(slotActDetachSchema()), actionCollection(), "xml_detach_schema");
+		m_pActAttachStylesheet = new TDEAction(i18n("Attach Stylesheet..."),0,0,this,SLOT(slotActAttachStylesheet()), actionCollection(), "xml_attach_stylesheet");
+		m_pActDetachStylesheet = new TDEAction(i18n("Detach Stylesheet"),0,0,this,SLOT(slotActDetachStylesheet()), actionCollection(), "xml_detach_stylesheet");
 		
 		KStdAction::print( this, SLOT(slotActPrint()), actionCollection(), "print" );
 		
@@ -206,25 +206,25 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge
 		m_pActEditPaste = KStdAction::paste( this, SLOT(slotEditPaste()), actionCollection());
 
 		// Move node Up & Down
-		m_pActXmlMoveNodeUp = new KAction( i18n("&Move Up"), "xml_move_item_up", CTRL+Key_U, this, SLOT(slotXmlMoveNodeUp()), actionCollection(), "xml_move_item_up" );
-		m_pActXmlMoveNodeDown = new KAction( i18n("Move &Down"), "xml_move_item_down", CTRL+Key_D, this, SLOT(slotXmlMoveNodeDown()), actionCollection(), "xml_move_item_down" );
+		m_pActXmlMoveNodeUp = new TDEAction( i18n("&Move Up"), "xml_move_item_up", CTRL+Key_U, this, SLOT(slotXmlMoveNodeUp()), actionCollection(), "xml_move_item_up" );
+		m_pActXmlMoveNodeDown = new TDEAction( i18n("Move &Down"), "xml_move_item_down", CTRL+Key_D, this, SLOT(slotXmlMoveNodeDown()), actionCollection(), "xml_move_item_down" );
 
 		// Insert actions
-		m_pActXmlElementInsert = new KAction( i18n("&Element..."), "xml_insert_element", CTRL+SHIFT+Key_E, this, SLOT(slotXmlElementInsert()), actionCollection(), "xml_ins_element" );
-		m_pActXmlAttributesAdd = new KAction( i18n("&Attribute..."), "xml_insert_attribute", CTRL+SHIFT+Key_A, this, SLOT(slotXmlAttributesAdd()), actionCollection(), "xml_add_attribute" );
-		m_pActInsertText = new KAction( i18n("&Text..."), "xml_text", CTRL+SHIFT+Key_T, this, SLOT(slotActInsertText()), actionCollection(), "insert_text" );
-		m_pActInsertCDATA = new KAction( i18n("C&DATA..."), "xml_cdata", CTRL+SHIFT+Key_D, this, SLOT(slotActInsertCDATA()), actionCollection(), "insert_cdata" );
-		m_pActInsertComment = new KAction( i18n("&Comment..."), "xml_comment", CTRL+SHIFT+Key_C, this, SLOT(slotActInsertComment()), actionCollection(), "insert_comment" );
-		m_pActXmlProcInstrInsert = new KAction( i18n("&Processing Instruction..."), "xml_insert_procins", CTRL+SHIFT+Key_P, this, SLOT(slotXmlProcInstrInsert()), actionCollection(), "xml_ins_procins" );
+		m_pActXmlElementInsert = new TDEAction( i18n("&Element..."), "xml_insert_element", CTRL+SHIFT+Key_E, this, SLOT(slotXmlElementInsert()), actionCollection(), "xml_ins_element" );
+		m_pActXmlAttributesAdd = new TDEAction( i18n("&Attribute..."), "xml_insert_attribute", CTRL+SHIFT+Key_A, this, SLOT(slotXmlAttributesAdd()), actionCollection(), "xml_add_attribute" );
+		m_pActInsertText = new TDEAction( i18n("&Text..."), "xml_text", CTRL+SHIFT+Key_T, this, SLOT(slotActInsertText()), actionCollection(), "insert_text" );
+		m_pActInsertCDATA = new TDEAction( i18n("C&DATA..."), "xml_cdata", CTRL+SHIFT+Key_D, this, SLOT(slotActInsertCDATA()), actionCollection(), "insert_cdata" );
+		m_pActInsertComment = new TDEAction( i18n("&Comment..."), "xml_comment", CTRL+SHIFT+Key_C, this, SLOT(slotActInsertComment()), actionCollection(), "insert_comment" );
+		m_pActXmlProcInstrInsert = new TDEAction( i18n("&Processing Instruction..."), "xml_insert_procins", CTRL+SHIFT+Key_P, this, SLOT(slotXmlProcInstrInsert()), actionCollection(), "xml_ins_procins" );
 
 		// Edit node properties
-		m_pActProperties = new KAction(i18n("&Properties..."),"edit",0,this,SLOT(slotActProperties()),actionCollection(),"edit_properties");
-		m_pActEditRawXml = new KAction(i18n("Edit &raw XML..."), 0, 0, this, SLOT(slotActEditRawXml()),actionCollection(),"edit_as_raw_xml");
+		m_pActProperties = new TDEAction(i18n("&Properties..."),"edit",0,this,SLOT(slotActProperties()),actionCollection(),"edit_properties");
+		m_pActEditRawXml = new TDEAction(i18n("Edit &raw XML..."), 0, 0, this, SLOT(slotActEditRawXml()),actionCollection(),"edit_as_raw_xml");
 
 		// delete actions
-		m_pActXmlAttributeDel = new KAction( i18n("&Delete"), "editdelete", 0, this, SLOT(slotXmlAttributeDel()), actionCollection(), "xml_del_attribute" );
-		m_pActXmlAttributesDel = new KAction( i18n("Delete all Attributes..."), 0, 0, this, SLOT(slotXmlAttributesDel()), actionCollection(), "xml_del_attributes" );
-		m_pActDelete = new KAction(i18n("&Delete"),"editdelete",0,this,SLOT(slotActDelete()),actionCollection(),"edit_delete");
+		m_pActXmlAttributeDel = new TDEAction( i18n("&Delete"), "editdelete", 0, this, SLOT(slotXmlAttributeDel()), actionCollection(), "xml_del_attribute" );
+		m_pActXmlAttributesDel = new TDEAction( i18n("Delete all Attributes..."), 0, 0, this, SLOT(slotXmlAttributesDel()), actionCollection(), "xml_del_attributes" );
+		m_pActDelete = new TDEAction(i18n("&Delete"),"editdelete",0,this,SLOT(slotActDelete()),actionCollection(),"edit_delete");
 
 		setXMLFile( "kxmleditorpartEditUI.rc", true );
 		
@@ -276,7 +276,7 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge
 	m_pViewProcInstr->setReadOnly( true );
 	m_pViewProcInstr->setWordWrap( TQTextEdit::NoWrap );
 
-	connect( this, SIGNAL(started(KIO::Job*)), this, SLOT(started()) );
+	connect( this, SIGNAL(started(TDEIO::Job*)), this, SLOT(started()) );
 	connect( this, SIGNAL(completed()), this, SLOT(completed()) );
 	connect( this, SIGNAL(canceled(const TQString &)), this, SLOT(canceled()) );
 
@@ -343,7 +343,7 @@ KXMLEditorPart::KXMLEditorPart( bool fReadWrite, KXEDocument* pDocument, TQWidge
 KXMLEditorPart::~KXMLEditorPart()
 {
 	// saving splitter configuration
-	KConfig *pConfig = instance()->config();
+	TDEConfig *pConfig = instance()->config();
 	pConfig->writeEntry( CONFIG_MAIN_SPLITTER_SIZES, pSplitter->sizes() );
 
 	if (m_pDCOPIface)
@@ -407,7 +407,7 @@ void KXMLEditorPart::setModified( bool bModified )
 	}
 			
 	// get a handle on our Save action and make sure it is valid
-  KAction *pActFileSave = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
+  TDEAction *pActFileSave = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
   if(!pActFileSave)
         return;
 
@@ -1719,13 +1719,13 @@ void KXMLEditorPart::slotContextMenuRequested( const TQString & szMenuName, cons
 		return;
 	}
 
-	if ( ! pContainer->inherits("KPopupMenu") )
+	if ( ! pContainer->inherits("TDEPopupMenu") )
 	{
 		kdError() << "KXMLEditor " << k_funcinfo << " Wrong container widget" << endl;
 		return;
 	}
 
-	KPopupMenu * pMenu = static_cast <KPopupMenu*> (pContainer);
+	TDEPopupMenu * pMenu = static_cast <TDEPopupMenu*> (pContainer);
 	pMenu->popup( pos );
 }
 
diff --git a/part/kxmleditorpart.desktop b/part/kxmleditorpart.desktop
index 8aa3b97..cc2f569 100644
--- a/part/kxmleditorpart.desktop
+++ b/part/kxmleditorpart.desktop
@@ -3,8 +3,8 @@
 Name=KXMLEditorPart
 Name[de]=KXMLEditor-Objekt
 MimeType=text/xml;
-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-Library=libkxmleditorpart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-Library=libkxmleditorpart
 Type=Service
 Icon=kxmleditor.png
 MiniIcon=kxmleditor.png
diff --git a/part/kxmleditorpart.h b/part/kxmleditorpart.h
index 7087bf0..8139554 100644
--- a/part/kxmleditorpart.h
+++ b/part/kxmleditorpart.h
@@ -18,8 +18,8 @@
 #ifndef KXMLEDITORPART_H
 #define KXMLEDITORPART_H
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
 
 #include <tqdom.h>
 #include <tqptrlist.h>
@@ -32,8 +32,8 @@ class TQTabWidget;
 class KXE_ViewElement;
 class KXESearchDialog;
 class TQTextEdit;
-class KAction;
-class KToolBarPopupAction;
+class TDEAction;
+class TDEToolBarPopupAction;
 class KXmlEditorComboAction;
 class TQDomNode;
 class TQKeyEvent;
@@ -299,25 +299,25 @@ protected:
 		TQStringList m_printLines;
 
 		// the actions
-		KAction * m_pActEditFind;
-		KAction * m_pActEditFindNext;
-		KAction * m_pActEditDeselect;
-		KAction * m_pActViewNodeUp;
-		KToolBarPopupAction * m_pActViewExpNode;
-		KToolBarPopupAction * m_pActViewColNode;
-		KAction * m_pActXmlElementInsert;
-		KAction * m_pActXmlAttributesAdd;
-		KAction * m_pActXmlAttributesDel;
-		KAction * m_pActXmlAttributeDel;
-		KAction * m_pActXmlProcInstrInsert;
-		KAction * m_pActInsertText;
-		KAction * m_pActInsertCDATA;
-		KAction * m_pActInsertComment;
-		KAction * m_pActXmlMoveNodeUp;
-		KAction * m_pActXmlMoveNodeDown;
-		KAction * m_pActBookmarksToggle;
-		KAction * m_pActBookmarksPrev;
-		KAction * m_pActBookmarksNext;
+		TDEAction * m_pActEditFind;
+		TDEAction * m_pActEditFindNext;
+		TDEAction * m_pActEditDeselect;
+		TDEAction * m_pActViewNodeUp;
+		TDEToolBarPopupAction * m_pActViewExpNode;
+		TDEToolBarPopupAction * m_pActViewColNode;
+		TDEAction * m_pActXmlElementInsert;
+		TDEAction * m_pActXmlAttributesAdd;
+		TDEAction * m_pActXmlAttributesDel;
+		TDEAction * m_pActXmlAttributeDel;
+		TDEAction * m_pActXmlProcInstrInsert;
+		TDEAction * m_pActInsertText;
+		TDEAction * m_pActInsertCDATA;
+		TDEAction * m_pActInsertComment;
+		TDEAction * m_pActXmlMoveNodeUp;
+		TDEAction * m_pActXmlMoveNodeDown;
+		TDEAction * m_pActBookmarksToggle;
+		TDEAction * m_pActBookmarksPrev;
+		TDEAction * m_pActBookmarksNext;
 		KXmlEditorComboAction * m_pActPathCombo;
 
 	protected slots:
@@ -375,37 +375,37 @@ protected:
 		KCommandHistory* m_pCmdHistory;
 		
 		/** @short Action for cutting nodes to clipboard.*/
-		KAction* m_pActEditCut;
+		TDEAction* m_pActEditCut;
 
 		/** @short Action for copying nodes to clipboard.*/
-		KAction* m_pActEditCopy;
+		TDEAction* m_pActEditCopy;
 
 		/** @short Action for pasting nodes from clipboard.*/
-		KAction* m_pActEditPaste;
+		TDEAction* m_pActEditPaste;
 
 		/** Action for editing properties of currently selected node. */
-		KAction* m_pActProperties;
+		TDEAction* m_pActProperties;
 
 		/** Action for editing raw XML of currently selected node. */
-		KAction* m_pActEditRawXml;
+		TDEAction* m_pActEditRawXml;
 
 		/** Action for deleting currently selected node. */
-		KAction* m_pActDelete;
+		TDEAction* m_pActDelete;
 
 		/** @short Action for changing version and encoding of XM file. */
-		KAction* m_pActVersionEncoding;
+		TDEAction* m_pActVersionEncoding;
 
 		/** @short Action for attaching stylehseets to xml files. */
-		KAction* m_pActAttachStylesheet;
+		TDEAction* m_pActAttachStylesheet;
 
 		/** @short Action for detaching stylehseets from xml files. */
-		KAction* m_pActDetachStylesheet;
+		TDEAction* m_pActDetachStylesheet;
 
 		/** @short Action for attaching schemas to xml files. */
-		KAction* m_pActAttachSchema;
+		TDEAction* m_pActAttachSchema;
 
 		/** @short Action for detaching schemas from xml files. */
-		KAction* m_pActDetachSchema;
+		TDEAction* m_pActDetachSchema;
 		
 		/** Printer object. */
 		KPrinter *m_pPrinter;
diff --git a/part/pics/Makefile.am b/part/pics/Makefile.am
index a291541..34f8fa4 100644
--- a/part/pics/Makefile.am
+++ b/part/pics/Makefile.am
@@ -1,4 +1,4 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 EXTRA_DIST = xml_attribute.png xml_cdata.png xml_comment.png xml_element.png xml_text.png xml_procinstr.png xml_cdata_b.png xml_comment_b.png xml_element_b.png xml_text_b.png xml_procinstr_b.png
 
@@ -35,4 +35,4 @@ uninstall-local:
 	-rm -f $(kde_datadir)/kxmleditor/pics/xml_procinstr_b.png
 	-rmdir $(kde_datadir)/kxmleditor/pics
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
diff --git a/po/Makefile.am b/po/Makefile.am
index 50aeed8..630dedf 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -1,6 +1,6 @@
-####### kdevelop will overwrite this part!!! (begin)##########
+####### tdevelop will overwrite this part!!! (begin)##########
 
 
-####### kdevelop will overwrite this part!!! (end)############
+####### tdevelop will overwrite this part!!! (end)############
 POFILES = AUTO