Rename many classes and header files to avoid conflicts with KDE4

30 files changed, 47 insertions, 47 deletions

diff --git a/tdeio/tdefile/CMakeLists.txt b/tdeio/tdefile/CMakeLists.txt
index 4fa7b3e82..a69cad536 100644
--- a/tdeio/tdefile/CMakeLists.txt
+++ b/tdeio/tdefile/CMakeLists.txt
@@ -33,7 +33,7 @@ install( FILES
     tdefiledialog.h kencodingfiledialog.h
     kdiroperator.h tdefileview.h tdefilefiltercombo.h
     tdefiledetailview.h kcombiview.h kdiskfreesp.h
-    tdefileiconview.h krecentdocument.h
+    tdefileiconview.h tderecentdocument.h
     kurlrequester.h tdefilepreview.h tdefile.h
     kurlcombobox.h kurlrequesterdlg.h kopenwith.h kpropsdlg.h
     kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h tdefilesharedlg.h
@@ -56,11 +56,11 @@ set( target tdefile )
 
 set( ${target}_SRCS
   tdefilefiltercombo.cpp tdefileview.cpp tdefileiconview.cpp
-  krecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp
+  tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp
   tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp
   tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp
   kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp
-  kdirsize.cpp krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp
+  kdirsize.cpp tderecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp
   tdefilesharedlg.cpp kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp
   tdefiletreeview.cpp tdefiletreeviewitem.cpp tdefiletreebranch.cpp
   kdirselectdialog.cpp tdefilebookmarkhandler.cpp tdefilemetainfowidget.cpp
diff --git a/tdeio/tdefile/Makefile.am b/tdeio/tdefile/Makefile.am
index ab8561e7c..4e6b76ce1 100644
--- a/tdeio/tdefile/Makefile.am
+++ b/tdeio/tdefile/Makefile.am
@@ -29,7 +29,7 @@ METASOURCES = AUTO
 include_HEADERS = tdefiledialog.h kencodingfiledialog.h\
 	kdiroperator.h tdefileview.h tdefilefiltercombo.h \
 	tdefiledetailview.h kcombiview.h kdiskfreesp.h \
-	tdefileiconview.h krecentdocument.h \
+	tdefileiconview.h tderecentdocument.h \
 	kurlrequester.h tdefilepreview.h tdefile.h \
 	kurlcombobox.h kurlrequesterdlg.h kopenwith.h kpropsdlg.h \
 	kicondialog.h kdirsize.h kpreviewwidgetbase.h kimagefilepreview.h tdefilesharedlg.h \
@@ -37,18 +37,18 @@ include_HEADERS = tdefiledialog.h kencodingfiledialog.h\
 	kdirselectdialog.h kurlbar.h kpropertiesdialog.h knotifydialog.h \
 	kcustommenueditor.h knotifywidgetbase.h
 
-noinst_HEADERS = config-tdefile.h krecentdirs.h kmetaprops.h \
+noinst_HEADERS = config-tdefile.h tderecentdirs.h kmetaprops.h \
 	tdefilebookmarkhandler.h tdefilemetainfowidget.h kopenwith_p.h \
 	tdefilespeedbar.h kpreviewprops.h kacleditwidget.h kacleditwidget_p.h images.h
 
 libtdefile_la_SOURCES = \
 	tdefilefiltercombo.cpp \
 	tdefileview.cpp tdefileiconview.cpp \
-	krecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \
+	tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \
 	tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp \
 	tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \
 	kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp kdirsize.cpp \
-	krecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp tdefilesharedlg.cpp \
+	tderecentdirs.cpp kdiskfreesp.cpp kimagefilepreview.cpp tdefilesharedlg.cpp \
 	kurlbar.cpp kmetaprops.cpp kpreviewprops.cpp \
 	tdefiletreeview.cpp tdefiletreeviewitem.cpp tdefiletreebranch.cpp \
 	kdirselectdialog.cpp tdefilebookmarkhandler.cpp \
diff --git a/tdeio/tdefile/kacleditwidget.h b/tdeio/tdefile/kacleditwidget.h
index c51cb94fc..43f4b2fca 100644
--- a/tdeio/tdefile/kacleditwidget.h
+++ b/tdeio/tdefile/kacleditwidget.h
@@ -30,7 +30,7 @@
 
 #ifdef USE_POSIX_ACL
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kacl.h>
 #include <tdefileitem.h>
 
diff --git a/tdeio/tdefile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h
index 9ea5e3203..41e265053 100644
--- a/tdeio/tdefile/kacleditwidget_p.h
+++ b/tdeio/tdefile/kacleditwidget_p.h
@@ -29,7 +29,7 @@
 #endif // Q_MOC_RUN
 
 #ifdef USE_POSIX_ACL
-#include <klistview.h>
+#include <tdelistview.h>
 #include <sys/acl.h>
 #include <kacl.h>
 #include <tdefileitem.h>
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 244e22e84..725048e37 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <tdeconfigbase.h>
diff --git a/tdeio/tdefile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp
index dcb457662..706b63164 100644
--- a/tdeio/tdefile/kdiroperator.cpp
+++ b/tdeio/tdefile/kdiroperator.cpp
@@ -31,7 +31,7 @@
 #include <tqtimer.h>
 #include <tqvbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
@@ -40,7 +40,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <kstdaction.h>
 #include <tdeio/job.h>
@@ -50,7 +50,7 @@
 #include <tdeio/renamedlg.h>
 #include <kpropertiesdialog.h>
 #include <kservicetypefactory.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kde_file.h>
 
 #include "config-tdefile.h"
diff --git a/tdeio/tdefile/kdiroperator.h b/tdeio/tdefile/kdiroperator.h
index 5d806eee2..ca850b733 100644
--- a/tdeio/tdefile/kdiroperator.h
+++ b/tdeio/tdefile/kdiroperator.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tqptrstack.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcompletion.h>
 #include <kdirlister.h>
 #include <tdefileview.h>
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index a540c57ef..e26c2cdf5 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 #include <tqvaluestack.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #include <kshell.h>
 #include <kurl.h>
 #include <kurlcompletion.h>
diff --git a/tdeio/tdefile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp
index 569217bee..a49210642 100644
--- a/tdeio/tdefile/kencodingfiledialog.cpp
+++ b/tdeio/tdefile/kencodingfiledialog.cpp
@@ -23,13 +23,13 @@
 
 #include "kencodingfiledialog.h"
 #include <kcombobox.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
 #include <kdiroperator.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 
 struct KEncodingFileDialogPrivate
 {
diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index ede51d663..f31815e34 100644
--- a/tdeio/tdefile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -19,7 +19,7 @@
 #ifndef KNOTIFYDIALOG_H
 #define KNOTIFYDIALOG_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 #include <kinstance.h>
 #include <kglobal.h>
diff --git a/tdeio/tdefile/knotifywidgetbase.ui b/tdeio/tdefile/knotifywidgetbase.ui
index 023da77d8..89591b1b8 100644
--- a/tdeio/tdefile/knotifywidgetbase.ui
+++ b/tdeio/tdefile/knotifywidgetbase.ui
@@ -458,7 +458,7 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
-    <include location="global" impldecl="in implementation">klistview.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 8582e31f0..16876e356 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -53,7 +53,7 @@
 #include <dcopclient.h>
 #include <kmimetype.h>
 #include <kservicegroup.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdesycoca.h>
 #include <kstdguiitem.h>
 
diff --git a/tdeio/tdefile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h
index ca9317fb6..a0f7eb77c 100644
--- a/tdeio/tdefile/kopenwith_p.h
+++ b/tdeio/tdefile/kopenwith_p.h
@@ -21,7 +21,7 @@
 #define __open_with_p_h__
 
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KURLRequester;
 
diff --git a/tdeio/tdefile/kpropertiesdesktopbase.ui b/tdeio/tdefile/kpropertiesdesktopbase.ui
index 9c08eef93..28e1375c7 100644
--- a/tdeio/tdefile/kpropertiesdesktopbase.ui
+++ b/tdeio/tdefile/kpropertiesdesktopbase.ui
@@ -310,7 +310,7 @@ Following the command, you can have several place holders which will be replaced
 <includes>
     <include location="global" impldecl="in implementation">klineedit.h</include>
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">klistview.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index fdbef4fea..32644301a 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -122,7 +122,7 @@ extern "C" {
 #include <kpreviewprops.h>
 #include <kprocess.h>
 #include <krun.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kacl.h>
 #include "tdefilesharedlg.h"
 
diff --git a/tdeio/tdefile/kpropertiesmimetypebase.ui b/tdeio/tdefile/kpropertiesmimetypebase.ui
index 257eaa57c..1e1848206 100644
--- a/tdeio/tdefile/kpropertiesmimetypebase.ui
+++ b/tdeio/tdefile/kpropertiesmimetypebase.ui
@@ -64,7 +64,7 @@
     </vbox>
 </widget>
 <includes>
-    <include location="global" impldecl="in implementation">klistview.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/tdeio/tdefile/kurlbar.h b/tdeio/tdefile/kurlbar.h
index 7470ec82a..1219a6467 100644
--- a/tdeio/tdefile/kurlbar.h
+++ b/tdeio/tdefile/kurlbar.h
@@ -25,7 +25,7 @@
 
 #include <kdialogbase.h>
 #include <kicontheme.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kurl.h>
 
 class TDEConfig;
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 88b34ea6b..1d5bf009e 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -24,7 +24,7 @@
 #include <tqtooltip.h>
 #include <tqapplication.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index 2459f984f..d1e9ec109 100644
--- a/tdeio/tdefile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -26,13 +26,13 @@
 #include <tqstring.h>
 #include <tqtoolbutton.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp
index ef1f2a37b..1518b48e5 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.cpp
+++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp
@@ -21,7 +21,7 @@
 
 #include <kbookmarkimporter.h>
 #include <kbookmarkdombuilder.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 #include "tdefiledialog.h"
diff --git a/tdeio/tdefile/tdefiledetailview.h b/tdeio/tdefile/tdefiledetailview.h
index 1e2d19a6b..2def9bf27 100644
--- a/tdeio/tdefile/tdefiledetailview.h
+++ b/tdeio/tdefile/tdefiledetailview.h
@@ -25,7 +25,7 @@ class KFileItem;
 class TQWidget;
 class TQKeyEvent;
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmimetyperesolver.h>
 
 #include "tdefileview.h"
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index f60692c88..034265065 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -42,8 +42,8 @@
 #include <tqwhatsthis.h>
 #include <tqfiledialog.h>
 
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcharsets.h>
 #include <kcmdlineargs.h>
@@ -61,16 +61,16 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
 #include <kpushbutton.h>
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #include <kshell.h>
 #include <kstandarddirs.h>
 #include <kstdguiitem.h>
 #include <kstaticdeleter.h>
-#include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarbutton.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>
@@ -81,7 +81,7 @@
 
 #include <kdirselectdialog.h>
 #include <tdefileview.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <tdefilefiltercombo.h>
 #include <kdiroperator.h>
 #include <kimagefilepreview.h>
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index d42373893..ab4be248a 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -29,7 +29,7 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <tdefileitem.h>
diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index 4b336afee..57543ea8c 100644
--- a/tdeio/tdefile/tdefilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefilepreview.h>
 #include <tdefilepreview.moc>
 #include <klocale.h>
diff --git a/tdeio/tdefile/tdefiletreeview.h b/tdeio/tdefile/tdefiletreeview.h
index 3d6e039f5..da72709cd 100644
--- a/tdeio/tdefile/tdefiletreeview.h
+++ b/tdeio/tdefile/tdefiletreeview.h
@@ -27,7 +27,7 @@
 #include <tqstrlist.h>
 #include <tqtooltip.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdirnotify.h>
 #include <tdeio/job.h>
 #include <tdefiletreeviewitem.h>
diff --git a/tdeio/tdefile/tdefiletreeviewitem.h b/tdeio/tdefile/tdefiletreeviewitem.h
index 4455bff78..5ee6e035a 100644
--- a/tdeio/tdefile/tdefiletreeviewitem.h
+++ b/tdeio/tdefile/tdefiletreeviewitem.h
@@ -21,7 +21,7 @@
 #define tdefile_tree_view_item_h
 
 #include <tqptrlist.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tdefileitem.h>
 #include <tdeio/global.h>
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index 01bc5e6b0..fb3cb0e9f 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp
index 0d8d008bd..12c2b6477 100644
--- a/tdeio/tdefile/tderecentdirs.cpp
+++ b/tdeio/tdefile/tderecentdirs.cpp
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  */
-#include <krecentdirs.h>
+#include <tderecentdirs.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
@@ -52,7 +52,7 @@ static TDEConfig *recentdirs_readList(TQString &key, TQStringList &result, bool
    if (key[1] == ':') 
    {
       key = key.mid(2);
-      config = new KSimpleConfig(TQString::fromLatin1("krecentdirsrc"), readOnly);
+      config = new KSimpleConfig(TQString::fromLatin1("tderecentdirsrc"), readOnly);
    }
    else
    {
diff --git a/tdeio/tdefile/tderecentdocument.cpp b/tdeio/tdefile/tderecentdocument.cpp
index 85af01c46..3d5ec44e7 100644
--- a/tdeio/tdefile/tderecentdocument.cpp
+++ b/tdeio/tdefile/tderecentdocument.cpp
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  */
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index 008edb827..dfa59540d 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -21,7 +21,7 @@
 
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <kurl.h>
 #include <kdebug.h>