From 281d226f744d70a826a3bffff1ee964ef5915d4f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:44:58 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 libk3b/jobs/k3baudiocuefilewritingjob.cpp         | 2 +-
 libk3b/jobs/k3baudiosessionreadingjob.cpp         | 2 +-
 libk3b/jobs/k3bbinimagewritingjob.cpp             | 2 +-
 libk3b/jobs/k3bblankingjob.cpp                    | 2 +-
 libk3b/jobs/k3bcdcopyjob.cpp                      | 4 ++--
 libk3b/jobs/k3bcdda2wavreader.cpp                 | 2 +-
 libk3b/jobs/k3bclonejob.cpp                       | 2 +-
 libk3b/jobs/k3bdatatrackreader.cpp                | 2 +-
 libk3b/jobs/k3bdvdcopyjob.cpp                     | 2 +-
 libk3b/jobs/k3bdvdformattingjob.cpp               | 2 +-
 libk3b/jobs/k3biso9660imagewritingjob.cpp         | 4 ++--
 libk3b/jobs/k3breadcdreader.cpp                   | 2 +-
 libk3b/jobs/k3bverificationjob.cpp                | 2 +-
 libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp | 2 +-
 libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp    | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'libk3b/jobs')

diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
index c0c07d5..62860d8 100644
--- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp
+++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
@@ -26,7 +26,7 @@
 #include <k3bthreadjob.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class K3bAudioCueFileWritingJob::AnalyserThread : public K3bThread
diff --git a/libk3b/jobs/k3baudiosessionreadingjob.cpp b/libk3b/jobs/k3baudiosessionreadingjob.cpp
index f85e138..1af528b 100644
--- a/libk3b/jobs/k3baudiosessionreadingjob.cpp
+++ b/libk3b/jobs/k3baudiosessionreadingjob.cpp
@@ -24,7 +24,7 @@
 #include <k3bcore.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <unistd.h>
 
diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp
index 1ba15ce..4f9f103 100644
--- a/libk3b/jobs/k3bbinimagewritingjob.cpp
+++ b/libk3b/jobs/k3bbinimagewritingjob.cpp
@@ -22,7 +22,7 @@
 #include <k3bglobals.h>
 #include <k3bexternalbinmanager.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp
index d023b58..4d8212e 100644
--- a/libk3b/jobs/k3bblankingjob.cpp
+++ b/libk3b/jobs/k3bblankingjob.cpp
@@ -22,7 +22,7 @@
 #include <k3bdevicehandler.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <kdebug.h>
diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp
index 91bcbcc..d60228f 100644
--- a/libk3b/jobs/k3bcdcopyjob.cpp
+++ b/libk3b/jobs/k3bcdcopyjob.cpp
@@ -35,9 +35,9 @@
 
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <tdeio/global.h>
diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp
index 889993b..393a13c 100644
--- a/libk3b/jobs/k3bcdda2wavreader.cpp
+++ b/libk3b/jobs/k3bcdda2wavreader.cpp
@@ -22,7 +22,7 @@
 #include <k3bprocess.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqvaluevector.h>
 #include <tqregexp.h>
diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp
index d11ebaa..aa3230e 100644
--- a/libk3b/jobs/k3bclonejob.cpp
+++ b/libk3b/jobs/k3bclonejob.cpp
@@ -25,7 +25,7 @@
 #include <k3bclonetocreader.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp
index 873a1b8..fc74e46 100644
--- a/libk3b/jobs/k3bdatatrackreader.cpp
+++ b/libk3b/jobs/k3bdatatrackreader.cpp
@@ -22,7 +22,7 @@
 #include <k3bthread.h>
 #include <k3bcore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfile.h>
diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp
index 343f413..69eb8d5 100644
--- a/libk3b/jobs/k3bdvdcopyjob.cpp
+++ b/libk3b/jobs/k3bdvdcopyjob.cpp
@@ -33,7 +33,7 @@
 #include <k3bverificationjob.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 
 #include <tqfile.h>
diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp
index e0d177f..29a17ee 100644
--- a/libk3b/jobs/k3bdvdformattingjob.cpp
+++ b/libk3b/jobs/k3bdvdformattingjob.cpp
@@ -26,7 +26,7 @@
 #include <k3bversion.h>
 #include <k3bglobalsettings.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqvaluelist.h>
diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp
index 59a07c9..5d3ef9b 100644
--- a/libk3b/jobs/k3biso9660imagewritingjob.cpp
+++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp
@@ -32,8 +32,8 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tdeio/global.h>
 
 #include <tqstring.h>
diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp
index afb9c9d..8f7ef80 100644
--- a/libk3b/jobs/k3breadcdreader.cpp
+++ b/libk3b/jobs/k3breadcdreader.cpp
@@ -25,7 +25,7 @@
 #include <k3bglobals.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <tqregexp.h>
diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp
index b66ac89..3555692 100644
--- a/libk3b/jobs/k3bverificationjob.cpp
+++ b/libk3b/jobs/k3bverificationjob.cpp
@@ -24,7 +24,7 @@
 #include <k3biso9660.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
index 67832b9..ddefaca 100644
--- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
@@ -20,7 +20,7 @@
 #include <k3bcore.h>
 #include <k3bglobals.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
index a0a2f05..06f6e30 100644
--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
@@ -20,7 +20,7 @@
 #include <k3bcore.h>
 #include <k3bglobals.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
-- 
cgit v1.2.1