diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-29 16:05:55 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-29 16:05:55 +0000 |
| commit | 87a016680e3677da3993f333561e79eb0cead7d5 (patch) | |
| tree | cbda2b4df8b8ee0d8d1617e6c75bec1e3ee0ccba /src/oscilloscopedata.h | |
| parent | 6ce3d1ad09c1096b5ed3db334e02859e45d5c32b (diff) | |
| download | ktechlab-87a016680e3677da3993f333561e79eb0cead7d5.tar.gz ktechlab-87a016680e3677da3993f333561e79eb0cead7d5.zip | |
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
Diffstat (limited to 'src/oscilloscopedata.h')
| -rw-r--r-- | src/oscilloscopedata.h | 16 |
1 files changed, 9 insertions, 7 deletions
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 <qcolor.h> -#include <qobject.h> +#include <tqcolor.h> +#include <tqobject.h> 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; }; |