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/sftp/ksshprocess.cpp | 2 +-
 tdeioslave/sftp/tdeio_sftp.cpp  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tdeioslave/sftp')

diff --git a/tdeioslave/sftp/ksshprocess.cpp b/tdeioslave/sftp/ksshprocess.cpp
index 678806605..0f19126d2 100644
--- a/tdeioslave/sftp/ksshprocess.cpp
+++ b/tdeioslave/sftp/ksshprocess.cpp
@@ -66,7 +66,7 @@
 #endif
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 /*
diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp
index 2af66f04f..1e529363c 100644
--- a/tdeioslave/sftp/tdeio_sftp.cpp
+++ b/tdeioslave/sftp/tdeio_sftp.cpp
@@ -55,11 +55,11 @@ So we can't connect.
 #include <tdeapplication.h>
 #include <kuser.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/ioslave_defaults.h>
 #include <kmimetype.h>
-- 
cgit v1.2.1