diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-23 01:42:07 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-23 01:42:07 +0000 |
| commit | a2277b6bc715464e83882b90c2a058139b8a6b54 (patch) | |
| tree | ab09b14014f59b4d8e2ddd12226aa0b22e4dfc5d /ksim/monitors/lm_sensors/sensorbase.cpp | |
| parent | d3f79e04b34bd1f70a458b81b28fc8799498c8dc (diff) | |
| download | tdeutils-a2277b6bc715464e83882b90c2a058139b8a6b54.tar.gz tdeutils-a2277b6bc715464e83882b90c2a058139b8a6b54.zip | |
TQt4 port kdeutils
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksim/monitors/lm_sensors/sensorbase.cpp')
| -rw-r--r-- | ksim/monitors/lm_sensors/sensorbase.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index a0b82c5..de94a1b 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -126,7 +126,7 @@ void SensorBase::update() m_sensorList.append(SensorInfo(currentSensor++, label, TQString::fromUtf8(name), TQString::fromUtf8(chip->prefix), - chipset, sensorType(TQString::fromLatin1(name)))); + chipset, sensorType(TQString::tqfromLatin1(name)))); } } } @@ -134,15 +134,15 @@ void SensorBase::update() if (m_hasNVControl) { int temp = 0; if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_GPU_CORE_TEMPERATURE, &temp)) { - TQString name = TQString::fromLatin1("GPU Temp"); + TQString name = TQString::tqfromLatin1("GPU Temp"); m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp), - name, TQString::null, TQString::null, sensorType(name))); + name, TQString(), TQString(), sensorType(name))); } if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_AMBIENT_TEMPERATURE, &temp)) { - TQString name = TQString::fromLatin1("GPU Ambient Temp"); + TQString name = TQString::tqfromLatin1("GPU Ambient Temp"); m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp), - name, TQString::null, TQString::null, sensorType(name))); + name, TQString(), TQString(), sensorType(name))); } } @@ -212,19 +212,19 @@ bool SensorBase::init() TQString SensorBase::sensorType(const TQString &name) { - if (name.findRev("fan", -1, false) != -1) + if (name.tqfindRev("fan", -1, false) != -1) return i18n("Rounds per minute", " RPM"); - if (name.findRev("temp", -1, false) != -1) + if (name.tqfindRev("temp", -1, false) != -1) if (SensorBase::fahrenheit()) - return TQString::fromLatin1("°F"); + return TQString::tqfromLatin1("°F"); else - return TQString::fromLatin1("°C"); + return TQString::tqfromLatin1("°C"); - if (name.findRev(TQRegExp("[^\\+]?[^\\-]?V$")) != -1) + if (name.tqfindRev(TQRegExp("[^\\+]?[^\\-]?V$")) != -1) return i18n("Volt", "V"); - return TQString::null; + return TQString(); } TQString SensorBase::chipsetString(const ChipName *c) @@ -239,7 +239,7 @@ TQString SensorBase::chipsetString(const ChipName *c) float SensorBase::formatValue(const TQString &label, float value) { - if (label.findRev("temp", -1, false) != -1) + if (label.tqfindRev("temp", -1, false) != -1) return toFahrenheit(value); return value; @@ -247,7 +247,7 @@ float SensorBase::formatValue(const TQString &label, float value) TQString SensorBase::formatString(const TQString &label, float value) { - if (label.findRev("fan", -1, false) != -1) + if (label.tqfindRev("fan", -1, false) != -1) return TQString::number(value); return TQString::number(value,'f',2); |