diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:44:58 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:44:58 -0600 |
commit | 281d226f744d70a826a3bffff1ee964ef5915d4f (patch) | |
tree | c42d5ae7840ea2a74f5f6c1b1a958569a8d2bf27 /libk3b/projects/datacd | |
parent | e8585949197fd7b5423328b0aeb8cceffa18f0db (diff) | |
download | k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.tar.gz k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/projects/datacd')
-rw-r--r-- | libk3b/projects/datacd/k3bbootitem.cpp | 2 | ||||
-rw-r--r-- | libk3b/projects/datacd/k3bdatadoc.cpp | 6 | ||||
-rw-r--r-- | libk3b/projects/datacd/k3bdatajob.cpp | 4 | ||||
-rw-r--r-- | libk3b/projects/datacd/k3bdatapreparationjob.cpp | 2 | ||||
-rw-r--r-- | libk3b/projects/datacd/k3bisoimager.cpp | 4 | ||||
-rw-r--r-- | libk3b/projects/datacd/k3bisooptions.cpp | 2 | ||||
-rw-r--r-- | libk3b/projects/datacd/k3bmkisofshandler.cpp | 2 | ||||
-rw-r--r-- | libk3b/projects/datacd/k3bmsinfofetcher.cpp | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/libk3b/projects/datacd/k3bbootitem.cpp b/libk3b/projects/datacd/k3bbootitem.cpp index f5a8725..768ca92 100644 --- a/libk3b/projects/datacd/k3bbootitem.cpp +++ b/libk3b/projects/datacd/k3bbootitem.cpp @@ -17,7 +17,7 @@ #include "k3bdatadoc.h" #include "k3bdiritem.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqptrlist.h> diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index c0d1aa6..debc574 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -46,11 +46,11 @@ #include <kstandarddirs.h> #include <kurl.h> #include <kstatusbar.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprogress.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index d3f6049..356ab17 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -37,9 +37,9 @@ #include <kprocess.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/global.h> #include <tdeio/job.h> diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp index 26a2b5b..a6b9e88 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp +++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp @@ -23,7 +23,7 @@ #include <k3bfileitem.h> #include <k3bglobals.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstringhandler.h> #include <tqfile.h> diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index 6420023..2f750c5 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -32,8 +32,8 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> #include <tdeio/global.h> #include <tdeio/job.h> diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp index bd5167e..88f7d82 100644 --- a/libk3b/projects/datacd/k3bisooptions.cpp +++ b/libk3b/projects/datacd/k3bisooptions.cpp @@ -19,7 +19,7 @@ #include <k3bglobals.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> diff --git a/libk3b/projects/datacd/k3bmkisofshandler.cpp b/libk3b/projects/datacd/k3bmkisofshandler.cpp index 7b3270c..d367ccc 100644 --- a/libk3b/projects/datacd/k3bmkisofshandler.cpp +++ b/libk3b/projects/datacd/k3bmkisofshandler.cpp @@ -20,7 +20,7 @@ #include <k3bjob.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <cmath> diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index e81c98b..cfbe58b 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp +++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp @@ -23,7 +23,7 @@ #include <k3bglobals.h> #include <k3biso9660.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kdebug.h> |