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

---
 kontact/plugins/summary/kcmkontactsummary.cpp | 2 +-
 kontact/plugins/summary/summaryview_part.cpp  | 8 ++++----
 kontact/plugins/summary/summaryview_plugin.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kontact/plugins/summary')

diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 8b2999f4d..3877827d2 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -28,7 +28,7 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <plugin.h>
 #include <kplugininfo.h>
 #include <ktrader.h>
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 4ba14d2eb..b55256839 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -33,14 +33,14 @@
 #include <kdcopservicestarter.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <ktrader.h>
 #include <kstandarddirs.h>
 #include <tqscrollview.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcmultidialog.h>
 
 #include <tdeparts/componentfactory.h>
diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h
index ad14ce2ec..08055ba48 100644
--- a/kontact/plugins/summary/summaryview_plugin.h
+++ b/kontact/plugins/summary/summaryview_plugin.h
@@ -23,7 +23,7 @@
 #define SUMMARYVIEW_PLUGIN_H
 #include "plugin.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include <tqmap.h>
-- 
cgit v1.2.1