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

---
 plugins/kmail/bodypartformatter/text_calendar.cpp      | 2 +-
 plugins/kmail/bodypartformatter/text_vcard.cpp         | 2 +-
 plugins/kmail/bodypartformatter/ui_attendeeselector.ui | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 435f30836..17659a38d 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -72,7 +72,7 @@
 #include <ktempfile.h>
 #include <kmdcodec.h>
 #include <kmimetype.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <tdeio/netaccess.h>
 
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index fcc3a7076..959a7d2eb 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -53,7 +53,7 @@ using KMail::Interface::BodyPart;
 #include "interfaces/bodyparturlhandler.h"
 #include "tdehtmlparthtmlwriter.h"
 #include <tdeimproxy.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <kabc/vcardconverter.h>
 #include <kabc/addressee.h>
diff --git a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
index f719618ad..295812401 100644
--- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
+++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
@@ -82,7 +82,7 @@
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>libtdepim/addresseelineedit.h</includehint>
 </includehints>
 </UI>
-- 
cgit v1.2.1