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/xfaceconfigurator.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/xfaceconfigurator.cpp')
| -rw-r--r-- | kmail/xfaceconfigurator.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index e35b2e0ec..e27b192ec 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -39,17 +39,17 @@ #include <kactivelabel.h> #include <kdialog.h> #include <tdefiledialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kimageio.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tdeio/netaccess.h> using namespace TDEIO; #include <kxface.h> using namespace KPIM; -#include <kabc/stdaddressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/addressee.h> using namespace KABC; #include <tqbitmap.h> |