Rename many classes and header files to avoid conflicts with KDE4

14 files changed, 17 insertions, 17 deletions

diff --git a/kview/kview.cpp b/kview/kview.cpp
index f03b6a07..33ba9c81 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -29,7 +29,7 @@
 #include <tdeparts/plugin.h>
 #include <tdeparts/part.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kimageio.h>
 #include <tdefiledialog.h>
@@ -39,7 +39,7 @@
 #include <kstatusbar.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kprogress.h>
 
 #include <tqimage.h>
diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp
index 84f897c4..04b3cf3a 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kcolorbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <knuminput.h>
 #include <kgenericfactory.h>
 
diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui
index 37d4b0f5..d6d38452 100644
--- a/kview/kviewcanvas/config/generalconfigwidget.ui
+++ b/kview/kviewcanvas/config/generalconfigwidget.ui
@@ -294,7 +294,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
 </UI>
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 3495adbf..b2fbe46e 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -47,10 +47,10 @@
 #include <ktempfile.h>
 #include <kapplication.h>
 #include <kimageio.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kdirwatch.h>
 #include <kurldrag.h>
-#include <krecentdocument.h>
+#include <tderecentdocument.h>
 
 typedef KParts::GenericFactory<KViewViewer> KViewViewerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkviewviewer, KViewViewerFactory )
diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp
index ea12d237..29d1d9aa 100644
--- a/kview/modules/browser/kviewbrowser.cpp
+++ b/kview/modules/browser/kviewbrowser.cpp
@@ -23,7 +23,7 @@
 #include <tqcursor.h>
 
 #include <kdirlister.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp
index 4b717da7..a2525e77 100644
--- a/kview/modules/effects/kvieweffects.cpp
+++ b/kview/modules/effects/kvieweffects.cpp
@@ -6,7 +6,7 @@
 
 #include <tqobjectlist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index b9a21da4..b3f8cf48 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -275,7 +275,7 @@
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kdialog.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp
index 74e82bea..62ca6e90 100644
--- a/kview/modules/presenter/imagelistitem.cpp
+++ b/kview/modules/presenter/imagelistitem.cpp
@@ -22,7 +22,7 @@
 
 #include <tqimage.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 ImageListItem::ImageListItem( TDEListView * parent, const KURL & url )
 	: TDEListViewItem( parent, parent->lastItem(), url.prettyURL() )
diff --git a/kview/modules/presenter/imagelistitem.h b/kview/modules/presenter/imagelistitem.h
index 4eabcb39..321dcf4d 100644
--- a/kview/modules/presenter/imagelistitem.h
+++ b/kview/modules/presenter/imagelistitem.h
@@ -21,7 +21,7 @@
 #ifndef IMAGELISTITEM_H
 #define IMAGELISTITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <tqstring.h>
 
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index c554e446..7cc3285c 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -32,7 +32,7 @@
 
 #include <kpushbutton.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp
index 4dbdbd92..d2f6c9c5 100644
--- a/kview/modules/scale/kview_scale.cpp
+++ b/kview/modules/scale/kview_scale.cpp
@@ -24,7 +24,7 @@
 #include <tqimage.h>
 #include <tqvbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp
index 010296e5..1c35fa68 100644
--- a/kview/modules/scanner/kviewscanner.cpp
+++ b/kview/modules/scanner/kviewscanner.cpp
@@ -23,7 +23,7 @@
 #include <tqimage.h>
 #include <tqobjectlist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <kgenericfactory.h>
diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp
index 78e10595..f148f7ac 100644
--- a/kview/modules/template/kviewtemplate.cpp
+++ b/kview/modules/template/kviewtemplate.cpp
@@ -6,7 +6,7 @@
 
 #include <tqobjectlist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 /*#include <klocale.h>*/
 #include <kgenericfactory.h>
 #include <kdebug.h>
diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp
index a434994b..ed21f123 100644
--- a/kview/photobook/photobook.cpp
+++ b/kview/photobook/photobook.cpp
@@ -40,8 +40,8 @@ Copyright (c) 2004,2005 Charles Samuels <[email protected]>
 #include "photobook.h"
 
 #include <tdeparts/componentfactory.h>
-#include <kaction.h>
-#include <kstdaccel.h>
+#include <tdeaction.h>
+#include <tdestdaccel.h>
 #include <kstandarddirs.h>
 
 Previews::Previews(PhotoBook *parent, const TQStringList &mimetypes)