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

---
 kontact_plugin/basket_plugin.cpp    | 2 +-
 kontact_plugin/basket_plugin.h      | 2 +-
 kontact_plugin/uniqueapphandler.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kontact_plugin')

diff --git a/kontact_plugin/basket_plugin.cpp b/kontact_plugin/basket_plugin.cpp
index 8260062..95a6601 100644
--- a/kontact_plugin/basket_plugin.cpp
+++ b/kontact_plugin/basket_plugin.cpp
@@ -21,7 +21,7 @@
 #include <kgenericfactory.h>
 #include <tdeparts/componentfactory.h>
 #include <kontact/core.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <dcopref.h>
 #include "basketdcopiface_stub.h"
diff --git a/kontact_plugin/basket_plugin.h b/kontact_plugin/basket_plugin.h
index 4980318..b45d389 100644
--- a/kontact_plugin/basket_plugin.h
+++ b/kontact_plugin/basket_plugin.h
@@ -21,7 +21,7 @@
 #ifndef BASKET_PLUGIN_H
 #define BASKET_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kontact/plugin.h>
 #include "uniqueapphandler.h"
diff --git a/kontact_plugin/uniqueapphandler.cpp b/kontact_plugin/uniqueapphandler.cpp
index 7f92d18..77d5bdf 100644
--- a/kontact_plugin/uniqueapphandler.cpp
+++ b/kontact_plugin/uniqueapphandler.cpp
@@ -20,7 +20,7 @@
 */
 
 #include "uniqueapphandler.h"
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kontact/core.h>
-- 
cgit v1.2.1