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/media/mediamanager/dialog.h               | 4 ++--
 tdeioslave/media/mediamanager/fstabbackend.cpp       | 2 +-
 tdeioslave/media/mediamanager/halbackend.cpp         | 6 +++---
 tdeioslave/media/mediamanager/mediamanager.cpp       | 4 ++--
 tdeioslave/media/mediamanager/removablebackend.cpp   | 2 +-
 tdeioslave/media/mediamanager/tdehardwarebackend.cpp | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tdeioslave/media/mediamanager')

diff --git a/tdeioslave/media/mediamanager/dialog.h b/tdeioslave/media/mediamanager/dialog.h
index dc1d552d8..6a164b8e8 100644
--- a/tdeioslave/media/mediamanager/dialog.h
+++ b/tdeioslave/media/mediamanager/dialog.h
@@ -23,8 +23,8 @@
 #ifndef DIALOG_H_
 #define DIALOG_H_
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 2f5bea220..84910352d 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
index e3c1b1985..a9db771b9 100644
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -24,17 +24,17 @@
 #include <locale.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqeventloop.h>
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
 #include <tqstylesheet.h>
 #include <kmountpoint.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index 295f4269a..9a4089ca5 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -22,8 +22,8 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <kdirnotify_stub.h>
 #include <kstandarddirs.h>
diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
index dc619701a..54df3d6f1 100644
--- a/tdeioslave/media/mediamanager/removablebackend.cpp
+++ b/tdeioslave/media/mediamanager/removablebackend.cpp
@@ -18,7 +18,7 @@
 
 #include "removablebackend.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdirwatch.h>
 #include <kurl.h>
 #include <kmountpoint.h>
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index 6ee284dc1..31481b6e8 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -23,14 +23,14 @@
 #include <tqeventloop.h>
 #include <tqstylesheet.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeio/job.h>
 #include <kprocess.h>
 #include <kmimetype.h>
 #include <kmountpoint.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kprotocolinfo.h>
 
-- 
cgit v1.2.1