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

---
 kcontrol/tdefontinst/tdeio/KioFonts.cpp | 4 ++--
 kcontrol/tdefontinst/tdeio/KioFonts.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kcontrol/tdefontinst/tdeio')

diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
index f42d50c0b..949b0d4cb 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
@@ -51,14 +51,14 @@
 #include <tdeio/connection.h>
 #include <tqtextstream.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tqdir.h>
 #include <tqdatastream.h>
 #include <tqregexp.h>
 #include <kinstance.h>
 #include <klargefile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdesu/su.h>
 #include <kprocess.h>
 #include <kdebug.h>
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.h b/kcontrol/tdefontinst/tdeio/KioFonts.h
index ec8c69c4e..4f3c465d2 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.h
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.h
@@ -33,7 +33,7 @@
 #include <time.h>
 #include <tdeio/slavebase.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqcstring.h>
 #include <tqmap.h>
-- 
cgit v1.2.1