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/projects/videocd/k3bvcddoc.cpp            | 4 ++--
 libk3b/projects/videocd/k3bvcdjob.cpp            | 4 ++--
 libk3b/projects/videocd/k3bvcdoptions.cpp        | 2 +-
 libk3b/projects/videocd/k3bvcdtrack.cpp          | 2 +-
 libk3b/projects/videocd/k3bvcdxmlview.h          | 2 +-
 libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'libk3b/projects/videocd')

diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index e052a6c..eb40f16 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -27,9 +27,9 @@
 #include <kprocess.h>
 #include <kurl.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/global.h>
 #include <kdebug.h>
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index e4ea8ee..d16e7e0 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -13,11 +13,11 @@
 * See the file "COPYING" for the exact licensing terms.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/global.h>
 
 #include <tqstring.h>
diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp
index 0beaaa7..b0d60cf 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.cpp
+++ b/libk3b/projects/videocd/k3bvcdoptions.cpp
@@ -17,7 +17,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <k3bcore.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // TQt Includes
diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp
index b736af1..2e92c4f 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.cpp
+++ b/libk3b/projects/videocd/k3bvcdtrack.cpp
@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // K3b Includes
 #include "k3bvcdtrack.h"
diff --git a/libk3b/projects/videocd/k3bvcdxmlview.h b/libk3b/projects/videocd/k3bvcdxmlview.h
index 6368dec..aa1a189 100644
--- a/libk3b/projects/videocd/k3bvcdxmlview.h
+++ b/libk3b/projects/videocd/k3bvcdxmlview.h
@@ -19,7 +19,7 @@
 
 #include <tqstring.h>
 #include <tqdom.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <k3bvcddoc.h>
 
diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
index 6192024..a4550f2 100644
--- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
+++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
@@ -14,7 +14,7 @@
 */
 
 // kde includes
-#include <klocale.h>
+#include <tdelocale.h>
 
 // k3b includes
 #include "k3bmpeginfo.h"
-- 
cgit v1.2.3