Rename many classes and header files to avoid conflicts with KDE4

17 files changed, 26 insertions, 26 deletions

diff --git a/src/projects/base_k3badvanceddataimagesettings.ui b/src/projects/base_k3badvanceddataimagesettings.ui
index a5a6f03..0bfefa5 100644
--- a/src/projects/base_k3badvanceddataimagesettings.ui
+++ b/src/projects/base_k3badvanceddataimagesettings.ui
@@ -186,7 +186,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui
index 439ac16..f0e5f27 100644
--- a/src/projects/base_k3bbootimageview.ui
+++ b/src/projects/base_k3bbootimageview.ui
@@ -389,6 +389,6 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp
index ec1e815..57e7ebb 100644
--- a/src/projects/k3baudiotrackplayer.cpp
+++ b/src/projects/k3baudiotrackplayer.cpp
@@ -18,7 +18,7 @@
 #include <k3baudiotrack.h>
 #include <k3baudioserver.h>
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <klocale.h>
 
 #include <tqslider.h>
diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp
index 2569add..f0c7fcb 100644
--- a/src/projects/k3baudiotracksplitdialog.cpp
+++ b/src/projects/k3baudiotracksplitdialog.cpp
@@ -21,9 +21,9 @@
 #include <k3bmsfedit.h>
 
 #include <klocale.h>
-#include <kactioncollection.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeactioncollection.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 #include <tqlabel.h>
 #include <tqframe.h>
diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp
index 7539aa8..f59ec9e 100644
--- a/src/projects/k3baudiotrackview.cpp
+++ b/src/projects/k3baudiotrackview.cpp
@@ -53,8 +53,8 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp
index cdfaaea..bddd065 100644
--- a/src/projects/k3baudioview.cpp
+++ b/src/projects/k3baudioview.cpp
@@ -34,7 +34,7 @@
 #include <k3bfillstatusdisplay.h>
 #include <k3bmsf.h>
 #include <k3btoolbox.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <k3bprojectplugin.h>
 
 // QT-includes
diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp
index 9f95d7c..7b3e2f4 100644
--- a/src/projects/k3bbootimageview.cpp
+++ b/src/projects/k3bbootimageview.cpp
@@ -20,7 +20,7 @@
 #include <k3bintvalidator.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp
index 9ecc9bc..be1cb17 100644
--- a/src/projects/k3bdataadvancedimagesettingswidget.cpp
+++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp
@@ -28,7 +28,7 @@
 #include <tqvalidator.h>
 #include <tqregexp.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp
index cd35c2f..cb35a18 100644
--- a/src/projects/k3bdatadirtreeview.cpp
+++ b/src/projects/k3bdatadirtreeview.cpp
@@ -31,11 +31,11 @@
 #include <tqtimer.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #include <kdebug.h>
 
diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp
index c4b625a..d703d2f 100644
--- a/src/projects/k3bdatafileview.cpp
+++ b/src/projects/k3bdatafileview.cpp
@@ -38,11 +38,11 @@
 #include <tqfileinfo.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
 #include <kdebug.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <krun.h>
 #include <tdeversion.h>
 
diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp
index d59e55b..474d799 100644
--- a/src/projects/k3bdataview.cpp
+++ b/src/projects/k3bdataview.cpp
@@ -34,8 +34,8 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index 29324a8..b2d2e2a 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -39,8 +39,8 @@
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
 
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <tdeconfig.h>
diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp
index 8d1b939..1647ef6 100644
--- a/src/projects/k3bmixedview.cpp
+++ b/src/projects/k3bmixedview.cpp
@@ -41,7 +41,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 
 K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* parent, const char* name )
diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp
index 58c4f3c..85d8312 100644
--- a/src/projects/k3bmovixview.cpp
+++ b/src/projects/k3bmovixview.cpp
@@ -27,8 +27,8 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kurl.h>
diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp
index b2c5508..8035cd7 100644
--- a/src/projects/k3bvcdlistview.cpp
+++ b/src/projects/k3bvcdlistview.cpp
@@ -27,8 +27,8 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kdialog.h>
 
 // K3b Includes
diff --git a/src/projects/k3bvideodvdview.cpp b/src/projects/k3bvideodvdview.cpp
index 252e2d0..3bcc328 100644
--- a/src/projects/k3bvideodvdview.cpp
+++ b/src/projects/k3bvideodvdview.cpp
@@ -26,7 +26,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 
 #include <tqsplitter.h>
 
diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp
index 86e97e3..66b05a4 100644
--- a/src/projects/k3bview.cpp
+++ b/src/projects/k3bview.cpp
@@ -22,7 +22,7 @@
 #include <tqptrlist.h>
 #include <tqtoolbutton.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>