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

---
 tdeioslave/smtp/command.cc          | 2 +-
 tdeioslave/smtp/response.cc         | 2 +-
 tdeioslave/smtp/smtp.cc             | 4 ++--
 tdeioslave/smtp/transactionstate.cc | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tdeioslave/smtp')

diff --git a/tdeioslave/smtp/command.cc b/tdeioslave/smtp/command.cc
index 8543f6c03..eaab13fbd 100644
--- a/tdeioslave/smtp/command.cc
+++ b/tdeioslave/smtp/command.cc
@@ -38,7 +38,7 @@
 #include "transactionstate.h"
 
 #include <kidna.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <tdeio/slavebase.h> // for test_commands, where SMTPProtocol is not derived from TCPSlaveBase
diff --git a/tdeioslave/smtp/response.cc b/tdeioslave/smtp/response.cc
index 6c29d31bf..b630051de 100644
--- a/tdeioslave/smtp/response.cc
+++ b/tdeioslave/smtp/response.cc
@@ -33,7 +33,7 @@
 
 #include "response.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 
 #include <tqstring.h>
diff --git a/tdeioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cc
index 3dfb8a053..43c15ecd2 100644
--- a/tdeioslave/smtp/smtp.cc
+++ b/tdeioslave/smtp/smtp.cc
@@ -53,13 +53,13 @@ using KioSMTP::Request;
 using KioSMTP::Response;
 using KioSMTP::TransactionState;
 
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 #include <ksock.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <tdeio/connection.h>
 #include <tdeio/slaveinterface.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/tdeioslave/smtp/transactionstate.cc b/tdeioslave/smtp/transactionstate.cc
index 71a3e682c..58e5adf51 100644
--- a/tdeioslave/smtp/transactionstate.cc
+++ b/tdeioslave/smtp/transactionstate.cc
@@ -34,7 +34,7 @@
 #include "transactionstate.h"
 
 #include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstringlist.h>
 
-- 
cgit v1.2.1