diff --git a/krename/ProgressDialog.cpp b/krename/ProgressDialog.cpp
index 64a04e8..bbcc980 100644
--- a/krename/ProgressDialog.cpp
+++ b/krename/ProgressDialog.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <krun.h>
diff --git a/krename/batchrenamer.cpp b/krename/batchrenamer.cpp
index ebe0863..8069f63 100644
--- a/krename/batchrenamer.cpp
+++ b/krename/batchrenamer.cpp
@@ -40,7 +40,7 @@
 #include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Own includes
 #include "ProgressDialog.h"
diff --git a/krename/commandplugin.cpp b/krename/commandplugin.cpp
index 04230e3..d12d4bb 100644
--- a/krename/commandplugin.cpp
+++ b/krename/commandplugin.cpp
@@ -26,10 +26,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kprocess.h>
 
diff --git a/krename/confdialog.cpp b/krename/confdialog.cpp
index 5529dcc..6264786 100644
--- a/krename/confdialog.cpp
+++ b/krename/confdialog.cpp
@@ -27,7 +27,7 @@
 
 // KDE includes
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConfDialog::ConfDialog( TQWidget* parent, const char* name )
     :  KDialogBase( KDialogBase::IconList, "KRename",
diff --git a/krename/coorddialog.cpp b/krename/coorddialog.cpp
index ff1a1e3..959c969 100644
--- a/krename/coorddialog.cpp
+++ b/krename/coorddialog.cpp
@@ -26,7 +26,7 @@
 
 // KDE includes
 #include <tdeapplication.h>                                                                  
-#include <klocale.h>
+#include <tdelocale.h>
 
 DSLineEdit::DSLineEdit( TQWidget* parent, const char* name )
     : KLineEdit( parent, name )
diff --git a/krename/dateplugin.cpp b/krename/dateplugin.cpp
index eb6532c..31522d2 100644
--- a/krename/dateplugin.cpp
+++ b/krename/dateplugin.cpp
@@ -22,7 +22,7 @@
 // KDE includes
 #include <tdefileitem.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 DatePlugin::DatePlugin()
  : FilePlugin(0)
diff --git a/krename/datetime.cpp b/krename/datetime.cpp
index c9a187d..457503f 100644
--- a/krename/datetime.cpp
+++ b/krename/datetime.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <kdatepik.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // OS includes
 #include <stdio.h>
diff --git a/krename/dsdirselectdialog.cpp b/krename/dsdirselectdialog.cpp
index e28cbac..8039535 100644
--- a/krename/dsdirselectdialog.cpp
+++ b/krename/dsdirselectdialog.cpp
@@ -26,8 +26,8 @@
 #include <tqvbox.h>
 
 // KDE includes
-#include <kdiroperator.h> 
-#include <klocale.h>
+#include <tdediroperator.h> 
+#include <tdelocale.h>
 #include <kurlcombobox.h> 
 
 DSDirSelectDialog::DSDirSelectDialog( TQWidget* parent )
diff --git a/krename/encodingplugin.cpp b/krename/encodingplugin.cpp
index e5b99ec..3d12fb3 100644
--- a/krename/encodingplugin.cpp
+++ b/krename/encodingplugin.cpp
@@ -29,8 +29,8 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 const TQString EncodingPlugin::getName() const
 {
diff --git a/krename/fileoperation.cpp b/krename/fileoperation.cpp
index 9fdda69..ffe8065 100644
--- a/krename/fileoperation.cpp
+++ b/krename/fileoperation.cpp
@@ -17,7 +17,7 @@
 
 // KDE includes
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 
diff --git a/krename/fileplugin.cpp b/krename/fileplugin.cpp
index d2750f3..4ed83b9 100644
--- a/krename/fileplugin.cpp
+++ b/krename/fileplugin.cpp
@@ -28,7 +28,7 @@
 #include <tdefilemetainfo.h>
 #include <klineedit.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 
diff --git a/krename/guimodeselector.cpp b/krename/guimodeselector.cpp
index 75b72ff..b81f9d9 100644
--- a/krename/guimodeselector.cpp
+++ b/krename/guimodeselector.cpp
@@ -25,7 +25,7 @@
 #include <tqradiobutton.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 GUIModeSelector::GUIModeSelector()
 {
diff --git a/krename/helpdialog.cpp b/krename/helpdialog.cpp
index 4bcb46c..9a0d444 100644
--- a/krename/helpdialog.cpp
+++ b/krename/helpdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqlineedit.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/krename/kmyhistorycombo.cpp b/krename/kmyhistorycombo.cpp
index 550dc4e..32724fb 100644
--- a/krename/kmyhistorycombo.cpp
+++ b/krename/kmyhistorycombo.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpopupmenu.h>
 #include <tqtimer.h>
diff --git a/krename/kmylistbox.cpp b/krename/kmylistbox.cpp
index 20304c4..ca8e408 100644
--- a/krename/kmylistbox.cpp
+++ b/krename/kmylistbox.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kdirlister.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/previewjob.h>
 #include <tdeio/netaccess.h>
 #include <tqptrlist.h>
diff --git a/krename/kmylistview.cpp b/krename/kmylistview.cpp
index 6cf6bd0..9b50e2b 100644
--- a/krename/kmylistview.cpp
+++ b/krename/kmylistview.cpp
@@ -20,7 +20,7 @@
 
 // KDE includes
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 
diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp
index 2000466..0c99b3f 100644
--- a/krename/krenameimpl.cpp
+++ b/krename/krenameimpl.cpp
@@ -47,12 +47,12 @@
 #include <tdefileitem.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kmenubar.h>
+#include <tdemessagebox.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 #include <kurlrequester.h>
-#include <ktempfile.h> 
-#include <klocale.h>
+#include <tdetempfile.h> 
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 
 // QT includes
diff --git a/krename/main.cpp b/krename/main.cpp
index ea5e24a..0be893c 100644
--- a/krename/main.cpp
+++ b/krename/main.cpp
@@ -25,8 +25,8 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kimageio.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // Own includes
 #include "wizard.h"
diff --git a/krename/mydirplugin.cpp b/krename/mydirplugin.cpp
index cb70229..eaa3723 100644
--- a/krename/mydirplugin.cpp
+++ b/krename/mydirplugin.cpp
@@ -22,7 +22,7 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // QT includes
 #include <tqlabel.h>
diff --git a/krename/myinputdialog.cpp b/krename/myinputdialog.cpp
index 38b42bc..83a4833 100644
--- a/krename/myinputdialog.cpp
+++ b/krename/myinputdialog.cpp
@@ -19,7 +19,7 @@
 
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqtooltip.h>
diff --git a/krename/numberdialog.cpp b/krename/numberdialog.cpp
index eb66117..aa54a75 100644
--- a/krename/numberdialog.cpp
+++ b/krename/numberdialog.cpp
@@ -26,7 +26,7 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tqcheckbox.h>
 
diff --git a/krename/permission.cpp b/krename/permission.cpp
index 9e2b189..e7ef157 100644
--- a/krename/permission.cpp
+++ b/krename/permission.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // OS includes
 #include <stdio.h>
diff --git a/krename/pictureplugin.cpp b/krename/pictureplugin.cpp
index 7660190..c4b16c6 100644
--- a/krename/pictureplugin.cpp
+++ b/krename/pictureplugin.cpp
@@ -22,7 +22,7 @@
 
 // KDE includes
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 PicturePlugin::PicturePlugin()
     : FilePlugin( 0 )
diff --git a/krename/profiledlg.cpp b/krename/profiledlg.cpp
index 4dc03bb..3498307 100644
--- a/krename/profiledlg.cpp
+++ b/krename/profiledlg.cpp
@@ -27,8 +27,8 @@
 #include <kiconloader.h>
 #include <kinputdialog.h> 
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/krename/replacedialog.cpp b/krename/replacedialog.cpp
index 5822b55..1f7796a 100644
--- a/krename/replacedialog.cpp
+++ b/krename/replacedialog.cpp
@@ -28,9 +28,9 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <kpushbutton.h>
 #include <kregexpeditorinterface.h>
diff --git a/krename/semantic.cache b/krename/semantic.cache
index 5d3d78b..1e39930 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]) ("tdeapplication.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]))
+    :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]) ("tdeapplication.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]) ("tdelocale.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/tabs.cpp b/krename/tabs.cpp
index affb88d..fef3619 100644
--- a/krename/tabs.cpp
+++ b/krename/tabs.cpp
@@ -27,11 +27,11 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name )
     : TQDialog(parent,name)
diff --git a/krename/translitplugin.h b/krename/translitplugin.h
index 2c0b661..017edec 100644
--- a/krename/translitplugin.h
+++ b/krename/translitplugin.h
@@ -26,7 +26,7 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 // #include <kdebug.h>
 
diff --git a/krename/undodialog.cpp b/krename/undodialog.cpp
index 732e18f..43b52af 100644
--- a/krename/undodialog.cpp
+++ b/krename/undodialog.cpp
@@ -23,8 +23,8 @@
 
 // KDE includes
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <ktextbrowser.h>
 #include <kurlrequester.h>
diff --git a/krename/wizard.cpp b/krename/wizard.cpp
index 3acc919..cca96fc 100644
--- a/krename/wizard.cpp
+++ b/krename/wizard.cpp
@@ -22,10 +22,10 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kstartupinfo.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
+#include <tdestartupinfo.h>
 
 // TQt includes
 #include <tqlabel.h>