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

---
 tdeioslave/man/kmanpart.cpp       | 4 ++--
 tdeioslave/man/tdeio_man.cpp      | 4 ++--
 tdeioslave/man/tdeio_man_test.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tdeioslave/man')

diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp
index 09cc0251e..556b287e4 100644
--- a/tdeioslave/man/kmanpart.cpp
+++ b/tdeioslave/man/kmanpart.cpp
@@ -21,9 +21,9 @@
 #include <tqstring.h>
 
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 #include <tdeversion.h>
diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp
index 032de3ecf..7412077c5 100644
--- a/tdeioslave/man/tdeio_man.cpp
+++ b/tdeioslave/man/tdeio_man.cpp
@@ -33,10 +33,10 @@
 
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 
 #include "tdeio_man.h"
diff --git a/tdeioslave/man/tdeio_man_test.cpp b/tdeioslave/man/tdeio_man_test.cpp
index d409570b4..131e03541 100644
--- a/tdeioslave/man/tdeio_man_test.cpp
+++ b/tdeioslave/man/tdeio_man_test.cpp
@@ -6,7 +6,7 @@
 
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class tdeio_man_test : public  MANProtocol
-- 
cgit v1.2.1