Removed HAL dependant code.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 10 insertions, 10 deletions

diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index 9fecb79..293d74f 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -19,7 +19,7 @@
 #include "k3bjob.h"
 
 #include <k3bdevicemanager.h>
-#include <k3bhalconnection.h>
+#include <k3bconnection.h>
 #include <k3bexternalbinmanager.h>
 #include <k3bdefaultexternalprograms.h>
 #include <k3bglobals.h>
@@ -202,11 +202,11 @@ void K3bCore::init()
 
   externalBinManager()->search();
 
-  connect( K3bDevice::HalConnection::instance(), TQT_SIGNAL(deviceAdded(const TQString&)),
+  connect( K3bDevice::Connection::instance(), TQT_SIGNAL(deviceAdded(const TQString&)),
 	   deviceManager(), TQT_SLOT(addDevice(const TQString&)) );
-  connect( K3bDevice::HalConnection::instance(), TQT_SIGNAL(deviceRemoved(const TQString&)),
+  connect( K3bDevice::Connection::instance(), TQT_SIGNAL(deviceRemoved(const TQString&)),
 	   deviceManager(), TQT_SLOT(removeDevice(const TQString&)) );
-  TQStringList devList = K3bDevice::HalConnection::instance()->devices();
+  TQStringList devList = K3bDevice::Connection::instance()->devices();
   if( devList.isEmpty() )
     deviceManager()->scanBus();
   else
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index 2e542e3..7793128 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -23,7 +23,7 @@
 #include <k3bdeviceglobals.h>
 #include <k3bexternalbinmanager.h>
 #include <k3bcore.h>
-#include <k3bhalconnection.h>
+#include <k3bconnection.h>
 
 #include <tdeversion.h>
 #include <tdeglobal.h>
@@ -580,7 +580,7 @@ bool K3b::unmount( K3bDevice::Device* dev )
     return !p.exitStatus();
   }
   else {
-    return !K3bDevice::HalConnection::instance()->unmount( dev );
+    return !K3bDevice::Connection::instance()->unmount( dev );
   }
 }
 
@@ -598,7 +598,7 @@ bool K3b::mount( K3bDevice::Device* dev )
     return true;
 #endif
 
-  if( !K3bDevice::HalConnection::instance()->mount( dev ) )
+  if( !K3bDevice::Connection::instance()->mount( dev ) )
     return true;
 
   // now try pmount
@@ -616,7 +616,7 @@ bool K3b::mount( K3bDevice::Device* dev )
 
 bool K3b::eject( K3bDevice::Device* dev )
 {
-  if( !K3bDevice::HalConnection::instance()->eject( dev ) )
+  if( !K3bDevice::Connection::instance()->eject( dev ) )
     return true;
 
   if( K3b::isMounted( dev ) )
diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h
index c6d2111..17cc149 100644
--- a/libk3b/core/k3bglobals.h
+++ b/libk3b/core/k3bglobals.h
@@ -242,14 +242,14 @@ namespace K3b
 
   /**
    * Tries to mount the medium. Since K3b does not gather any information
-   * about mount points the only methods used are pmount and HAL::mount
+   * about mount points the only methods used are pmount and tdehw lib mount
    */
   LIBK3B_EXPORT bool mount( K3bDevice::Device* );
 
   /**
    * Ejects the medium in the device or simply opens the tray.
    * This method improves over K3bDevice::Device::eject in that it
-   * unmounts before ejecting and introduces HAL support.
+   * unmounts before ejecting.
    */
   LIBK3B_EXPORT bool eject( K3bDevice::Device* );
 }