summaryrefslogtreecommitdiffstats
path: root/libk3b/core/k3bcore.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-03-30 20:24:24 -0500
committerTimothy Pearson <[email protected]>2013-03-30 20:24:24 -0500
commit983ade75ae2f488477bbb796f52ce2135c202dfe (patch)
tree32fd2ad28d871b6f5f636ae5659391eac56665b5 /libk3b/core/k3bcore.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/k3bcore.cpp')
-rw-r--r--libk3b/core/k3bcore.cpp6
1 files changed, 0 insertions, 6 deletions
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
}