From 983ade75ae2f488477bbb796f52ce2135c202dfe Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 30 Mar 2013 20:24:24 -0500
Subject: Use TDE hardware library instead of HAL when HAL is not available
 Clean up spurious build files

---
 libk3b/core/k3bcore.cpp    | 6 ------
 libk3b/core/k3bglobals.cpp | 8 --------
 2 files changed, 14 deletions(-)

(limited to 'libk3b')

diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index 898b526..9fecb79 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -19,9 +19,7 @@
 #include "k3bjob.h"
 
 #include <k3bdevicemanager.h>
-#ifdef HAVE_HAL
 #include <k3bhalconnection.h>
-#endif
 #include <k3bexternalbinmanager.h>
 #include <k3bdefaultexternalprograms.h>
 #include <k3bglobals.h>
@@ -204,7 +202,6 @@ void K3bCore::init()
 
   externalBinManager()->search();
 
-#ifdef HAVE_HAL
   connect( K3bDevice::HalConnection::instance(), TQT_SIGNAL(deviceAdded(const TQString&)),
 	   deviceManager(), TQT_SLOT(addDevice(const TQString&)) );
   connect( K3bDevice::HalConnection::instance(), TQT_SIGNAL(deviceRemoved(const TQString&)),
@@ -215,9 +212,6 @@ void K3bCore::init()
   else
     for( unsigned int i = 0; i < devList.count(); ++i )
       deviceManager()->addDevice( devList[i] );
-#else
-  deviceManager()->scanBus();
-#endif
 }
 
 
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 );
-- 
cgit v1.2.1