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/remote/kdedmodule/remotedirnotify.cpp       | 4 ++--
 tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp | 4 ++--
 tdeioslave/remote/remoteimpl.cpp                       | 4 ++--
 tdeioslave/remote/tdeio_remote.cpp                     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tdeioslave/remote')

diff --git a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
index 7ed66ce06..5b042295d 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
+++ b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp
@@ -19,8 +19,8 @@
 #include "remotedirnotify.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 
diff --git a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
index 04b7a2bee..a93ec7eae 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
+++ b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp
@@ -19,8 +19,8 @@
 #include "remotedirnotifymodule.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj)
 	: KDEDModule(obj)
diff --git a/tdeioslave/remote/remoteimpl.cpp b/tdeioslave/remote/remoteimpl.cpp
index d977781ea..a0f37b624 100644
--- a/tdeioslave/remote/remoteimpl.cpp
+++ b/tdeioslave/remote/remoteimpl.cpp
@@ -20,11 +20,11 @@
 #include "remoteimpl.h"
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdir.h>
 #include <tqfile.h>
diff --git a/tdeioslave/remote/tdeio_remote.cpp b/tdeioslave/remote/tdeio_remote.cpp
index 5cbbb8717..b5350b7e2 100644
--- a/tdeioslave/remote/tdeio_remote.cpp
+++ b/tdeioslave/remote/tdeio_remote.cpp
@@ -20,11 +20,11 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 #include "tdeio_remote.h"
-- 
cgit v1.2.1