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 | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkpimidentities')
| -rw-r--r-- | libkpimidentities/identity.cpp | 4 | ||||
| -rw-r--r-- | libkpimidentities/identitycombo.cpp | 2 | ||||
| -rw-r--r-- | libkpimidentities/identitymanager.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp index 9b4c9df67..c43620ea3 100644 --- a/libkpimidentities/identity.cpp +++ b/libkpimidentities/identity.cpp @@ -12,8 +12,8 @@ #include <libtdepim/collectingprocess.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <kurl.h> diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp index 5ddc01975..adc79efd1 100644 --- a/libkpimidentities/identitycombo.cpp +++ b/libkpimidentities/identitycombo.cpp @@ -37,7 +37,7 @@ #include "identity.h" #include "identitymanager.h" -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index 44cabc047..c7b97216a 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> |