summaryrefslogtreecommitdiffstats
path: root/libk3b/core/k3bglobals.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:28 -0600
commit83b79bb29aaa412caec6abcdb42ca21d248b3b3a (patch)
treef48e8ae855d4a0be0c3ecf912a92168a829ff8c5 /libk3b/core/k3bglobals.h
parent2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff)
downloadk3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz
k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/core/k3bglobals.h')
-rw-r--r--libk3b/core/k3bglobals.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h
index 0b58f58..0964258 100644
--- a/libk3b/core/k3bglobals.h
+++ b/libk3b/core/k3bglobals.h
@@ -28,7 +28,7 @@
#include <k3bdevicetypes.h>
#include "k3b_export.h"
-class KConfig;
+class TDEConfig;
class K3bVersion;
class K3bExternalBin;
@@ -187,7 +187,7 @@ namespace K3b
TQString systemName();
- LIBK3B_EXPORT KIO::filesize_t filesize( const KURL& );
+ LIBK3B_EXPORT TDEIO::filesize_t filesize( const KURL& );
/**
* Calculate the total size of an image file. This also includes
@@ -195,7 +195,7 @@ namespace K3b
*
* \returns the total size of the image file at url
*/
- LIBK3B_EXPORT KIO::filesize_t imageFilesize( const KURL& url );
+ LIBK3B_EXPORT TDEIO::filesize_t imageFilesize( const KURL& url );
/**
* true if the kernel supports ATAPI devices without SCSI emulation.
@@ -236,7 +236,7 @@ namespace K3b
/**
* Tries to unmount the device ignoring its actual mounting state.
- * This method uses both KIO::unmount and pumount if available.
+ * This method uses both TDEIO::unmount and pumount if available.
*/
LIBK3B_EXPORT bool unmount( K3bDevice::Device* );