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/trash/trashimpl.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kioslave/trash/trashimpl.cpp')

diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp
index 081cc9ef0..96888f9d5 100644
--- a/kioslave/trash/trashimpl.cpp
+++ b/kioslave/trash/trashimpl.cpp
@@ -56,7 +56,7 @@ TrashImpl::TrashImpl() :
     m_lastId( 0 ),
     m_homeDevice( 0 ),
     m_trashDirectoriesScanned( false ),
-    m_mibEnum( KGlobal::locale()->fileEncodingMib() ),
+    m_mibEnum( TDEGlobal::locale()->fileEncodingMib() ),
     // not using kio_trashrc since KIO uses that one already for kio_trash
     // so better have a separate one, for faster parsing by e.g. kmimetype.cpp
     m_config( "trashrc" )
@@ -132,7 +132,7 @@ bool TrashImpl::init()
     // see also kdesktop/init.cc for first time initialization
     m_initStatus = InitError;
     // $XDG_DATA_HOME/Trash, i.e. ~/.local/share/Trash by default.
-    const TQString xdgDataDir = KGlobal::dirs()->localxdgdatadir();
+    const TQString xdgDataDir = TDEGlobal::dirs()->localxdgdatadir();
     if ( !KStandardDirs::makeDir( xdgDataDir, 0700 ) ) {
         kdWarning() << "failed to create " << xdgDataDir << endl;
         return false;
@@ -161,7 +161,7 @@ bool TrashImpl::init()
 void TrashImpl::migrateOldTrash()
 {
     kdDebug() << k_funcinfo << endl;
-    const TQString oldTrashDir = KGlobalSettings::trashPath();
+    const TQString oldTrashDir = TDEGlobalSettings::trashPath();
     const TQStrList entries = listDir( oldTrashDir );
     bool allOK = true;
     TQStrListIterator entryIt( entries );
-- 
cgit v1.2.1