diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:50 -0600 |
| commit | b363d2579af0a11b77e698aed2e1021c2233b644 (patch) | |
| tree | f4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /plugins/kmail | |
| parent | 61bddfe3a7226b18c68a76124b727c736f431688 (diff) | |
| download | tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'plugins/kmail')
| -rw-r--r-- | plugins/kmail/bodypartformatter/text_calendar.cpp | 2 | ||||
| -rw-r--r-- | plugins/kmail/bodypartformatter/text_vcard.cpp | 4 | ||||
| -rw-r--r-- | plugins/kmail/bodypartformatter/text_xdiff.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 843c01f1..1cb2a8f5 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 769a4d8e..ce6d38a3 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 9da709b5..c5c57764 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;\""); |