diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 00:37:32 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 00:37:32 +0000 |
| commit | f6f9c296c3f9d39a8c3d0ee64a542a47f450be28 (patch) | |
| tree | d38fce8091ce66977004a5cb115768c7810aee30 /lib/kpilotdevicelinkPrivate.h | |
| parent | e340db64991a06761aa6395ffe760b53e4c1dfbc (diff) | |
| download | kpilot-f6f9c296c3f9d39a8c3d0ee64a542a47f450be28.tar.gz kpilot-f6f9c296c3f9d39a8c3d0ee64a542a47f450be28.zip | |
TQt4 port kpilot
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1238903 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'lib/kpilotdevicelinkPrivate.h')
| -rw-r--r-- | lib/kpilotdevicelinkPrivate.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/kpilotdevicelinkPrivate.h b/lib/kpilotdevicelinkPrivate.h index 518f019..b0967ba 100644 --- a/lib/kpilotdevicelinkPrivate.h +++ b/lib/kpilotdevicelinkPrivate.h @@ -109,8 +109,8 @@ private: class Messages { public: - Messages(KPilotDeviceLink *parent) : - fDeviceLink(parent) + Messages(KPilotDeviceLink *tqparent) : + fDeviceLink(tqparent) { reset(); } @@ -170,10 +170,10 @@ protected: KPilotDeviceLink *fDeviceLink; }; -class DeviceCommEvent : public QEvent +class DeviceCommEvent : public TQEvent { public: - DeviceCommEvent(DeviceCustomEvents type, TQString msg = TQString::null, + DeviceCommEvent(DeviceCustomEvents type, TQString msg = TQString(), int progress = 0) : TQEvent( (TQEvent::Type)type ), fMessage(msg), fProgress(progress), fPilotSocket(-1) @@ -207,15 +207,16 @@ private: }; /** Class that handles all device communications. We do this - in a different thread so that we do not block the main Qt + in a different thread so that we do not block the main TQt Event thread (similar to Swing's AWT event dispatch thread). */ -class DeviceCommThread : public TQObject, public QThread +class DeviceCommThread : public TQObject, public TQThread { friend class KPilotDeviceLink; Q_OBJECT + TQ_OBJECT public: DeviceCommThread(KPilotDeviceLink *d); @@ -239,7 +240,7 @@ protected: * Does the low-level opening of the device and handles the * pilot-link library initialisation. */ - bool open(const TQString &device = TQString::null); + bool open(const TQString &device = TQString()); protected slots: /** |