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

---
 libk3bdevice/k3bdeviceglobals.cpp | 2 +-
 libk3bdevice/k3bdevicemanager.cpp | 2 +-
 libk3bdevice/k3bdiskinfo.cpp      | 2 +-
 libk3bdevice/k3bhalconnection.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'libk3bdevice')

diff --git a/libk3bdevice/k3bdeviceglobals.cpp b/libk3bdevice/k3bdeviceglobals.cpp
index 4d36916..f334724 100644
--- a/libk3bdevice/k3bdeviceglobals.cpp
+++ b/libk3bdevice/k3bdeviceglobals.cpp
@@ -17,7 +17,7 @@
 #include "k3bdiskinfo.h"
 #include "k3bdevice.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <k3bdebug.h>
 
 #include <tqstringlist.h>
diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp
index ab31a89..3677f67 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -32,7 +32,7 @@
 #include <kprocess.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <iostream>
 #include <limits.h>
diff --git a/libk3bdevice/k3bdiskinfo.cpp b/libk3bdevice/k3bdiskinfo.cpp
index 0709d28..0a67c6e 100644
--- a/libk3bdevice/k3bdiskinfo.cpp
+++ b/libk3bdevice/k3bdiskinfo.cpp
@@ -18,7 +18,7 @@
 
 #include <k3bmsf.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <k3bdebug.h>
 #include <tdeio/global.h>
 
diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp
index dbb19a3..ca12457 100644
--- a/libk3bdevice/k3bhalconnection.cpp
+++ b/libk3bdevice/k3bhalconnection.cpp
@@ -17,7 +17,7 @@
 #include "k3bdevice.h"
 
 #include <k3bdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtimer.h>
 
-- 
cgit v1.2.3