Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

3 files changed, 6 insertions, 6 deletions

diff --git a/kioslave/trash/kfile-plugin/kfile_trash.cpp b/kioslave/trash/kfile-plugin/kfile_trash.cpp
index edd57014d..182d9c40e 100644
--- a/kioslave/trash/kfile-plugin/kfile_trash.cpp
+++ b/kioslave/trash/kfile-plugin/kfile_trash.cpp
@@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY(kfile_trash, TrashFactory("kfile_trash"))
 KTrashPlugin::KTrashPlugin(TQObject *parent, const char *name,
         const TQStringList &args) : KFilePlugin(parent, name, args)
 {
-    KGlobal::locale()->insertCatalogue( "kio_trash" );
+    TDEGlobal::locale()->insertCatalogue( "kio_trash" );
 
     kdDebug(7034) << "Trash file meta info plugin\n";
 
diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp
index d1efdf2cd..ef255e91d 100644
--- a/kioslave/trash/testtrash.cpp
+++ b/kioslave/trash/testtrash.cpp
@@ -135,7 +135,7 @@ static void removeDir( const TQString& trashDir, const TQString& dirName )
 
 void TestTrash::setup()
 {
-    m_trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash";
+    m_trashDir = TDEGlobal::dirs()->localxdgdatadir() + "Trash";
     kdDebug() << "setup: using trash directory " << m_trashDir << endl;
 
     // Look for another writable partition than $HOME (not mandatory)
@@ -380,7 +380,7 @@ static void checkInfoFile( const TQString& infoPath, const TQString& origFilePat
     infoFile.setGroup( "Trash Info" );
     const TQString origPath = infoFile.readEntry( "Path" );
     assert( !origPath.isEmpty() );
-    assert( origPath == KURL::encode_string( origFilePath, KGlobal::locale()->fileEncodingMib() ) );
+    assert( origPath == KURL::encode_string( origFilePath, TDEGlobal::locale()->fileEncodingMib() ) );
     const TQString date = infoFile.readEntry( "DeletionDate" );
     assert( !date.isEmpty() );
     assert( date.contains( "T" ) );
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 );