diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:10:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:10:14 -0600 |
| commit | bba095a5aab3f7cbf3ec062071e94f5c1e66e50b (patch) | |
| tree | 2a7e8b53757b499b0b08d235cfe58e9505ca4aa3 /src/option | |
| parent | 08e6e3d01bc56d3b55c1512164f48d3db762bd53 (diff) | |
| download | k3b-bba095a5aab3f7cbf3ec062071e94f5c1e66e50b.tar.gz k3b-bba095a5aab3f7cbf3ec062071e94f5c1e66e50b.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/option')
| -rw-r--r-- | src/option/base_k3bcddboptiontab.ui | 4 | ||||
| -rw-r--r-- | src/option/base_k3bthemeoptiontab.ui | 2 | ||||
| -rw-r--r-- | src/option/k3bcddboptiontab.cpp | 2 | ||||
| -rw-r--r-- | src/option/k3bexternalbinoptiontab.cpp | 2 | ||||
| -rw-r--r-- | src/option/k3bexternalbinwidget.cpp | 2 | ||||
| -rw-r--r-- | src/option/k3bthemeoptiontab.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
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 @@ </tabstops> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>knuminput.h</includehint> </includehints> </UI> 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 @@ </customwidgets> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> 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 <kdialog.h> #include <kiconloader.h> #include <krun.h> -#include <klistview.h> +#include <tdelistview.h> #include <klineedit.h> #include <klocale.h> #include <knuminput.h> 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 <kdialog.h> #include <klocale.h> #include <kiconloader.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqgroupbox.h> #include <tqlabel.h> 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 <kiconloader.h> #include <klocale.h> #include <keditlistbox.h> -#include <klistview.h> +#include <tdelistview.h> #include <kglobalsettings.h> #include <tdeversion.h> 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 <tdeconfig.h> #include <kmessagebox.h> #include <kurlrequester.h> -#include <klistview.h> +#include <tdelistview.h> #include <tdeio/global.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> |