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

---
 k3bsetup/base_k3bsetup2.ui | 4 ++--
 k3bsetup/k3bsetup2.cpp     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'k3bsetup')

diff --git a/k3bsetup/base_k3bsetup2.ui b/k3bsetup/base_k3bsetup2.ui
index 9605f84..9ad2b87 100644
--- a/k3bsetup/base_k3bsetup2.ui
+++ b/k3bsetup/base_k3bsetup2.ui
@@ -372,8 +372,8 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp
index e0a8d89..bb44a97 100644
--- a/k3bsetup/k3bsetup2.cpp
+++ b/k3bsetup/k3bsetup2.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kgenericfactory.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <keditlistbox.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
-- 
cgit v1.2.3