From bba095a5aab3f7cbf3ec062071e94f5c1e66e50b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:10:14 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- src/option/base_k3bcddboptiontab.ui | 4 ++-- src/option/base_k3bthemeoptiontab.ui | 2 +- src/option/k3bcddboptiontab.cpp | 2 +- src/option/k3bexternalbinoptiontab.cpp | 2 +- src/option/k3bexternalbinwidget.cpp | 2 +- src/option/k3bthemeoptiontab.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/option') diff --git a/src/option/base_k3bcddboptiontab.ui b/src/option/base_k3bcddboptiontab.ui index 507b846..0c15130 100644 --- a/src/option/base_k3bcddboptiontab.ui +++ b/src/option/base_k3bcddboptiontab.ui @@ -553,8 +553,8 @@ - klistview.h - klistview.h + tdelistview.h + tdelistview.h knuminput.h diff --git a/src/option/base_k3bthemeoptiontab.ui b/src/option/base_k3bthemeoptiontab.ui index daf0f18..f1eab04 100644 --- a/src/option/base_k3bthemeoptiontab.ui +++ b/src/option/base_k3bthemeoptiontab.ui @@ -203,6 +203,6 @@ - klistview.h + tdelistview.h diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index b944073..16a838d 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/option/k3bexternalbinoptiontab.cpp b/src/option/k3bexternalbinoptiontab.cpp index 762816a..d34b3a0 100644 --- a/src/option/k3bexternalbinoptiontab.cpp +++ b/src/option/k3bexternalbinoptiontab.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp index 13904e4..27c9f8f 100644 --- a/src/option/k3bexternalbinwidget.cpp +++ b/src/option/k3bexternalbinwidget.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp index b61c81b..515c4f0 100644 --- a/src/option/k3bthemeoptiontab.cpp +++ b/src/option/k3bthemeoptiontab.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.1