From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:43:14 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kioslave/media/medianotifier/medianotifier.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kioslave/media/medianotifier')

diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp
index d02f1c4b5..94ee0e8c2 100644
--- a/kioslave/media/medianotifier/medianotifier.cpp
+++ b/kioslave/media/medianotifier/medianotifier.cpp
@@ -199,7 +199,7 @@ bool MediaNotifier::execAutorun( const KFileItem &medium, const TQString &path,
 		// confirmed its execution the autostart file MUST be executed
 		// with the current working directory ( CWD ) set to the root
 		// directory of the medium.
-		KProcess proc;
+		TDEProcess proc;
 		proc << "sh" << autorunFile;
 		proc.setWorkingDirectory( path );
 		proc.start();
@@ -313,7 +313,7 @@ extern "C"
 {
 	KDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name)
 	{
-		KGlobal::locale()->insertCatalogue("kay");
+		TDEGlobal::locale()->insertCatalogue("kay");
 		return new MediaNotifier(name);
 	}
 }
-- 
cgit v1.2.1