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/fonts/fonts.cpp      | 4 ++--
 kcontrol/fonts/kxftconfig.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kcontrol/fonts')

diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 3f202c020..2489b80c6 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <kipc.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kprocio.h>
 #include <ksimpleconfig.h>
@@ -522,7 +522,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &)
 
   TQValueList<TQFont> defaultFontList;
 
-  // Keep in sync with tdelibs/tdecore/kglobalsettings.cpp
+  // Keep in sync with tdelibs/tdecore/tdeglobalsettings.cpp
 
   TQFont f0("Sans Serif", 10);
   TQFont f1("Monospace", 10);
diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp
index 124d33d2f..459c7b88a 100644
--- a/kcontrol/fonts/kxftconfig.cpp
+++ b/kcontrol/fonts/kxftconfig.cpp
@@ -26,7 +26,7 @@
 #include <tqregexp.h>
 #include <tqfile.h>
 #include <tqpaintdevice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klargefile.h>
 #include <tqdir.h>
 #include <tqsettings.h>
-- 
cgit v1.2.1