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

---
 libk3b/core/k3bglobals.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'libk3b/core/k3bglobals.cpp')

diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index c01e289..23225b6 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -177,7 +177,7 @@ TQString K3b::defaultTempPath()
 {
   TQString oldGroup = kapp->config()->group();
   kapp->config()->setGroup( "General Options" );
-  TQString url = kapp->config()->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() );
+  TQString url = kapp->config()->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() );
   kapp->config()->setGroup( oldGroup );
   return prepareDir(url);
 }
@@ -560,11 +560,11 @@ bool K3b::unmount( K3bDevice::Device* dev )
 
   TQString umountBin = K3b::findExe( "umount" );
   if( !umountBin.isEmpty() ) {
-    KProcess p;
+    TDEProcess p;
     p << umountBin;
     p << "-l"; // lazy unmount
     p << dev->blockDeviceName();
-    p.start( KProcess::Block );
+    p.start( TDEProcess::Block );
     if( !p.exitStatus() )
       return true;
   }
@@ -572,11 +572,11 @@ bool K3b::unmount( K3bDevice::Device* dev )
   // now try pmount
   TQString pumountBin = K3b::findExe( "pumount" );
   if( !pumountBin.isEmpty() ) {
-    KProcess p;
+    TDEProcess p;
     p << pumountBin;
     p << "-l"; // lazy unmount
     p << dev->blockDeviceName();
-    p.start( KProcess::Block );
+    p.start( TDEProcess::Block );
     return !p.exitStatus();
   }
   else {
@@ -610,10 +610,10 @@ bool K3b::mount( K3bDevice::Device* dev )
   // now try pmount
   TQString pmountBin = K3b::findExe( "pmount" );
   if( !pmountBin.isEmpty() ) {
-    KProcess p;
+    TDEProcess p;
     p << pmountBin;
     p << mntDev;
-    p.start( KProcess::Block );
+    p.start( TDEProcess::Block );
     return !p.exitStatus();
   }
   return false;
-- 
cgit v1.2.3