From d8cc8bdfa7fa624a526d5aa1626974e1444cb799 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 27 May 2011 19:21:21 +0000 Subject: TQt4 port k3b This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libk3bdevice/k3bdevicemanager.h | 67 +++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 33 deletions(-) (limited to 'libk3bdevice/k3bdevicemanager.h') diff --git a/libk3bdevice/k3bdevicemanager.h b/libk3bdevice/k3bdevicemanager.h index 4656538..258afa2 100644 --- a/libk3bdevice/k3bdevicemanager.h +++ b/libk3bdevice/k3bdevicemanager.h @@ -17,11 +17,11 @@ #ifndef K3BDEVICEMANAGER_H #define K3BDEVICEMANAGER_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "k3bdevice_export.h" #include @@ -47,15 +47,16 @@ namespace K3bDevice { * K3bDevice::Device* dev = manager->findDevice( "/dev/cdrom" ); * \endcode */ - class LIBK3BDEVICE_EXPORT DeviceManager : public QObject + class LIBK3BDEVICE_EXPORT DeviceManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Creates a new DeviceManager */ - DeviceManager( QObject* parent = 0, const char* name = 0 ); + DeviceManager( TQObject* tqparent = 0, const char* name = 0 ); virtual ~DeviceManager(); /** @@ -72,15 +73,15 @@ namespace K3bDevice { void setCheckWritingModes( bool b ); /** - * \deprecated use findDevice( const QString& ) + * \deprecated use findDevice( const TQString& ) */ - Device* deviceByName( const QString& ); + Device* deviceByName( const TQString& ); /** * Search an SCSI device by SCSI bus, id, and lun. * * \note This method does not initialize new devices. - * Devices cannot be found until they have been added via addDevice(const QString&) + * Devices cannot be found until they have been added via addDevice(const TQString&) * or scanBus(). * * \return The corresponding device or 0 if there is no such device. @@ -91,81 +92,81 @@ namespace K3bDevice { * Search a device by blockdevice name. * * \note This method does not initialize new devices. - * Devices cannot be found until they have been added via addDevice(const QString&) + * Devices cannot be found until they have been added via addDevice(const TQString&) * or scanBus(). * * \return The corresponding device or 0 if there is no such device. */ - Device* findDevice( const QString& devicename ); + Device* findDevice( const TQString& devicename ); /** * Before getting the devices do a @ref scanBus(). * \return List of all cd writer devices. * \deprecated use cdWriter() */ - const QPtrList& burningDevices() const; + const TQPtrList& burningDevices() const; /** * \return List of all reader devices without writer devices. * \deprecated use cdReader() **/ - const QPtrList& readingDevices() const; + const TQPtrList& readingDevices() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all devices. */ - const QPtrList& allDevices() const; + const TQPtrList& allDevices() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all cd writer devices. */ - const QPtrList& cdWriter() const; + const TQPtrList& cdWriter() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all cd reader devices. */ - const QPtrList& cdReader() const; + const TQPtrList& cdReader() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all DVD writer devices. */ - const QPtrList& dvdWriter() const; + const TQPtrList& dvdWriter() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all DVD reader devices. */ - const QPtrList& dvdReader() const; + const TQPtrList& dvdReader() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all Blue Ray reader devices. */ - const QPtrList& blueRayReader() const; + const TQPtrList& blueRayReader() const; /** * Before getting the devices do a @ref scanBus() or add - * devices via addDevice( const QString& ). + * devices via addDevice( const TQString& ). * * \return List of all Blue Ray writer devices. */ - const QPtrList& blueRayWriters() const; + const TQPtrList& blueRayWriters() const; /** * Reads the device information from the config file. @@ -209,14 +210,14 @@ namespace K3bDevice { * * \return The device if it could be found or 0 otherwise. */ - virtual Device* addDevice( const QString& dev ); + virtual Device* addDevice( const TQString& dev ); /** * Remove a device from the device manager. Basicly this method * only makes sense in combination with the HalConnection. Connect * it to the deviceRemoved signal. */ - virtual void removeDevice( const QString& dev ); + virtual void removeDevice( const TQString& dev ); signals: /** @@ -226,9 +227,9 @@ namespace K3bDevice { void changed(); private: - bool testForCdrom( const QString& ); - bool determineBusIdLun( const QString &dev, int& bus, int& id, int& lun ); - QString resolveSymLink( const QString& path ); + bool testForCdrom( const TQString& ); + bool determineBusIdLun( const TQString &dev, int& bus, int& id, int& lun ); + TQString resolveSymLink( const TQString& path ); class Private; Private* d; -- cgit v1.2.1