diff options
author | Golubev Alexander <fatzer2@gmail.com> | 2013-07-27 06:39:01 +0400 |
---|---|---|
committer | Golubev Alexander <fatzer2@gmail.com> | 2013-07-27 11:20:30 +0400 |
commit | e7708ec743e1c504cbae2ab523858589caeae62f (patch) | |
tree | 39fbcc9b900e673b7fab0e5fabc4d82a1cce4286 /tdecore/tdehw/tdestoragedevice.cpp | |
parent | 4b775b444d1558705c4aa9a0b5f1d18e2a81f092 (diff) | |
download | tdelibs-e7708ec743e1c504cbae2ab523858589caeae62f.tar.gz tdelibs-e7708ec743e1c504cbae2ab523858589caeae62f.zip |
complete tdehardwaredevices split
Diffstat (limited to 'tdecore/tdehw/tdestoragedevice.cpp')
-rw-r--r-- | tdecore/tdehw/tdestoragedevice.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp index 8c3538ade..ac80b8856 100644 --- a/tdecore/tdehw/tdestoragedevice.cpp +++ b/tdecore/tdehw/tdestoragedevice.cpp @@ -21,25 +21,9 @@ #include <unistd.h> #include <fcntl.h> - #include <sys/ioctl.h> #include <linux/cdrom.h> -// uDisks2 integration -#if defined(WITH_UDISKS) || defined(WITH_UDISKS2) - #include <tqdbusdata.h> - #include <tqdbusmessage.h> - #include <tqdbusproxy.h> - #include <tqdbusvariant.h> - #include <tqdbusconnection.h> - #include <tqdbuserror.h> - #include <tqdbusdatamap.h> - #include <tqdbusobjectpath.h> -#endif // defined(WITH_UDISKS) || defined(WITH_UDISKS2) -#if defined(WITH_UDISKS) - #include "tqdbusdatalist.h" -#endif // ddefined(WITH_UDISKS) - #include <tqpixmap.h> #include <tqfile.h> @@ -50,6 +34,23 @@ #include "tdehardwaredevices.h" +#include "config.h" + +// uDisks2 integration +#if defined(WITH_UDISKS) || defined(WITH_UDISKS2) + #include <tqdbusdata.h> + #include <tqdbusmessage.h> + #include <tqdbusproxy.h> + #include <tqdbusvariant.h> + #include <tqdbusconnection.h> + #include <tqdbuserror.h> + #include <tqdbusdatamap.h> + #include <tqdbusobjectpath.h> +#endif // defined(WITH_UDISKS) || defined(WITH_UDISKS2) +#if defined(WITH_UDISKS) + #include "tqdbusdatalist.h" +#endif // ddefined(WITH_UDISKS) + TDEStorageDevice::TDEStorageDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn), m_mediaInserted(true) { m_diskType = TDEDiskDeviceType::Null; m_diskStatus = TDEDiskDeviceStatus::Null; |