summaryrefslogtreecommitdiffstats
path: root/libk3b/core/k3bglobals.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-03-30 20:24:24 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-03-30 20:24:24 -0500
commit983ade75ae2f488477bbb796f52ce2135c202dfe (patch)
tree32fd2ad28d871b6f5f636ae5659391eac56665b5 /libk3b/core/k3bglobals.cpp
parent39728f666128bb7d8ab24c1e3835cf0ac3c1f092 (diff)
downloadk3b-983ade75ae2f488477bbb796f52ce2135c202dfe.tar.gz
k3b-983ade75ae2f488477bbb796f52ce2135c202dfe.zip
Use TDE hardware library instead of HAL when HAL is not available
Clean up spurious build files
Diffstat (limited to 'libk3b/core/k3bglobals.cpp')
-rw-r--r--libk3b/core/k3bglobals.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index e072571..29ef523 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -580,11 +580,7 @@ bool K3b::unmount( K3bDevice::Device* dev )
return !p.exitStatus();
}
else {
-#ifdef HAVE_HAL
return !K3bDevice::HalConnection::instance()->unmount( dev );
-#else
- return false;
-#endif
}
}
@@ -602,10 +598,8 @@ bool K3b::mount( K3bDevice::Device* dev )
return true;
#endif
-#ifdef HAVE_HAL
if( !K3bDevice::HalConnection::instance()->mount( dev ) )
return true;
-#endif
// now try pmount
TQString pmountBin = K3b::findExe( "pmount" );
@@ -622,10 +616,8 @@ bool K3b::mount( K3bDevice::Device* dev )
bool K3b::eject( K3bDevice::Device* dev )
{
-#ifdef HAVE_HAL
if( !K3bDevice::HalConnection::instance()->eject( dev ) )
return true;
-#endif
if( K3b::isMounted( dev ) )
K3b::unmount( dev );