From 63f984a752aa6a6a73e3af795b05a5a042833eff Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:48:17 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 lib/kross/main/manager.cpp           | 2 +-
 lib/kross/main/scriptcontainer.cpp   | 2 +-
 lib/kross/main/scriptguiclient.cpp   | 4 ++--
 lib/kross/main/wdgscriptsmanager.cpp | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/kross/main')

diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp
index 21ee1eca..4ee5490d 100644
--- a/lib/kross/main/manager.cpp
+++ b/lib/kross/main/manager.cpp
@@ -33,7 +33,7 @@
 #include <tqregexp.h>
 
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 extern "C"
diff --git a/lib/kross/main/scriptcontainer.cpp b/lib/kross/main/scriptcontainer.cpp
index 7f7f980e..809d3b83 100644
--- a/lib/kross/main/scriptcontainer.cpp
+++ b/lib/kross/main/scriptcontainer.cpp
@@ -27,7 +27,7 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace Kross::Api;
 
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index 7b8fe2af..e96c4a90 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -26,9 +26,9 @@
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <ktar.h>
 #include <kstandarddirs.h>
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index ea870f95..8347c767 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -29,8 +29,8 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <tdetoolbar.h>
-- 
cgit v1.2.1