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

---
 korganizer/plugins/exchange/exchange.cpp       | 6 +++---
 korganizer/plugins/exchange/exchangeconfig.cpp | 4 ++--
 korganizer/plugins/exchange/exchangedialog.cpp | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'korganizer/plugins/exchange')

diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index e6695e53c..1adefd207 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -26,10 +26,10 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "korganizer/korganizer.h"
 #include "korganizer/calendarview.h"
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index 55710bcc8..106fc8672 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -23,9 +23,9 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <exchangeaccount.h>
 
diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp
index d998f37f3..e457de38a 100644
--- a/korganizer/plugins/exchange/exchangedialog.cpp
+++ b/korganizer/plugins/exchange/exchangedialog.cpp
@@ -21,10 +21,10 @@
 #include <tqlabel.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 
-- 
cgit v1.2.1