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

---
 tderesources/scalix/shared/kmailconnection.cpp    | 2 +-
 tderesources/scalix/shared/resourcescalixbase.cpp | 6 +++---
 tderesources/scalix/shared/scalixbase.cpp         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tderesources/scalix/shared')

diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp
index 57f2f4489..147b9822a 100644
--- a/tderesources/scalix/shared/kmailconnection.cpp
+++ b/tderesources/scalix/shared/kmailconnection.cpp
@@ -37,7 +37,7 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kdcopservicestarter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kmailicalIface_stub.h"
 
diff --git a/tderesources/scalix/shared/resourcescalixbase.cpp b/tderesources/scalix/shared/resourcescalixbase.cpp
index 1f829a79d..6108230c0 100644
--- a/tderesources/scalix/shared/resourcescalixbase.cpp
+++ b/tderesources/scalix/shared/resourcescalixbase.cpp
@@ -35,12 +35,12 @@
 
 #include <folderselectdialog.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kinputdialog.h>
 #include <kurl.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 #include <tqtextstream.h>
 #include <kdebug.h>
 
diff --git a/tderesources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp
index d40bdb03f..3cdf16c0b 100644
--- a/tderesources/scalix/shared/scalixbase.cpp
+++ b/tderesources/scalix/shared/scalixbase.cpp
@@ -32,7 +32,7 @@
 
 #include "scalixbase.h"
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <libkcal/journal.h>
 #include <libtdepim/kpimprefs.h>
 #include <kdebug.h>
-- 
cgit v1.2.1