1 files changed, 10 insertions, 10 deletions
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index 2e542e3..4bc0ff4 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -23,12 +23,12 @@
 #include <k3bdeviceglobals.h>
 #include <k3bexternalbinmanager.h>
 #include <k3bcore.h>
-#include <k3bhalconnection.h>
+#include <k3bconnection.h>
 
 #include <tdeversion.h>
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
@@ -36,7 +36,7 @@
 #include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <dcopref.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 
 #include <tqdatastream.h>
 #include <tqdir.h>
@@ -175,10 +175,10 @@ TQString K3b::findTempFile( const TQString& ending, const TQString& d )
 
 TQString K3b::defaultTempPath()
 {
-  TQString oldGroup = kapp->config()->group();
-  kapp->config()->setGroup( "General Options" );
-  TQString url = kapp->config()->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() );
-  kapp->config()->setGroup( oldGroup );
+  TQString oldGroup = tdeApp->config()->group();
+  tdeApp->config()->setGroup( "General Options" );
+  TQString url = tdeApp->config()->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() );
+  tdeApp->config()->setGroup( oldGroup );
   return prepareDir(url);
 }
 
@@ -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 ) )