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/system/kdedmodule/systemdirnotify.cpp       | 4 ++--
 tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp | 4 ++--
 tdeioslave/system/systemimpl.cpp                       | 2 +-
 tdeioslave/system/tdeio_system.cpp                     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tdeioslave/system')

diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
index bd27af597..e61a69f28 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotify.cpp
+++ b/tdeioslave/system/kdedmodule/systemdirnotify.cpp
@@ -19,8 +19,8 @@
 #include "systemdirnotify.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/system/kdedmodule/systemdirnotifymodule.cpp b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
index 9f9b422bd..ec95c0e32 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
+++ b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp
@@ -19,8 +19,8 @@
 #include "systemdirnotifymodule.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj)
 	: KDEDModule(obj)
diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
index 84f7c9866..2cd8226a5 100644
--- a/tdeioslave/system/systemimpl.cpp
+++ b/tdeioslave/system/systemimpl.cpp
@@ -20,7 +20,7 @@
 #include "systemimpl.h"
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 
diff --git a/tdeioslave/system/tdeio_system.cpp b/tdeioslave/system/tdeio_system.cpp
index 9f2d556ab..d904eda0d 100644
--- a/tdeioslave/system/tdeio_system.cpp
+++ b/tdeioslave/system/tdeio_system.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <dcopclient.h>
-- 
cgit v1.2.3