diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:52:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:52:05 -0600 |
| commit | d796716f1dc9dd0b198863d974a03bf356f636e6 (patch) | |
| tree | 1bab87345ab25163397b8033b7e1910360bd94fb /libk3bdevice | |
| parent | 6f156aae95c8ea00b34ffb59e237df2f00cf8256 (diff) | |
| download | k3b-d796716f1dc9dd0b198863d974a03bf356f636e6.tar.gz k3b-d796716f1dc9dd0b198863d974a03bf356f636e6.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'libk3bdevice')
| -rw-r--r-- | libk3bdevice/configure.in.in | 2 | ||||
| -rw-r--r-- | libk3bdevice/k3bdevicemanager.cpp | 2 | ||||
| -rw-r--r-- | libk3bdevice/k3bdiskinfo.cpp | 2 | ||||
| -rw-r--r-- | libk3bdevice/k3bhalconnection.cpp | 10 | ||||
| -rw-r--r-- | libk3bdevice/k3bmsf.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/libk3bdevice/configure.in.in b/libk3bdevice/configure.in.in index 2a14f0f..42a8a62 100644 --- a/libk3bdevice/configure.in.in +++ b/libk3bdevice/configure.in.in @@ -62,7 +62,7 @@ dnl === check for resmgr - end ============ -# HAL check from tdebase/kioslave/media +# HAL check from tdebase/tdeioslave/media AC_ARG_WITH( hal, diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp index d5bf336..dc94c9b 100644 --- a/libk3bdevice/k3bdevicemanager.cpp +++ b/libk3bdevice/k3bdevicemanager.cpp @@ -31,7 +31,7 @@ #include <kprocess.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ktempfile.h> #include <iostream> diff --git a/libk3bdevice/k3bdiskinfo.cpp b/libk3bdevice/k3bdiskinfo.cpp index 534e74b..0709d28 100644 --- a/libk3bdevice/k3bdiskinfo.cpp +++ b/libk3bdevice/k3bdiskinfo.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <k3bdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqstringlist.h> diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp index 6228922..dbb19a3 100644 --- a/libk3bdevice/k3bhalconnection.cpp +++ b/libk3bdevice/k3bhalconnection.cpp @@ -269,7 +269,7 @@ void K3bDevice::HalConnection::removeDevice( const char* udi ) int K3bDevice::HalConnection::lock( Device* dev ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org> // DBusMessage* dmesg = 0; @@ -328,7 +328,7 @@ int K3bDevice::HalConnection::lock( Device* dev ) int K3bDevice::HalConnection::unlock( Device* dev ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org> // DBusMessage* dmesg = 0; @@ -387,7 +387,7 @@ int K3bDevice::HalConnection::mount( K3bDevice::Device* dev, const TQStringList& options ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org> // DBusMessage* dmesg = 0; @@ -467,7 +467,7 @@ int K3bDevice::HalConnection::unmount( K3bDevice::Device* dev, const TQStringList& options ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org> // DBusMessage* dmesg = 0; @@ -538,7 +538,7 @@ int K3bDevice::HalConnection::eject( K3bDevice::Device* dev, const TQStringList& options ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org> // DBusMessage* dmesg = 0; diff --git a/libk3bdevice/k3bmsf.h b/libk3bdevice/k3bmsf.h index 052cadd..ff4b0cc 100644 --- a/libk3bdevice/k3bmsf.h +++ b/libk3bdevice/k3bmsf.h @@ -21,7 +21,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> #include "k3bdevice_export.h" namespace K3b |