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/componentchooser/componentchooser.cpp     | 6 +++---
 kcontrol/componentchooser/kcm_componentchooser.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/componentchooser')

diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index b650cff2e..9de1a1a7b 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -28,10 +28,10 @@
 #include <dcopclient.h>
 
 #include <tdeapplication.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 #include <kipc.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kopenwith.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp
index c1c5728e4..30750bdd5 100644
--- a/kcontrol/componentchooser/kcm_componentchooser.cpp
+++ b/kcontrol/componentchooser/kcm_componentchooser.cpp
@@ -16,7 +16,7 @@
 #include <tqlayout.h>
 
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kcm_componentchooser.h"
 #include "kcm_componentchooser.moc"
-- 
cgit v1.2.1