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 /libkpimidentities/identitymanager.cpp | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkpimidentities/identitymanager.cpp')
| -rw-r--r-- | libkpimidentities/identitymanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 44cabc04..c7b97216 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/libkpimidentities/identitymanager.cpp @@ -41,9 +41,9 @@ static const char configKeyDefaultIdentity[] = "Default Identity"; #include "identity.h" // for IdentityList::{export,import}Data #include <libemailfunctions/email.h> // for static helper functions -#include <kemailsettings.h> // for IdentityEntry::fromControlCenter() +#include <tdeemailsettings.h> // for IdentityEntry::fromControlCenter() #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <kuser.h> |