From b363d2579af0a11b77e698aed2e1021c2233b644 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:17:50 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

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

(limited to 'plugins/kmail')

diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 843c01f1a..1cb2a8f59 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -36,7 +36,7 @@
 #include <interfaces/bodypartformatter.h>
 #include <interfaces/bodypart.h>
 #include <interfaces/bodyparturlhandler.h>
-#include <khtmlparthtmlwriter.h>
+#include <tdehtmlparthtmlwriter.h>
 
 #include <libtdepim/kfileio.h>
 
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 769a4d8e3..ce6d38a36 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -51,8 +51,8 @@
 #include "interfaces/bodypart.h"
 using KMail::Interface::BodyPart;
 #include "interfaces/bodyparturlhandler.h"
-#include "khtmlparthtmlwriter.h"
-#include <kimproxy.h>
+#include "tdehtmlparthtmlwriter.h"
+#include <tdeimproxy.h>
 #include <kpopupmenu.h>
 
 #include <kabc/vcardconverter.h>
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp
index 9da709b52..c5c577647 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.cpp
+++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp
@@ -32,7 +32,7 @@
 #include <interfaces/bodypartformatter.h>
 #include <interfaces/bodypart.h>
 #include <interfaces/bodyparturlhandler.h>
-#include <khtmlparthtmlwriter.h>
+#include <tdehtmlparthtmlwriter.h>
 
 #include <kmail/callback.h>
 #include <kmail/kmmessage.h>
@@ -85,7 +85,7 @@ namespace {
 
       TQString tableStyle = TQString::fromLatin1(
         "style=\""
-        "text-align: -khtml-auto; "
+        "text-align: -tdehtml-auto; "
         "border: solid black 1px; "
         "padding: 0.5em; "
         "margin: 0em;\"");
-- 
cgit v1.2.1