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/locale/klocalesample.cpp | 2 +-
 kcontrol/locale/localeother.cpp   | 2 +-
 kcontrol/locale/toplevel.cpp      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kcontrol/locale')

diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp
index 91c978a6d..9903965e8 100644
--- a/kcontrol/locale/klocalesample.cpp
+++ b/kcontrol/locale/klocalesample.cpp
@@ -31,7 +31,7 @@
 
 #include <stdio.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "klocalesample.h"
 #include "klocalesample.moc"
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 66b95e50c..6cb8e9a8d 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -27,7 +27,7 @@
 #include <tqprinter.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index e74330c30..a7a85e72f 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -32,7 +32,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kservice.h>
 
-- 
cgit v1.2.1