diff --git a/ChangeLog b/ChangeLog
index 1496541..3e1a019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -387,7 +387,7 @@ Version 2.5
     2.6-rc1 (Release Date: 06.04.2003):
         Added icon to service menu entry
         Fixed gcc 3.x compiler warnings
-        Fixed kfile plugins returning spaces at the end
+        Fixed tdefile plugins returning spaces at the end
         Greatly improved startup time
     2.6-rc2 (Release Date: 11.04.2003):
         History size can be configured now
diff --git a/TODO b/TODO
index db8cd43..4b6837c 100644
--- a/TODO
+++ b/TODO
@@ -161,7 +161,7 @@ Of course a drop-down combo "memory" would help.
 
 I hope my "annoyance" is helpful, Phoenix
 ===================================================================
-[23:32:12] <Keimix> BTW  is there a possibility to load just one of the kfile-plugins at krename startup, because loading all slows krename down alot?
+[23:32:12] <Keimix> BTW  is there a possibility to load just one of the tdefile-plugins at krename startup, because loading all slows krename down alot?
 [23:35:49] <domseichter> No, not yet. But it's a good idea. Strange that I did not have it and nobody asked me for this feature!
 ===================================================================
 "Squashing weird characters" sollte auf die ToDO liste
diff --git a/acinclude.m4 b/acinclude.m4
index ce81771..146b44f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/krename/batchrenamer.cpp b/krename/batchrenamer.cpp
index bb50a78..5b39de4 100644
--- a/krename/batchrenamer.cpp
+++ b/krename/batchrenamer.cpp
@@ -38,8 +38,8 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 
 // Own includes
diff --git a/krename/commandplugin.cpp b/krename/commandplugin.cpp
index 955b040..82a1115 100644
--- a/krename/commandplugin.cpp
+++ b/krename/commandplugin.cpp
@@ -24,7 +24,7 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <klineedit.h>
diff --git a/krename/dateplugin.cpp b/krename/dateplugin.cpp
index 6cbc77e..eb6532c 100644
--- a/krename/dateplugin.cpp
+++ b/krename/dateplugin.cpp
@@ -20,8 +20,8 @@
 #include <tqdatetime.h>
 
 // KDE includes
-#include <kfileitem.h>
-#include <kio/netaccess.h>
+#include <tdefileitem.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 
 DatePlugin::DatePlugin()
diff --git a/krename/dsdirselectdialog.h b/krename/dsdirselectdialog.h
index b16a0aa..5fb3c1f 100644
--- a/krename/dsdirselectdialog.h
+++ b/krename/dsdirselectdialog.h
@@ -18,7 +18,7 @@
 #ifndef DSDIRSELECTDIALOG_H
 #define DSDIRSELECTDIALOG_H
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 class TQCheckBox;
 class TQLabel;
diff --git a/krename/fileoperation.cpp b/krename/fileoperation.cpp
index a678ea7..4519b60 100644
--- a/krename/fileoperation.cpp
+++ b/krename/fileoperation.cpp
@@ -18,8 +18,8 @@
 // KDE includes
 #include <kapplication.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 
 // QT includes
 #include <tqeventloop.h>
diff --git a/krename/fileoperation.h b/krename/fileoperation.h
index 7082b0f..ab5c187 100644
--- a/krename/fileoperation.h
+++ b/krename/fileoperation.h
@@ -19,7 +19,7 @@
 #define FILEOPERATION_H
 
 #include <tqobject.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kurl.h>
 
 class TQString;
diff --git a/krename/fileplugin.cpp b/krename/fileplugin.cpp
index 97a2cc4..7253d20 100644
--- a/krename/fileplugin.cpp
+++ b/krename/fileplugin.cpp
@@ -25,7 +25,7 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 #include <klineedit.h>
 #include <klistbox.h>
 #include <klocale.h>
diff --git a/krename/kmyhistorycombo.cpp b/krename/kmyhistorycombo.cpp
index 4951300..df8bc31 100644
--- a/krename/kmyhistorycombo.cpp
+++ b/krename/kmyhistorycombo.cpp
@@ -22,7 +22,7 @@
 #include "kmyhistorycombo.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <tqpopupmenu.h>
diff --git a/krename/kmylistbox.cpp b/krename/kmylistbox.cpp
index f946360..bc73deb 100644
--- a/krename/kmylistbox.cpp
+++ b/krename/kmylistbox.cpp
@@ -28,8 +28,8 @@
 #include <kdirlister.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kio/previewjob.h>
-#include <kio/netaccess.h>
+#include <tdeio/previewjob.h>
+#include <tdeio/netaccess.h>
 #include <tqptrlist.h>
 #include <kurldrag.h>
 #include <kurllabel.h>
diff --git a/krename/kmylistbox.h b/krename/kmylistbox.h
index 2d9a5d9..3c5f9a4 100644
--- a/krename/kmylistbox.h
+++ b/krename/kmylistbox.h
@@ -21,7 +21,7 @@
 // KDE includes
 #include <klistbox.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 // TQt includes
 #include <tqmutex.h>
diff --git a/krename/krecursivelister.h b/krename/krecursivelister.h
index c3acd07..eff1e58 100644
--- a/krename/krecursivelister.h
+++ b/krename/krecursivelister.h
@@ -21,7 +21,7 @@
 #include <tqwidget.h>
 #include <tqobject.h>
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqguardedptr.h>
 
 /**A convienience class that recursively lists a directory
diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp
index 0e9358b..a0c04cf 100644
--- a/krename/krenameimpl.cpp
+++ b/krename/krenameimpl.cpp
@@ -43,8 +43,8 @@
 #include <kaction.h>
 #include <kcmdlineargs.h>
 #include <kdirselectdialog.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -53,7 +53,7 @@
 #include <kurlrequester.h>
 #include <ktempfile.h> 
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 // QT includes
 #include <tqbuttongroup.h>
diff --git a/krename/main.cpp b/krename/main.cpp
index f024647..cc2d70f 100644
--- a/krename/main.cpp
+++ b/krename/main.cpp
@@ -23,7 +23,7 @@
 #include <kapplication.h>
 #include <kaboutapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kimageio.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/krename/mydirplugin.cpp b/krename/mydirplugin.cpp
index 1e5587a..4e4a768 100644
--- a/krename/mydirplugin.cpp
+++ b/krename/mydirplugin.cpp
@@ -21,7 +21,7 @@
 // KDE includes
 #include <kapplication.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 // QT includes
diff --git a/krename/numberdialog.cpp b/krename/numberdialog.cpp
index 4daea4d..2bfdfad 100644
--- a/krename/numberdialog.cpp
+++ b/krename/numberdialog.cpp
@@ -25,7 +25,7 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <tqcheckbox.h>
diff --git a/krename/pluginloader.cpp b/krename/pluginloader.cpp
index af2d411..c5c6f22 100644
--- a/krename/pluginloader.cpp
+++ b/krename/pluginloader.cpp
@@ -166,12 +166,12 @@ void PluginLoader::loadFilePlugins()
     for( unsigned int i = 0; i < list.count(); i++ ) {
         KService* s = (KService*)list[i];
         if( !s->terminal() && s->type() == "Service" && s->hasServiceType( "KFilePlugin" ) ) {
-            FilePlugin* kfileplugin = new FilePlugin( s );
-            if( kfileplugin->isValid() ) {
-                addPlugin( kfileplugin );
+            FilePlugin* tdefileplugin = new FilePlugin( s );
+            if( tdefileplugin->isValid() ) {
+                addPlugin( tdefileplugin );
                 kapp->processEvents();
             } else
-                delete kfileplugin;
+                delete tdefileplugin;
         }
     }
     
diff --git a/krename/profiledlg.cpp b/krename/profiledlg.cpp
index 5d52e87..5da0e3f 100644
--- a/krename/profiledlg.cpp
+++ b/krename/profiledlg.cpp
@@ -23,7 +23,7 @@
 
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kinputdialog.h> 
 #include <klistbox.h>
diff --git a/krename/replacedialog.cpp b/krename/replacedialog.cpp
index e605619..50371a0 100644
--- a/krename/replacedialog.cpp
+++ b/krename/replacedialog.cpp
@@ -27,7 +27,7 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <klistview.h>
 #include <kmessagebox.h>
diff --git a/krename/semantic.cache b/krename/semantic.cache
index 453579e..986f859 100644
--- a/krename/semantic.cache
+++ b/krename/semantic.cache
@@ -4,7 +4,7 @@
   :tables (list 
    (semanticdb-table "kmylistbox.cpp"
     :major-mode 'c++-mode
-    :tags '(("qcursor.h" include (:system-flag t) nil [1041 1061]) ("qdir.h" include (:system-flag t) nil [1062 1079]) ("qdragobject.h" include (:system-flag t) nil [1080 1104]) ("qpainter.h" include (:system-flag t) nil [1105 1126]) ("qpalette.h" include (:system-flag t) nil [1127 1148]) ("qregexp.h" include (:system-flag t) nil [1149 1169]) ("kapplication.h" include (:system-flag t) nil [1187 1212]) ("kdirlister.h" include (:system-flag t) nil [1213 1236]) ("kiconloader.h" include (:system-flag t) nil [1237 1261]) ("klocale.h" include (:system-flag t) nil [1262 1282]) ("kio/previewjob.h" include (:system-flag t) nil [1283 1310]) ("kio/netaccess.h" include (:system-flag t) nil [1311 1337]) ("qptrlist.h" include (:system-flag t) nil [1338 1359]) ("kurldrag.h" include (:system-flag t) nil [1360 1381]) ("kurllabel.h" include (:system-flag t) nil [1382 1404]) ("kpixmap.h" include (:system-flag t) nil [1405 1425]) ("kpixmapeffect.h" include (:system-flag t) nil [1426 1452]) ("kmylistbox.h" include nil nil [1471 1494]) ("krecursivelister.h" include nil nil [1495 1524]) ("threadedlister.h" include nil nil [1525 1552]) ("KMyListBox" function (:constructor-flag t :parent "KMyListBox" :arguments (("parent" variable (:pointer 1 :type ("QWidget" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [1599 1615]) ("name" variable (:pointer 1 :constant-flag t :type "char") (reparse-symbol arg-sub-list) [1616 1633]) ("fl" variable (:type ("WFlags" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [1634 1644])) :type ("KMyListBox" type "class")) nil [1576 2387]) ("KMyListBox" function (:destructor-flag t :parent "KMyListBox" :type "void") nil [2389 2418]) ("url" function (:parent "KMyListBox" :arguments (("index" variable (:type "int") (reparse-symbol arg-sub-list) [2442 2453])) :type ("KURL" type (:type "class") nil nil)) nil [2420 2528]) ("dir" function (:parent "KMyListBox" :arguments (("index" variable (:type "int") (reparse-symbol arg-sub-list) [2552 2563])) :type ("bool" type (:type "class") nil nil)) nil [2530 2638]) ("setPreviewSize" function (:parent "KMyListBox" :arguments (("size" variable (:type "int") (reparse-symbol arg-sub-list) [2673 2683])) :type "void") nil [2640 2711]) ("removeItem" function (:parent "KMyListBox" :arguments (("index" variable (:type "int") (reparse-symbol arg-sub-list) [2742 2753])) :type "void") nil [2713 2792]) ("addFile" function (:parent "KMyListBox" :arguments (("filename" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [2820 2842]) ("isfile" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [2843 2856])) :type "void") nil [2794 3135]) ("addDirName" function (:parent "KMyListBox" :arguments (("dirname" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3166 3188])) :type "void") nil [3137 3322]) ("isFile" function (:parent "KMyListBox" :arguments (("f" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3349 3364]) ("autoadd" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3365 3379])) :type ("bool" type (:type "class") nil nil)) nil [3324 3662]) ("addDir" function (:parent "KMyListBox" :arguments (("dirname" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3689 3710]) ("filter" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3711 3734]) ("hidden" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3735 3747]) ("recursively" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3748 3765]) ("dirnames" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3766 3781])) :type "void") nil [3664 4122]) ("addDirName" function (:parent "KMyListBox" :arguments (("dirname" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4153 4174]) ("filter" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4175 4198]) ("hidden" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4199 4211]) ("recursive" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4212 4228])) :type "void") nil [4124 4974]) ("dropEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QDropEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5003 5017])) :type "void") nil [4976 5441]) ("dragEnterEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QDragEnterEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5475 5494])) :type "void") nil [5443 5572]) ("viewportMousePressEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QMouseEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5616 5632])) :type "void") nil [5574 5934]) ("viewportMouseMoveEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QMouseEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5977 5993])) :type "void") nil [5936 6611]) ("viewportMouseReleaseEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QMouseEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [6657 6673])) :type "void") nil [6613 6749]) ("keyPressEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QKeyEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [6783 6797])) :type "void") nil [6751 7951]) ("keyReleaseEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QKeyEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [7987 8001])) :type "void") nil [7953 8135]) ("openFile" function (:parent "KMyListBox" :arguments (("item" variable (:pointer 1 :type ("QListBoxItem" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [8164 8184])) :type "void") nil [8137 8424]) ("moveMode" function (:parent "KMyListBox" :type "void") nil [8426 8569]) ("select" function (:parent "KMyListBox" :arguments (("item" variable (:pointer 1 :type ("QListBoxItem" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [8596 8616])) :type "void") nil [8571 9666]) ("preview" function (:parent "KMyListBox" :arguments (("list" variable (:type ("KURL::List" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [9694 9711])) :type "void") nil [9668 10203]) ("previewDone" function (:parent "KMyListBox" :arguments (("item" variable (:pointer 1 :constant-flag t :type ("KFileItem" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [10235 10257]) ("pixmap" variable (:constant-flag t :type ("QPixmap" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [10258 10281])) :type "void") nil [10205 10615]) ("previewFailed" function (:parent "KMyListBox" :arguments (("item" variable (:pointer 1 :constant-flag t :type ("KFileItem" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [10649 10672])) :type "void") nil [10617 10998]) ("previewFinished" function (:parent "KMyListBox" :type "void") nil [11000 11132]) ("setPreview" function (:parent "KMyListBox" :arguments (("prv" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [11163 11173])) :type "void") nil [11134 11506]) ("setName" function (:parent "KMyListBox" :arguments (("name" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [11534 11545])) :type "void") nil [11508 11743]) ("move" function (:parent "KMyListBox" :arguments (("i" variable (:type "int") (reparse-symbol arg-sub-list) [11768 11775])) :type "void") nil [11745 12288]) ("moveUp" function (:parent "KMyListBox" :type "void") nil [12290 12642]) ("moveUp" function (:parent "KMyListBox" :arguments (("i" variable (:type "int") (reparse-symbol arg-sub-list) [12669 12676])) :type "void") nil [12644 12868]) ("moveDown" function (:parent "KMyListBox" :type "void") nil [12870 13237]) ("moveDown" function (:parent "KMyListBox" :arguments (("i" variable (:type "int") (reparse-symbol arg-sub-list) [13266 13273])) :type "void") nil [13239 13465]) ("isInList" function (:parent "KMyListBox" :arguments (("text" variable (:type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [13494 13505])) :type ("bool" type (:type "class") nil nil)) nil [13467 13766]) ("customEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QCustomEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [13798 13815])) :type "void") nil [13768 13927]) ("listerDone" function (:parent "KMyListBox" :arguments (("lister" variable (:pointer 1 :type ("ThreadedLister" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [13958 13982])) :type "void") nil [13929 14306]) ("runningAddListeners" function (:parent "KMyListBox" :type "unsigned int") nil [14308 14480]) ("sortAscending" function (:parent "KMyListBox" :type "void") nil [14482 14566]) ("sortDescending" function (:parent "KMyListBox" :type "void") nil [14568 14654]) ("sortRandom" function (:parent "KMyListBox" :type "void") nil [14656 14734]) ("sortUnsorted" function (:parent "KMyListBox" :type "void") nil [14736 14818]) ("sortNummeric" function (:parent "KMyListBox" :type "void") nil [14820 14902]) ("sortList" function (:parent "KMyListBox" :type "void") nil [14904 16654]) ("setSorting" function (:parent "KMyListBox" :arguments (("s" variable (:type "int") (reparse-symbol arg-sub-list) [16685 16692])) :type "void") nil [16656 17125]) ("compareNummeric" function (:parent "KMyListBox" :arguments (("s1" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [17160 17179]) ("s2" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [17180 17200])) :type "int") nil [17127 18078]) ("findNumInString" function (:parent "KMyListBox" :constant-flag t :arguments (("pos" variable (:type "unsigned int") (reparse-symbol arg-sub-list) [18123 18140]) ("s" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [18141 18160])) :type ("QString" type (:type "class") nil nil)) nil [18080 18506]) ("resizeEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QResizeEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [18538 18555])) :type "void") nil [18508 18612]) ("clear" function (:parent "KMyListBox" :type "void") nil [18614 18686]) ("positionLabel" function (:parent "KMyListBox" :type "void") nil [18688 19060]) ("paintEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QPaintEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19091 19107])) :type "void") nil [19062 19234]) ("KMyListBoxItem" function (:constructor-flag t :parent "KMyListBoxItem" :arguments (("item" variable (:pointer 1 :constant-flag t :type ("KMyListBoxItem" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19268 19296])) :type ("KMyListBoxItem" type "class")) nil [19236 19424]) ("KMyListBoxItem" function (:constructor-flag t :parent "KMyListBoxItem" :arguments (("u" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19458 19473]) ("b" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19474 19482])) :type ("KMyListBoxItem" type "class")) nil [19426 19564]) ("setPixmap" function (:parent "KMyListBoxItem" :arguments (("pix" variable (:constant-flag t :type ("QPixmap" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19598 19619])) :type "void") nil [19566 19940]) ("setName" function (:parent "KMyListBoxItem" :arguments (("b" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19972 19980])) :type "void") nil [19942 20016]) ("setPreview" function (:parent "KMyListBoxItem" :arguments (("b" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [20051 20059])) :type "void") nil [20018 20098]) ("paint" function (:parent "KMyListBoxItem" :arguments (("painter" variable (:pointer 1 :type ("QPainter" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [20128 20147])) :type "void") nil [20100 21325]) ("height" function (:parent "KMyListBoxItem" :arguments (("lb" variable (:pointer 1 :constant-flag t :type ("QListBox" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [21355 21375])) :type "int") nil [21327 21849]) ("width" function (:parent "KMyListBoxItem" :arguments (("" variable (:pointer 1 :constant-flag t :type ("QListBox" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [21878 21895])) :type "int") nil [21851 22376]) ("text" function (:parent "KMyListBoxItem" :type ("QString" type (:type "class") nil nil)) nil [22378 22521]) ("KMyListBoxItem::m_preview" variable (:default-value "false;" :type ("bool" type (:type "class") nil nil)) nil [22523 22562]) ("KMyListBoxItem::m_name" variable (:default-value "false;" :type ("bool" type (:type "class") nil nil)) nil [22563 22599]))
+    :tags '(("qcursor.h" include (:system-flag t) nil [1041 1061]) ("qdir.h" include (:system-flag t) nil [1062 1079]) ("qdragobject.h" include (:system-flag t) nil [1080 1104]) ("qpainter.h" include (:system-flag t) nil [1105 1126]) ("qpalette.h" include (:system-flag t) nil [1127 1148]) ("qregexp.h" include (:system-flag t) nil [1149 1169]) ("kapplication.h" include (:system-flag t) nil [1187 1212]) ("kdirlister.h" include (:system-flag t) nil [1213 1236]) ("kiconloader.h" include (:system-flag t) nil [1237 1261]) ("klocale.h" include (:system-flag t) nil [1262 1282]) ("tdeio/previewjob.h" include (:system-flag t) nil [1283 1310]) ("tdeio/netaccess.h" include (:system-flag t) nil [1311 1337]) ("qptrlist.h" include (:system-flag t) nil [1338 1359]) ("kurldrag.h" include (:system-flag t) nil [1360 1381]) ("kurllabel.h" include (:system-flag t) nil [1382 1404]) ("kpixmap.h" include (:system-flag t) nil [1405 1425]) ("kpixmapeffect.h" include (:system-flag t) nil [1426 1452]) ("kmylistbox.h" include nil nil [1471 1494]) ("krecursivelister.h" include nil nil [1495 1524]) ("threadedlister.h" include nil nil [1525 1552]) ("KMyListBox" function (:constructor-flag t :parent "KMyListBox" :arguments (("parent" variable (:pointer 1 :type ("QWidget" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [1599 1615]) ("name" variable (:pointer 1 :constant-flag t :type "char") (reparse-symbol arg-sub-list) [1616 1633]) ("fl" variable (:type ("WFlags" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [1634 1644])) :type ("KMyListBox" type "class")) nil [1576 2387]) ("KMyListBox" function (:destructor-flag t :parent "KMyListBox" :type "void") nil [2389 2418]) ("url" function (:parent "KMyListBox" :arguments (("index" variable (:type "int") (reparse-symbol arg-sub-list) [2442 2453])) :type ("KURL" type (:type "class") nil nil)) nil [2420 2528]) ("dir" function (:parent "KMyListBox" :arguments (("index" variable (:type "int") (reparse-symbol arg-sub-list) [2552 2563])) :type ("bool" type (:type "class") nil nil)) nil [2530 2638]) ("setPreviewSize" function (:parent "KMyListBox" :arguments (("size" variable (:type "int") (reparse-symbol arg-sub-list) [2673 2683])) :type "void") nil [2640 2711]) ("removeItem" function (:parent "KMyListBox" :arguments (("index" variable (:type "int") (reparse-symbol arg-sub-list) [2742 2753])) :type "void") nil [2713 2792]) ("addFile" function (:parent "KMyListBox" :arguments (("filename" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [2820 2842]) ("isfile" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [2843 2856])) :type "void") nil [2794 3135]) ("addDirName" function (:parent "KMyListBox" :arguments (("dirname" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3166 3188])) :type "void") nil [3137 3322]) ("isFile" function (:parent "KMyListBox" :arguments (("f" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3349 3364]) ("autoadd" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3365 3379])) :type ("bool" type (:type "class") nil nil)) nil [3324 3662]) ("addDir" function (:parent "KMyListBox" :arguments (("dirname" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3689 3710]) ("filter" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3711 3734]) ("hidden" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3735 3747]) ("recursively" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3748 3765]) ("dirnames" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [3766 3781])) :type "void") nil [3664 4122]) ("addDirName" function (:parent "KMyListBox" :arguments (("dirname" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4153 4174]) ("filter" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4175 4198]) ("hidden" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4199 4211]) ("recursive" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [4212 4228])) :type "void") nil [4124 4974]) ("dropEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QDropEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5003 5017])) :type "void") nil [4976 5441]) ("dragEnterEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QDragEnterEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5475 5494])) :type "void") nil [5443 5572]) ("viewportMousePressEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QMouseEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5616 5632])) :type "void") nil [5574 5934]) ("viewportMouseMoveEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QMouseEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [5977 5993])) :type "void") nil [5936 6611]) ("viewportMouseReleaseEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QMouseEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [6657 6673])) :type "void") nil [6613 6749]) ("keyPressEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QKeyEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [6783 6797])) :type "void") nil [6751 7951]) ("keyReleaseEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QKeyEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [7987 8001])) :type "void") nil [7953 8135]) ("openFile" function (:parent "KMyListBox" :arguments (("item" variable (:pointer 1 :type ("QListBoxItem" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [8164 8184])) :type "void") nil [8137 8424]) ("moveMode" function (:parent "KMyListBox" :type "void") nil [8426 8569]) ("select" function (:parent "KMyListBox" :arguments (("item" variable (:pointer 1 :type ("QListBoxItem" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [8596 8616])) :type "void") nil [8571 9666]) ("preview" function (:parent "KMyListBox" :arguments (("list" variable (:type ("KURL::List" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [9694 9711])) :type "void") nil [9668 10203]) ("previewDone" function (:parent "KMyListBox" :arguments (("item" variable (:pointer 1 :constant-flag t :type ("KFileItem" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [10235 10257]) ("pixmap" variable (:constant-flag t :type ("QPixmap" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [10258 10281])) :type "void") nil [10205 10615]) ("previewFailed" function (:parent "KMyListBox" :arguments (("item" variable (:pointer 1 :constant-flag t :type ("KFileItem" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [10649 10672])) :type "void") nil [10617 10998]) ("previewFinished" function (:parent "KMyListBox" :type "void") nil [11000 11132]) ("setPreview" function (:parent "KMyListBox" :arguments (("prv" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [11163 11173])) :type "void") nil [11134 11506]) ("setName" function (:parent "KMyListBox" :arguments (("name" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [11534 11545])) :type "void") nil [11508 11743]) ("move" function (:parent "KMyListBox" :arguments (("i" variable (:type "int") (reparse-symbol arg-sub-list) [11768 11775])) :type "void") nil [11745 12288]) ("moveUp" function (:parent "KMyListBox" :type "void") nil [12290 12642]) ("moveUp" function (:parent "KMyListBox" :arguments (("i" variable (:type "int") (reparse-symbol arg-sub-list) [12669 12676])) :type "void") nil [12644 12868]) ("moveDown" function (:parent "KMyListBox" :type "void") nil [12870 13237]) ("moveDown" function (:parent "KMyListBox" :arguments (("i" variable (:type "int") (reparse-symbol arg-sub-list) [13266 13273])) :type "void") nil [13239 13465]) ("isInList" function (:parent "KMyListBox" :arguments (("text" variable (:type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [13494 13505])) :type ("bool" type (:type "class") nil nil)) nil [13467 13766]) ("customEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QCustomEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [13798 13815])) :type "void") nil [13768 13927]) ("listerDone" function (:parent "KMyListBox" :arguments (("lister" variable (:pointer 1 :type ("ThreadedLister" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [13958 13982])) :type "void") nil [13929 14306]) ("runningAddListeners" function (:parent "KMyListBox" :type "unsigned int") nil [14308 14480]) ("sortAscending" function (:parent "KMyListBox" :type "void") nil [14482 14566]) ("sortDescending" function (:parent "KMyListBox" :type "void") nil [14568 14654]) ("sortRandom" function (:parent "KMyListBox" :type "void") nil [14656 14734]) ("sortUnsorted" function (:parent "KMyListBox" :type "void") nil [14736 14818]) ("sortNummeric" function (:parent "KMyListBox" :type "void") nil [14820 14902]) ("sortList" function (:parent "KMyListBox" :type "void") nil [14904 16654]) ("setSorting" function (:parent "KMyListBox" :arguments (("s" variable (:type "int") (reparse-symbol arg-sub-list) [16685 16692])) :type "void") nil [16656 17125]) ("compareNummeric" function (:parent "KMyListBox" :arguments (("s1" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [17160 17179]) ("s2" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [17180 17200])) :type "int") nil [17127 18078]) ("findNumInString" function (:parent "KMyListBox" :constant-flag t :arguments (("pos" variable (:type "unsigned int") (reparse-symbol arg-sub-list) [18123 18140]) ("s" variable (:constant-flag t :type ("QString" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [18141 18160])) :type ("QString" type (:type "class") nil nil)) nil [18080 18506]) ("resizeEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QResizeEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [18538 18555])) :type "void") nil [18508 18612]) ("clear" function (:parent "KMyListBox" :type "void") nil [18614 18686]) ("positionLabel" function (:parent "KMyListBox" :type "void") nil [18688 19060]) ("paintEvent" function (:parent "KMyListBox" :arguments (("e" variable (:pointer 1 :type ("QPaintEvent" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19091 19107])) :type "void") nil [19062 19234]) ("KMyListBoxItem" function (:constructor-flag t :parent "KMyListBoxItem" :arguments (("item" variable (:pointer 1 :constant-flag t :type ("KMyListBoxItem" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19268 19296])) :type ("KMyListBoxItem" type "class")) nil [19236 19424]) ("KMyListBoxItem" function (:constructor-flag t :parent "KMyListBoxItem" :arguments (("u" variable (:constant-flag t :type ("KURL" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19458 19473]) ("b" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19474 19482])) :type ("KMyListBoxItem" type "class")) nil [19426 19564]) ("setPixmap" function (:parent "KMyListBoxItem" :arguments (("pix" variable (:constant-flag t :type ("QPixmap" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19598 19619])) :type "void") nil [19566 19940]) ("setName" function (:parent "KMyListBoxItem" :arguments (("b" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [19972 19980])) :type "void") nil [19942 20016]) ("setPreview" function (:parent "KMyListBoxItem" :arguments (("b" variable (:type ("bool" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [20051 20059])) :type "void") nil [20018 20098]) ("paint" function (:parent "KMyListBoxItem" :arguments (("painter" variable (:pointer 1 :type ("QPainter" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [20128 20147])) :type "void") nil [20100 21325]) ("height" function (:parent "KMyListBoxItem" :arguments (("lb" variable (:pointer 1 :constant-flag t :type ("QListBox" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [21355 21375])) :type "int") nil [21327 21849]) ("width" function (:parent "KMyListBoxItem" :arguments (("" variable (:pointer 1 :constant-flag t :type ("QListBox" type (:type "class") nil nil)) (reparse-symbol arg-sub-list) [21878 21895])) :type "int") nil [21851 22376]) ("text" function (:parent "KMyListBoxItem" :type ("QString" type (:type "class") nil nil)) nil [22378 22521]) ("KMyListBoxItem::m_preview" variable (:default-value "false;" :type ("bool" type (:type "class") nil nil)) nil [22523 22562]) ("KMyListBoxItem::m_name" variable (:default-value "false;" :type ("bool" type (:type "class") nil nil)) nil [22563 22599]))
     :file "kmylistbox.cpp"
     :pointmax 22601
     )
diff --git a/krename/threadedlister.h b/krename/threadedlister.h
index 1ca395c..e99af30 100644
--- a/krename/threadedlister.h
+++ b/krename/threadedlister.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqthread.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class KDirLister;
 class KRecursiveLister;
diff --git a/krename/undodialog.cpp b/krename/undodialog.cpp
index 993782e..732e18f 100644
--- a/krename/undodialog.cpp
+++ b/krename/undodialog.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 // KDE includes
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>