From bba095a5aab3f7cbf3ec062071e94f5c1e66e50b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:10:14 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 src/rip/k3baudiocdview.cpp                        | 2 +-
 src/rip/k3baudioprojectconvertingdialog.cpp       | 2 +-
 src/rip/k3baudiorippingdialog.cpp                 | 2 +-
 src/rip/k3bvideocdview.cpp                        | 2 +-
 src/rip/videodvd/base_k3bvideodvdrippingwidget.ui | 2 +-
 src/rip/videodvd/k3bvideodvdrippingdialog.cpp     | 2 +-
 src/rip/videodvd/k3bvideodvdrippingview.cpp       | 2 +-
 src/rip/videodvd/k3bvideodvdrippingwidget.cpp     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/rip')

diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index d083af6..91e5a51 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index f9bcfdb..425d64b 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -34,7 +34,7 @@
 #include <kcombobox.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <tdeio/global.h>
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index 876d91f..20fbe15 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <tdeio/global.h>
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index c7799bd..1dd9753 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -14,7 +14,7 @@
 */
 
 // kde includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcutlabel.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
index 3195f3c..c4bc79b 100644
--- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
+++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
@@ -708,7 +708,7 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index b5deed5..f964a67 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -24,7 +24,7 @@
 #include <k3bfilesysteminfo.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kurlrequester.h>
diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp
index 9567afd..cce8f09 100644
--- a/src/rip/videodvd/k3bvideodvdrippingview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp
@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 
 
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index 5a229bf..742a7f7 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -20,7 +20,7 @@
 #include <k3brichtextlabel.h>
 #include <k3bintmapcombobox.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <tdeio/global.h>
-- 
cgit v1.2.3