From 955e20356d63ed405198c8143617a8a0ca8bfc02 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 10:00:17 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.
---
 ksim/monitors/lm_sensors/ksimsensors.cpp   |  2 +-
 ksim/monitors/lm_sensors/sensorbase.cpp    | 10 +++++-----
 ksim/monitors/lm_sensors/sensorsconfig.cpp |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'ksim/monitors/lm_sensors')

diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index 136d314..eb2614f 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -27,7 +27,7 @@
 #include <kaboutdata.h>
 #include <kconfig.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <label.h>
 #include <themetypes.h>
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp
index 45251db..cabbf5a 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,13 +134,13 @@ 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(), 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(), TQString(), sensorType(name)));
       }
@@ -217,9 +217,9 @@ TQString SensorBase::sensorType(const TQString &name)
 
   if (name.findRev("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)
     return i18n("Volt", "V");
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp
index 7406016..1f1cf10 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.cpp
+++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp
@@ -31,7 +31,7 @@
 
 #include <tqtimer.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqcursor.h>
 #include <tqpopupmenu.h>
@@ -86,7 +86,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
 
   m_updateLabel = new TQLabel(this);
   m_updateLabel->setText(i18n("Update interval:"));
-  m_updateLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+  m_updateLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
      TQSizePolicy::Fixed));
   m_layout->addMultiCellWidget(m_updateLabel, 4, 4, 0, 0);
 
@@ -95,7 +95,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
 
   TQLabel *intervalLabel = new TQLabel(this);
   intervalLabel->setText(i18n("seconds"));
-  intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+  intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
      TQSizePolicy::Fixed));
   m_layout->addMultiCellWidget(intervalLabel, 4, 4, 2, 2);
 }
-- 
cgit v1.2.1