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/oscilloscopedata.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/oscilloscopedata.h') diff --git a/src/oscilloscopedata.h b/src/oscilloscopedata.h index cbabdac..c4b3bca 100644 --- a/src/oscilloscopedata.h +++ b/src/oscilloscopedata.h @@ -11,8 +11,8 @@ #ifndef OSCILLOSCOPEDATA_H #define OSCILLOSCOPEDATA_H -#include -#include +#include +#include typedef long long llong; typedef unsigned long long ullong; @@ -206,9 +206,11 @@ class StoredData /** @author David Saxton */ -class ProbeData : public QObject +class ProbeData : public TQObject { - Q_OBJECT; + Q_OBJECT + TQ_OBJECT + public: ProbeData( int id ); ~ProbeData(); @@ -232,11 +234,11 @@ class ProbeData : public QObject * Set the colour that is used to display the probe in the oscilloscope. * Default is black. */ - void setColor( QColor color ); + void setColor( TQColor color ); /** * @returns the colour that is used to display the probe in the oscilloscope */ - QColor color() const { return m_color; } + TQColor color() const { return m_color; } // /** // * Will not record any data when paused // */ @@ -275,7 +277,7 @@ class ProbeData : public QObject ullong m_insertPos; // bool b_isPaused; ullong m_resetTime; - QColor m_color; + TQColor m_color; }; -- cgit v1.2.1