diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-30 19:37:06 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-30 19:37:06 +0000 |
commit | 968af1d235ac30d737991b269156bee5dc99d318 (patch) | |
tree | 19b118fa5380087e10cb728be545760791ce0676 /src/knutvardata.cpp | |
parent | aea4882f3b37f17c5b56bc77667e683c52254c30 (diff) | |
download | knutclient-968af1d235ac30d737991b269156bee5dc99d318.tar.gz knutclient-968af1d235ac30d737991b269156bee5dc99d318.zip |
TQt4 port knutclient
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/knutclient@1238881 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/knutvardata.cpp')
-rwxr-xr-x | src/knutvardata.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/knutvardata.cpp b/src/knutvardata.cpp index 86650bd..4d57649 100755 --- a/src/knutvardata.cpp +++ b/src/knutvardata.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <qcolor.h> +#include <tqcolor.h> //#include <iostream> @@ -55,7 +55,7 @@ KNutVarData::KNutVarData(){ m_upsVarNameAnalog[12] = i18n("Battery Temperature"); m_upsVarNameAnalog[13] = i18n("Battery Current"); - static const QString upsVarNameUnit[] = {"", "V", "%", "C", "Hz", "%", "C", "%", "V", "V", "A","Hz","C", "A"}; + static const TQString upsVarNameUnit[] = {"", "V", "%", "C", "Hz", "%", "C", "%", "V", "V", "A","Hz","C", "A"}; static const int upsVarType[] = {0,3,2,1,1,2,1,1,3,3,2,1,1,2}; //typ panelu static const int upsVarItem[] = {5,4,5,5,6,6,5,5,5,4,5,6,5,5}; // pocet velkych policek na stupnici static const int upsVarInItem[] = {0,3,0,0,4,0,0,0,0,3,5,4,0,5}; // pocet malych policek ve velkem policku na stupnici @@ -132,7 +132,7 @@ KNutVarData::VarStrucDef KNutVarData::getData (const int seqNumber) const { -QString KNutVarData::getNameAnalogData (const int seqNumber) { +TQString KNutVarData::getNameAnalogData (const int seqNumber) { if ((seqNumber >= 0) && (seqNumber < knc::NumberOfTypes)) return m_upsVarNameAnalog[seqNumber]; else @@ -178,7 +178,7 @@ void KNutVarData::setXfer (const float lowXfer, const float highXfer) { } -const QString KNutVarData::errorToText (const int error) { +const TQString KNutVarData::errorToText (const int error) { switch (error) { |