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

---
 kbugbuster/tderesources/kcalresource.cpp        | 4 ++--
 kbugbuster/tderesources/kcalresource_plugin.cpp | 4 ++--
 kbugbuster/tderesources/kcalresourceconfig.cpp  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kbugbuster/tderesources')

diff --git a/kbugbuster/tderesources/kcalresource.cpp b/kbugbuster/tderesources/kcalresource.cpp
index 1eb04c9c..0e59e55e 100644
--- a/kbugbuster/tderesources/kcalresource.cpp
+++ b/kbugbuster/tderesources/kcalresource.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <vcaldrag.h>
@@ -42,7 +42,7 @@
 #include <journal.h>
 #include <filestorage.h>
 
-#include <kabc/locknull.h>
+#include <tdeabc/locknull.h>
 
 #include <tderesources/configwidget.h>
 
diff --git a/kbugbuster/tderesources/kcalresource_plugin.cpp b/kbugbuster/tderesources/kcalresource_plugin.cpp
index 7cf81289..d9f33ec9 100644
--- a/kbugbuster/tderesources/kcalresource_plugin.cpp
+++ b/kbugbuster/tderesources/kcalresource_plugin.cpp
@@ -22,8 +22,8 @@
 #include "kcalresourceconfig.h"
 #include "kcalresource.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KCal;
 
diff --git a/kbugbuster/tderesources/kcalresourceconfig.cpp b/kbugbuster/tderesources/kcalresourceconfig.cpp
index 58466642..d3f37a55 100644
--- a/kbugbuster/tderesources/kcalresourceconfig.cpp
+++ b/kbugbuster/tderesources/kcalresourceconfig.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
-- 
cgit v1.2.1