diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 23:37:00 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 23:37:00 +0000 |
commit | b0e912c8b3d02a518fedda28c3180eb4794a7520 (patch) | |
tree | 07d344862562fab58cbe2df39d13d16f2e4d2bea /k9devices/k9halconnection.h | |
parent | 4d695ec81fe4d4335ee82c7a9346ad9c9e144ecc (diff) | |
download | k9copy-b0e912c8b3d02a518fedda28c3180eb4794a7520.tar.gz k9copy-b0e912c8b3d02a518fedda28c3180eb4794a7520.zip |
TQt4 convert k9copy
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1233843 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'k9devices/k9halconnection.h')
-rw-r--r-- | k9devices/k9halconnection.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/k9devices/k9halconnection.h b/k9devices/k9halconnection.h index 27119a5..ac44db4 100644 --- a/k9devices/k9halconnection.h +++ b/k9devices/k9halconnection.h @@ -10,12 +10,17 @@ // // #include "k9common.h" + +#ifdef Q_MOC_RUN +#define HAVE_HAL +#endif // Q_MOC_RUN + #ifdef HAVE_HAL #ifndef K9HALCONNECTION_H #define K9HALCONNECTION_H -#include <qobject.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqptrlist.h> #include "k9dbusdispatch.h" /** @author Jean-Michel PETIT <[email protected]> @@ -24,22 +29,23 @@ class k9HalDevice; class DBusConnection; #ifdef DBUS_QT3 -class QDBusConnection; +class TQDBusConnection; #else -namespace DBusQt { +namespace DBusTQt { class Connection; }; #endif -class k9HalConnection : public QObject +class k9HalConnection : public TQObject { Q_OBJECT + TQ_OBJECT friend class k9HalDevice; public: static k9HalConnection* getInstance(); static void end(); - QPtrList< k9HalDevice > getDevices() const { return m_devices;} + TQPtrList< k9HalDevice > getDevices() const { return m_devices;} void addDevice( const char* udi ); void removeDevice( const char* udi ); void testVolumeChanged( const char * udi); @@ -49,13 +55,13 @@ signals: void deviceAdded(k9HalDevice *); void deviceRemoved(k9HalDevice*); private: - QPtrList <k9HalDevice> m_devices; + TQPtrList <k9HalDevice> m_devices; void *m_context; DBusConnection * m_dbusConnect; K9DBusDispatch *m_dbusDispatch; private: - k9HalConnection(QObject *parent = 0, const char *name = 0); + k9HalConnection(TQObject *tqparent = 0, const char *name = 0); ~k9HalConnection(); |