diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
| commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
| tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /kmail/kmreaderwin.cpp | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmail/kmreaderwin.cpp')
| -rw-r--r-- | kmail/kmreaderwin.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 9d8db6c9f..fc93be5e4 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -77,8 +77,8 @@ using KMail::TeeHtmlWriter; #include <kleo/cryptobackendfactory.h> // KABC includes -#include <kabc/addressee.h> -#include <kabc/vcardconverter.h> +#include <tdeabc/addressee.h> +#include <tdeabc/vcardconverter.h> // tdehtml headers #include <tdehtml_part.h> @@ -98,11 +98,11 @@ using KMail::TeeHtmlWriter; #include <kcursor.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeglobalsettings.h> #include <krun.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include <kdialog.h> #include <tdeaction.h> |