From d318087925a540a204c9d3820d5a09fbda58b8b2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:21:55 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

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

(limited to 'kontact/plugins/summary')

diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index 75cd79821..3f1cdd69e 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.h
@@ -26,7 +26,7 @@
 #define KCMKONTACTSUMMARY_H
 
 #include <tdecmodule.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KPluginInfo;
 
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 335651cbd..41ef1eec8 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdcopservicestarter.h>
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 21c3a24c5..23e2ff8a2 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -25,7 +25,7 @@
 #include <kgenericfactory.h>
 #include <tdeparts/componentfactory.h>
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <tqpopupmenu.h>
 
-- 
cgit v1.2.1