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/konsole/kcmkonsole.cpp    | 2 +-
 kcontrol/konsole/schemaeditor.cpp  | 4 ++--
 kcontrol/konsole/sessioneditor.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kcontrol/konsole')

diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 97eeb6d42..cdda274ba 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdefontdialog.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "schemaeditor.h"
 #include "sessioneditor.h"
diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp
index 0594e7d9d..66b07e59f 100644
--- a/kcontrol/konsole/schemaeditor.cpp
+++ b/kcontrol/konsole/schemaeditor.cpp
@@ -34,11 +34,11 @@
 //#include <errno.h>
 
 #include <tqslider.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <tqtoolbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksharedpixmap.h>
 #include <kimageeffect.h>
 #include <tqimage.h>
diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp
index d0f4f822a..86c9dd825 100644
--- a/kcontrol/konsole/sessioneditor.cpp
+++ b/kcontrol/konsole/sessioneditor.cpp
@@ -23,11 +23,11 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kicondialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kiconloader.h>
-- 
cgit v1.2.1