Rename many classes and header files to avoid conflicts with KDE4

50 files changed, 69 insertions, 69 deletions

diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index b80be8f..88c8b06 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -182,7 +182,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf
 <!ENTITY xfce-url '<ulink url="http://www.xfce.org/"><application>XFce</application></ulink>'>
 
 <!ENTITY debian-qt-a-url '<ulink url="http://www.krusader.org/phpBB/viewtopic.php?t=710">in our forum</ulink>'>
-<!ENTITY debian-qt-b-url '<ulink url="http://opendoorsoftware.com/cgi/http.pl?p=DebianQTChecklist">instructions</ulink>'>
+<!ENTITY debian-qt-b-url '<ulink url="http://opendoorsoftware.com/cgi/http.pl?p=DebianQTChectdelist">instructions</ulink>'>
 <!ENTITY freenode-url '<ulink url="http://freenode.net">freenode.org</ulink>'>
 <!ENTITY fink-url '<ulink url="http://www.finkproject.org/">fink</ulink>'>
 <!ENTITY kjsembed-url '<ulink url="http://xmelegance.org/kjsembed/">KJSEmbed</ulink>'>
diff --git a/doc/en/user-interface.docbook b/doc/en/user-interface.docbook
index f002858..7072f76 100644
--- a/doc/en/user-interface.docbook
+++ b/doc/en/user-interface.docbook
@@ -281,7 +281,7 @@
       </listitem>
       <listitem>
         <para>&popup-panel-lnk;: has several display
-        modes: Preview, Tree, Quickselect, View and Disk Usage for
+        modes: Preview, Tree, Quictdeselect, View and Disk Usage for
         the file or directory that has the focus. The PopUp Panel
         may be left open or closed, as desired.</para>
       </listitem>
@@ -520,7 +520,7 @@
         <listitem>
           <para>
           <emphasis>
-            <guilabel>Quickselect Panel</guilabel>
+            <guilabel>Quictdeselect Panel</guilabel>
           </emphasis>: is used to quickly select files,
           &eg; 
           <literal role="extension">*.png</literal>and click on the
diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook
index 64b893c..56bc927 100644
--- a/doc/ru/index.docbook
+++ b/doc/ru/index.docbook
@@ -396,7 +396,7 @@ since the Entity Backspace is not defined in
 <!ENTITY debian_qt_a_url '<ulink url="http://www.krusader.org/phpBB/viewtopic.php?t=710"
 >in our forum</ulink
 >'>
-<!ENTITY debian_qt_b_url '<ulink url="http://opendoorsoftware.com/cgi/http.pl?p=DebianQTChecklist"
+<!ENTITY debian_qt_b_url '<ulink url="http://opendoorsoftware.com/cgi/http.pl?p=DebianQTChectdelist"
 >instructions</ulink
 >'>
 <!ENTITY freenode_url '<ulink url="http://freenode.net"
diff --git a/krusader/ActionMan/actionpropertybase.cpp b/krusader/ActionMan/actionpropertybase.cpp
index 0bffa2f..6c0a839 100644
--- a/krusader/ActionMan/actionpropertybase.cpp
+++ b/krusader/ActionMan/actionpropertybase.cpp
@@ -25,7 +25,7 @@
 #include <kkeybutton.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -34,7 +34,7 @@
 #include "kicondialog.h"
 #include "ktextedit.h"
 #include "kkeybutton.h"
-#include "klistbox.h"
+#include "tdelistbox.h"
 
 /*
  *  Constructs a ActionPropertyBase as a child of 'parent', with the
diff --git a/krusader/ActionMan/actionpropertybase.ui b/krusader/ActionMan/actionpropertybase.ui
index ff821d2..12968f4 100644
--- a/krusader/ActionMan/actionpropertybase.ui
+++ b/krusader/ActionMan/actionpropertybase.ui
@@ -1116,10 +1116,10 @@ Please consult the handbook to learn more about the syntax.</string>
     <includehint>klineedit.h</includehint>
     <includehint>ktextedit.h</includehint>
     <includehint>kkeybutton.h</includehint>
-    <includehint>klistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
diff --git a/krusader/ActionMan/addplaceholderpopup.h b/krusader/ActionMan/addplaceholderpopup.h
index 604db3b..03d373e 100644
--- a/krusader/ActionMan/addplaceholderpopup.h
+++ b/krusader/ActionMan/addplaceholderpopup.h
@@ -13,7 +13,7 @@
 #ifndef ADDPLACEHOLDERPOPUP_H
 #define ADDPLACEHOLDERPOPUP_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdialogbase.h>
 #include "../UserAction/expander.h"
 
diff --git a/krusader/ActionMan/useractionlistview.h b/krusader/ActionMan/useractionlistview.h
index 35d31d7..65884ba 100644
--- a/krusader/ActionMan/useractionlistview.h
+++ b/krusader/ActionMan/useractionlistview.h
@@ -12,7 +12,7 @@
 #ifndef USERACTIONLISTVIEW_H
 #define USERACTIONLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KrAction;
 class TQString;
diff --git a/krusader/BookMan/kraddbookmarkdlg.h b/krusader/BookMan/kraddbookmarkdlg.h
index 023cb52..7c08f8b 100644
--- a/krusader/BookMan/kraddbookmarkdlg.h
+++ b/krusader/BookMan/kraddbookmarkdlg.h
@@ -7,7 +7,7 @@
 #include <kurl.h>
 #include <klineedit.h>
 #include <tqmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqtoolbutton.h>
 
 class KrAddBookmarkDlg: public KDialogBase {
diff --git a/krusader/BookMan/krbookmark.cpp b/krusader/BookMan/krbookmark.cpp
index 85ad561..fc18489 100644
--- a/krusader/BookMan/krbookmark.cpp
+++ b/krusader/BookMan/krbookmark.cpp
@@ -1,7 +1,7 @@
 #include "krbookmark.h"
 #include "../krusader.h"
 #include "../VFS/krarchandler.h"
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/krusader/BookMan/krbookmark.h b/krusader/BookMan/krbookmark.h
index d192417..e8e4071 100644
--- a/krusader/BookMan/krbookmark.h
+++ b/krusader/BookMan/krbookmark.h
@@ -1,7 +1,7 @@
 #ifndef KRBOOKMARK_H
 #define KRBOOKMARK_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqptrlist.h>
 #include <kurl.h>
 
diff --git a/krusader/BookMan/krbookmarkbutton.cpp b/krusader/BookMan/krbookmarkbutton.cpp
index b0ce824..e7c0972 100644
--- a/krusader/BookMan/krbookmarkbutton.cpp
+++ b/krusader/BookMan/krbookmarkbutton.cpp
@@ -3,9 +3,9 @@
 #include "../krusader.h"
 #include <tqpixmap.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 KrBookmarkButton::KrBookmarkButton(TQWidget *parent): TQToolButton(parent) {
diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp
index a08d9af..b62cd15 100644
--- a/krusader/BookMan/krbookmarkhandler.cpp
+++ b/krusader/BookMan/krbookmarkhandler.cpp
@@ -7,7 +7,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <tqptrlist.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kbookmarkmanager.h>
diff --git a/krusader/BookMan/krbookmarkhandler.h b/krusader/BookMan/krbookmarkhandler.h
index d9480c8..49aa437 100644
--- a/krusader/BookMan/krbookmarkhandler.h
+++ b/krusader/BookMan/krbookmarkhandler.h
@@ -4,7 +4,7 @@
 #include "krbookmark.h"
 #include <tqobject.h>
 #include <tqguardedptr.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurl.h>
 #include <tqptrdict.h>
 #include <tqvaluelist.h>
diff --git a/krusader/Dialogs/checksumdlg.cpp b/krusader/Dialogs/checksumdlg.cpp
index 28006e5..2bbd022 100644
--- a/krusader/Dialogs/checksumdlg.cpp
+++ b/krusader/Dialogs/checksumdlg.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpixmap.h>
 #include <kcursor.h>
 #include <kmessagebox.h>
diff --git a/krusader/Dialogs/krdialogs.cpp b/krusader/Dialogs/krdialogs.cpp
index 7590fad..83c0d68 100644
--- a/krusader/Dialogs/krdialogs.cpp
+++ b/krusader/Dialogs/krdialogs.cpp
@@ -47,7 +47,7 @@
 #include <kstandarddirs.h>
 #include <tdeversion.h>
 #include <tqcheckbox.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <tqhbox.h>
 // Krusader includes
 #include "../krusader.h"
diff --git a/krusader/Dialogs/krkeydialog.cpp b/krusader/Dialogs/krkeydialog.cpp
index 0a5e763..6e9a480 100644
--- a/krusader/Dialogs/krkeydialog.cpp
+++ b/krusader/Dialogs/krkeydialog.cpp
@@ -20,7 +20,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kactionshortcutlist.h>
+#include <tdeactionshortcutlist.h>
 #include <kdebug.h>
 
 #include "../krusader.h"
diff --git a/krusader/Dialogs/kurllistrequester.cpp b/krusader/Dialogs/kurllistrequester.cpp
index da2a296..b23919e 100644
--- a/krusader/Dialogs/kurllistrequester.cpp
+++ b/krusader/Dialogs/kurllistrequester.cpp
@@ -34,7 +34,7 @@
 #include <tqcursor.h>
 #include <tqlayout.h>
 #include <tdefiledialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/krusader/Dialogs/popularurls.cpp b/krusader/Dialogs/popularurls.cpp
index e6a0635..77fe00e 100644
--- a/krusader/Dialogs/popularurls.cpp
+++ b/krusader/Dialogs/popularurls.cpp
@@ -1,13 +1,13 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <tqpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kiconloader.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #include <tqheader.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include "../krusader.h"
 #include "../krslots.h"
 #include "popularurls.h"
diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp
index 98bf019..5d2ff5d 100644
--- a/krusader/DiskUsage/diskusage.cpp
+++ b/krusader/DiskUsage/diskusage.cpp
@@ -31,7 +31,7 @@
 #include <time.h>
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kglobalsettings.h>
diff --git a/krusader/DiskUsage/dufilelight.cpp b/krusader/DiskUsage/dufilelight.cpp
index 869e81c..1cef747 100644
--- a/krusader/DiskUsage/dufilelight.cpp
+++ b/krusader/DiskUsage/dufilelight.cpp
@@ -30,7 +30,7 @@
 
 #include "dufilelight.h"
 #include "radialMap/radialMap.h"
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kinputdialog.h>
 
diff --git a/krusader/DiskUsage/dulines.cpp b/krusader/DiskUsage/dulines.cpp
index cf176fe..65527ec 100644
--- a/krusader/DiskUsage/dulines.cpp
+++ b/krusader/DiskUsage/dulines.cpp
@@ -39,7 +39,7 @@
 #include <tqfontmetrics.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 class DULinesItem : public TQListViewItem
 {
diff --git a/krusader/DiskUsage/radialMap/widgetEvents.cpp b/krusader/DiskUsage/radialMap/widgetEvents.cpp
index 47bcf23..e044a99 100644
--- a/krusader/DiskUsage/radialMap/widgetEvents.cpp
+++ b/krusader/DiskUsage/radialMap/widgetEvents.cpp
@@ -11,7 +11,7 @@
 #include <tdeio/job.h>     //::mousePressEvent()
 #include <klocale.h>
 #include <kmessagebox.h> //::mousePressEvent()
-#include <kpopupmenu.h>  //::mousePressEvent()
+#include <tdepopupmenu.h>  //::mousePressEvent()
 #include <krun.h>        //::mousePressEvent()
 #include <math.h>        //::segmentAt()
 #include <tqapplication.h>//TQApplication::setOverrideCursor()
diff --git a/krusader/GUI/kcmdmodebutton.cpp b/krusader/GUI/kcmdmodebutton.cpp
index d2a8220..21247d3 100644
--- a/krusader/GUI/kcmdmodebutton.cpp
+++ b/krusader/GUI/kcmdmodebutton.cpp
@@ -25,10 +25,10 @@
 #include "../krusader.h"
 #include "../krusaderview.h"
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <kdebug.h>
 
diff --git a/krusader/GUI/krremoteencodingmenu.cpp b/krusader/GUI/krremoteencodingmenu.cpp
index 0dc21ee..b275880 100644
--- a/krusader/GUI/krremoteencodingmenu.cpp
+++ b/krusader/GUI/krremoteencodingmenu.cpp
@@ -29,7 +29,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kcharsets.h>
 #include <tdeio/slaveconfig.h>
 #include <dcopclient.h>
diff --git a/krusader/GUI/krremoteencodingmenu.h b/krusader/GUI/krremoteencodingmenu.h
index df6a9d5..dadae5a 100644
--- a/krusader/GUI/krremoteencodingmenu.h
+++ b/krusader/GUI/krremoteencodingmenu.h
@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 #include <kurl.h>
 #include <klibloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KrRemoteEncodingMenu: public TDEActionMenu
 {
diff --git a/krusader/GUI/profilemanager.cpp b/krusader/GUI/profilemanager.cpp
index caa405d..9ad5b41 100644
--- a/krusader/GUI/profilemanager.cpp
+++ b/krusader/GUI/profilemanager.cpp
@@ -33,7 +33,7 @@
 
 #include <klocale.h>
 #include <tqtooltip.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqcursor.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
diff --git a/krusader/Konfigurator/konfiguratoritems.h b/krusader/Konfigurator/konfiguratoritems.h
index 89934eb..baa6569 100644
--- a/krusader/Konfigurator/konfiguratoritems.h
+++ b/krusader/Konfigurator/konfiguratoritems.h
@@ -44,7 +44,7 @@
 #include <tqlineedit.h>
 #include <kurlrequester.h>
 #include <tqhbox.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <tqlabel.h>
 #include <tqfont.h>
 #include <tqtoolbutton.h>
diff --git a/krusader/Locate/locate.cpp b/krusader/Locate/locate.cpp
index 8f566ad..070e8b9 100755
--- a/krusader/Locate/locate.cpp
+++ b/krusader/Locate/locate.cpp
@@ -45,7 +45,7 @@
 #include <tqlayout.h>
 #include <tqfontmetrics.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqcursor.h>
 #include <tqeventloop.h>
 #include <kfinddialog.h>
diff --git a/krusader/Locate/locate.h b/krusader/Locate/locate.h
index fd1d46f..050e6f6 100755
--- a/krusader/Locate/locate.h
+++ b/krusader/Locate/locate.h
@@ -33,7 +33,7 @@
 
 #include <kdialogbase.h>
 #include <kcombobox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kprocess.h>
 #include <tqcheckbox.h>
 
diff --git a/krusader/MountMan/kmountman.cpp b/krusader/MountMan/kmountman.cpp
index 4e1d930..bbe500b 100644
--- a/krusader/MountMan/kmountman.cpp
+++ b/krusader/MountMan/kmountman.cpp
@@ -34,7 +34,7 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 
 // Krusader includes
diff --git a/krusader/MountMan/kmountmangui.cpp b/krusader/MountMan/kmountmangui.cpp
index ef36fc0..49181d5 100644
--- a/krusader/MountMan/kmountmangui.cpp
+++ b/krusader/MountMan/kmountmangui.cpp
@@ -39,7 +39,7 @@ A
 #include "../VFS/vfs.h"
 #include <klocale.h>
 #include <tqpixmap.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqbitmap.h>
 #include <kmessagebox.h>
 #include <tqlayout.h>
diff --git a/krusader/Panel/krdetailedview.cpp b/krusader/Panel/krdetailedview.cpp
index e5d68a7..eaeb42c 100644
--- a/krusader/Panel/krdetailedview.cpp
+++ b/krusader/Panel/krdetailedview.cpp
@@ -51,7 +51,7 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqdict.h>
 
 //////////////////////////////////////////////////////////////////////////
@@ -1390,7 +1390,7 @@ void KrDetailedView::makeItemVisible( const KrViewItem *item ) {
 
 void KrDetailedView::initOperator() {
 	_operator = new KrViewOperator(this, this);
-	// klistview emits selection changed, so chain them to operator
+	// tdelistview emits selection changed, so chain them to operator
 	connect(this, TQT_SIGNAL(selectionChanged()), _operator, TQT_SIGNAL(selectionChanged()));
 }
 
diff --git a/krusader/Panel/krdetailedview.h b/krusader/Panel/krdetailedview.h
index a12dd45..c15d7f9 100644
--- a/krusader/Panel/krdetailedview.h
+++ b/krusader/Panel/krdetailedview.h
@@ -30,7 +30,7 @@ A
 #ifndef KRDETAILEDVIEW_H
 #define KRDETAILEDVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ksqueezedtextlabel.h>
 #include <klocale.h>
 #include <tqwidget.h>
diff --git a/krusader/Panel/krdetailedviewitem.h b/krusader/Panel/krdetailedviewitem.h
index a689baf..1bca596 100644
--- a/krusader/Panel/krdetailedviewitem.h
+++ b/krusader/Panel/krdetailedviewitem.h
@@ -34,7 +34,7 @@
 #include "krviewitem.h"
 #include <sys/types.h>
 #include "../VFS/vfile.h"
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqguardedptr.h>
 
 #define FASTER
diff --git a/krusader/Panel/krpopupmenu.h b/krusader/Panel/krpopupmenu.h
index 16cc515..b0385a1 100644
--- a/krusader/Panel/krpopupmenu.h
+++ b/krusader/Panel/krpopupmenu.h
@@ -1,7 +1,7 @@
 #ifndef KRPOPUPMENU_H
 #define KRPOPUPMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurl.h>
 #include <kuserprofile.h>
 #include "listpanel.h"
diff --git a/krusader/Panel/krview.h b/krusader/Panel/krview.h
index 353fcd9..b8d0b55 100644
--- a/krusader/Panel/krview.h
+++ b/krusader/Panel/krview.h
@@ -69,8 +69,8 @@ public:
 };
 
 // operator can handle two ways of doing things:
-// 1. if the view is a widget (inherits krview and klistview for example)
-// 2. if the view HAS A widget (a krview-son has a member of klistview)
+// 1. if the view is a widget (inherits krview and tdelistview for example)
+// 2. if the view HAS A widget (a krview-son has a member of tdelistview)
 // this is done by specifying the view and the widget in the constructor,
 // even if they are actually the same object (specify it twice in that case)
 class KrViewOperator: public TQObject {
diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp
index 9647b67..9444d82 100644
--- a/krusader/Panel/listpanel.cpp
+++ b/krusader/Panel/listpanel.cpp
@@ -41,7 +41,7 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #include <tqregexp.h> 
 #include <tqsplitter.h>
 // KDE includes
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/krusader/Search/krsearchdialog.cpp b/krusader/Search/krsearchdialog.cpp
index 67c1bc4..e4cab4d 100644
--- a/krusader/Search/krsearchdialog.cpp
+++ b/krusader/Search/krsearchdialog.cpp
@@ -45,7 +45,7 @@
 #include <tqregexp.h>
 #include <tqfontmetrics.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqcursor.h>
 #include <tqclipboard.h>
 #include <tqheader.h>
diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp
index bab6e0f..2e0f63e 100755
--- a/krusader/Synchronizer/synchronizergui.cpp
+++ b/krusader/Synchronizer/synchronizergui.cpp
@@ -44,7 +44,7 @@
 #include <kurlrequester.h>
 #include <klocale.h>
 #include <tqgrid.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqcursor.h>
 #include <time.h>
 #include <kmessagebox.h>
diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp
index b487b8e..409e069 100644
--- a/krusader/UserAction/kraction.cpp
+++ b/krusader/UserAction/kraction.cpp
@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
diff --git a/krusader/UserAction/kraction.h b/krusader/UserAction/kraction.h
index 32a206f..0cd987b 100644
--- a/krusader/UserAction/kraction.h
+++ b/krusader/UserAction/kraction.h
@@ -13,7 +13,7 @@
 #ifndef KRACTION_H
 #define KRACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kprocess.h>
 #include <kdialogbase.h>
 #include "kractionbase.h"
diff --git a/krusader/UserAction/useraction.cpp b/krusader/UserAction/useraction.cpp
index cd4f034..938bbb0 100644
--- a/krusader/UserAction/useraction.cpp
+++ b/krusader/UserAction/useraction.cpp
@@ -12,7 +12,7 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
diff --git a/krusader/UserAction/useractionpopupmenu.h b/krusader/UserAction/useractionpopupmenu.h
index 999b3f7..33ea818 100644
--- a/krusader/UserAction/useractionpopupmenu.h
+++ b/krusader/UserAction/useractionpopupmenu.h
@@ -13,7 +13,7 @@
 #ifndef USERACTIONPOPUPMENU_H
 #define USERACTIONPOPUPMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 class KURL;
 
diff --git a/krusader/UserMenu/usermenu.h b/krusader/UserMenu/usermenu.h
index b7a493d..f987b4d 100644
--- a/krusader/UserMenu/usermenu.h
+++ b/krusader/UserMenu/usermenu.h
@@ -18,7 +18,7 @@ email                :
 #ifndef USERMENU_H
 #define USERMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 class TQWidget;
 class UserMenu;
diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp
index c7771e4..a21b372 100644
--- a/krusader/krusader.cpp
+++ b/krusader/krusader.cpp
@@ -36,7 +36,7 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #endif
 // KDE includes
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <ksystemtray.h>
 #include <kmenubar.h>
@@ -44,11 +44,11 @@ YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
 #include <kcmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <twin.h>
 
 #if KDE_IS_VERSION(3,2,0)
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #endif
 
 #include <tdeversion.h> 
diff --git a/krusader/krusader.h b/krusader/krusader.h
index 27c6224..4f5fa9a 100644
--- a/krusader/krusader.h
+++ b/krusader/krusader.h
@@ -41,9 +41,9 @@
 #include <kapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tqstringlist.h>
 #include <tqtextstream.h>
 #include <kdebug.h>
diff --git a/krusader/krusaderview.cpp b/krusader/krusaderview.cpp
index 236825b..ef1e915 100644
--- a/krusader/krusaderview.cpp
+++ b/krusader/krusaderview.cpp
@@ -32,7 +32,7 @@
 #include <tqwhatsthis.h> 
 #include <kstatusbar.h>
 #include <kmenubar.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 // Krusader includes
 #include "krusaderview.h"
 #include "krusader.h"
diff --git a/krusader/krusaderview.h b/krusader/krusaderview.h
index 93c480f..b1610b4 100644
--- a/krusader/krusaderview.h
+++ b/krusader/krusaderview.h
@@ -33,9 +33,9 @@
 #define KRUSADERVIEW_H
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <tdeparts/part.h>
 
diff --git a/krusader/paneltabbar.cpp b/krusader/paneltabbar.cpp
index d4df4f4..731b4e4 100644
--- a/krusader/paneltabbar.cpp
+++ b/krusader/paneltabbar.cpp
@@ -20,9 +20,9 @@
 #include "krusaderview.h"
 #include "krslots.h"
 #include "defaults.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <tqevent.h>
 #include <tqwidgetstack.h>
 #include <tqfontmetrics.h>
diff --git a/po/sv.po b/po/sv.po
index 98265fb..045531e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5615,19 +5615,19 @@ msgstr "Definierade länkar"
 
 #: Konfigurator/kgprotocols.cpp:85
 msgid "Add protocol to the link list."
-msgstr "Lägg till protokoll till länklistan."
+msgstr "Lägg till protokoll till läntdelistan."
 
 #: Konfigurator/kgprotocols.cpp:88
 msgid "Remove protocol from the link list."
-msgstr "Tag bort protokoll från länklistan."
+msgstr "Tag bort protokoll från läntdelistan."
 
 #: Konfigurator/kgprotocols.cpp:98
 msgid "Add mime to the selected protocol on the link list."
-msgstr "Lägg till mime till det valda protokollet i länklistan."
+msgstr "Lägg till mime till det valda protokollet i läntdelistan."
 
 #: Konfigurator/kgprotocols.cpp:101
 msgid "Remove mime from the link list."
-msgstr "Tag bort mime från länklistan."
+msgstr "Tag bort mime från läntdelistan."
 
 #: Konfigurator/kgprotocols.cpp:119
 msgid "Mimes"