summaryrefslogtreecommitdiffstats
path: root/k3bsetup
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:14 -0600
commitbba095a5aab3f7cbf3ec062071e94f5c1e66e50b (patch)
tree2a7e8b53757b499b0b08d235cfe58e9505ca4aa3 /k3bsetup
parent08e6e3d01bc56d3b55c1512164f48d3db762bd53 (diff)
downloadk3b-bba095a5aab3f7cbf3ec062071e94f5c1e66e50b.tar.gz
k3b-bba095a5aab3f7cbf3ec062071e94f5c1e66e50b.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'k3bsetup')
-rw-r--r--k3bsetup/base_k3bsetup2.ui4
-rw-r--r--k3bsetup/k3bsetup2.cpp2
2 files changed, 3 insertions, 3 deletions
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>