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

---
 tderesources/blogging/kcal_resourceblogging_plugin.cpp | 4 ++--
 tderesources/blogging/kcal_resourcebloggingconfig.cpp  | 4 ++--
 tderesources/blogging/xmlrpcjob.cpp                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tderesources/blogging')

diff --git a/tderesources/blogging/kcal_resourceblogging_plugin.cpp b/tderesources/blogging/kcal_resourceblogging_plugin.cpp
index 4cc3dd8c..463df66e 100644
--- a/tderesources/blogging/kcal_resourceblogging_plugin.cpp
+++ b/tderesources/blogging/kcal_resourceblogging_plugin.cpp
@@ -22,8 +22,8 @@
 #include "kcal_resourceblogging.h"
 #include "kcal_resourcebloggingconfig.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KCal;
 
diff --git a/tderesources/blogging/kcal_resourcebloggingconfig.cpp b/tderesources/blogging/kcal_resourcebloggingconfig.cpp
index bd999ffe..c7e3e42f 100644
--- a/tderesources/blogging/kcal_resourcebloggingconfig.cpp
+++ b/tderesources/blogging/kcal_resourcebloggingconfig.cpp
@@ -20,8 +20,8 @@
 
 #include "kcal_resourcebloggingconfig.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 using namespace KCal;
 
diff --git a/tderesources/blogging/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp
index cb377e7e..cd9a0fa4 100644
--- a/tderesources/blogging/xmlrpcjob.cpp
+++ b/tderesources/blogging/xmlrpcjob.cpp
@@ -30,7 +30,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/http.h>
 #include <kmdcodec.h>
 #include <tdeio/davjob.h>
-- 
cgit v1.2.3