From cfb328d59024a251690b6e47c9f8d343fd8c241c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:38 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 libkpimidentities/identity.cpp        | 4 ++--
 libkpimidentities/identitycombo.cpp   | 2 +-
 libkpimidentities/identitymanager.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'libkpimidentities')

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>
-- 
cgit v1.2.1