summaryrefslogtreecommitdiffstats
path: root/tdeioslave/smtp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdeioslave/smtp
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/smtp')
-rw-r--r--tdeioslave/smtp/command.cc2
-rw-r--r--tdeioslave/smtp/response.cc2
-rw-r--r--tdeioslave/smtp/smtp.cc4
-rw-r--r--tdeioslave/smtp/transactionstate.cc2
4 files changed, 5 insertions, 5 deletions
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>