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/lib/FcEngine.cpp   | 2 +-
 kcontrol/tdefontinst/lib/KfiConstants.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'kcontrol/tdefontinst/lib')

diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
index 8ac8f4fb4..ab89689d9 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
+++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
@@ -5,7 +5,7 @@
 #include <tqtextstream.h>
 #include <kurl.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeio/netaccess.h>
 #include <math.h>
 #include "FcEngine.h"
diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h
index d7f5ef03f..5e8633539 100644
--- a/kcontrol/tdefontinst/lib/KfiConstants.h
+++ b/kcontrol/tdefontinst/lib/KfiConstants.h
@@ -1,7 +1,7 @@
 #ifndef __KFI_CONSTANTS_H__
 #define __KFI_CONSTANTS_H__
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define KFI_CATALOGUE                "tdefontinst"
 
-- 
cgit v1.2.1