diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-03 13:42:15 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2021-05-03 14:24:37 +0900 |
| commit | cc51bb4eb48522433b14b1e584dd5dbdb9a0969e (patch) | |
| tree | 543d9b35f147e846e5cd9d722c0b2dd4e6b01d56 /libk3bdevice/k3bhalconnection.h | |
| parent | 0f3a20732c49a18f891f10b4a946ce8cb21b4f5f (diff) | |
| download | k3b-cc51bb4eb48522433b14b1e584dd5dbdb9a0969e.tar.gz k3b-cc51bb4eb48522433b14b1e584dd5dbdb9a0969e.zip | |
Fixed building without tdehw and without HAL. This resolves bug 2495.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'libk3bdevice/k3bhalconnection.h')
| -rw-r--r-- | libk3bdevice/k3bhalconnection.h | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/libk3bdevice/k3bhalconnection.h b/libk3bdevice/k3bhalconnection.h index 232669e..351a1ca 100644 --- a/libk3bdevice/k3bhalconnection.h +++ b/libk3bdevice/k3bhalconnection.h @@ -25,12 +25,16 @@ #include <tqobject.h> #include <tqmap.h> #include <tqstringlist.h> +#include <kdemacros.h> #ifdef HAVE_HAL class DBusConnection; -#else // HAVE_HAL +#endif +#ifdef __TDE_HAVE_TDEHWLIB class TDEGenericDevice; -#endif // HAVE_HAL +#else +#define TDEGenericDevice void +#endif namespace K3bDevice { @@ -165,7 +169,7 @@ namespace K3bDevice { * \see ErrorCode */ int unmount( Device*, - const TQStringList& options = TQStringList() ); + const TQStringList& options = TQStringList() ); /** * Unmounts a device via HAL @@ -179,25 +183,23 @@ namespace K3bDevice { * \see ErrorCode */ int eject( Device*, - const TQStringList& options = TQStringList() ); + const TQStringList& options = TQStringList() ); -#ifndef HAVE_HAL -private slots: - /** - * \internal - */ - void AddDeviceHandler(TDEGenericDevice*); - - /** - * \internal - */ - void RemoveDeviceHandler(TDEGenericDevice*); - - /** - * \internal - */ - void ModifyDeviceHandler(TDEGenericDevice*); -#endif // HAVE_HAL + private slots: + /** + * \internal + */ + void AddDeviceHandler(TDEGenericDevice*); + + /** + * \internal + */ + void RemoveDeviceHandler(TDEGenericDevice*); + + /** + * \internal + */ + void ModifyDeviceHandler(TDEGenericDevice*); signals: /** |