From 87a016680e3677da3993f333561e79eb0cead7d5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 29 Jun 2011 16:05:55 +0000 Subject: TQt4 port ktechlab This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1238801 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/electronics/switch.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/electronics/switch.h') diff --git a/src/electronics/switch.h b/src/electronics/switch.h index 40247c9..17fd493 100644 --- a/src/electronics/switch.h +++ b/src/electronics/switch.h @@ -11,21 +11,22 @@ #ifndef SWITCH_H #define SWITCH_H -#include -#include +#include +#include class CircuitDocument; class Component; class Pin; class Resistance; -class QTimer; +class TQTimer; /** @author David Saxton */ -class Switch : public QObject +class Switch : public TQObject { Q_OBJECT + TQ_OBJECT public: enum State @@ -34,7 +35,7 @@ class Switch : public QObject Closed, }; - Switch( Component * parent, Pin * p1, Pin * p2, State state ); + Switch( Component * tqparent, Pin * p1, Pin * p2, State state ); ~Switch(); /** * If bouncing has been set to true, then the state will not switch @@ -63,7 +64,7 @@ class Switch : public QObject protected slots: /** - * Called from a QTimer timeout - our bouncing period has come to an + * Called from a TQTimer timeout - our bouncing period has come to an * end. This will then fully disconnect or connect the pins depending * on the current state. */ @@ -78,9 +79,9 @@ class Switch : public QObject Resistance * m_pBounceResistance; State m_state; Component * m_pComponent; - QGuardedPtr m_pP1; - QGuardedPtr m_pP2; - QTimer * m_pStopBouncingTimer; + TQGuardedPtr m_pP1; + TQGuardedPtr m_pP2; + TQTimer * m_pStopBouncingTimer; }; #endif -- cgit v1.2.1