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

This reverts commit e29455aea4fc1fda591862200c6321a3722e134c.
---
 src/knutdock.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/knutdock.cpp')

diff --git a/src/knutdock.cpp b/src/knutdock.cpp
index bb1f6e1..a404221 100755
--- a/src/knutdock.cpp
+++ b/src/knutdock.cpp
@@ -152,7 +152,7 @@ void KNutDock::changeKIcon (void) {
     if (!m_runtimeLayer) {
       m_runtimeLayer = new TQPixmap(ICON_SIZE,ICON_SIZE);
       }
-    paintStatus(m_statusValue);
+    painttqStatus(m_statusValue);
     paintRuntime(m_runtimeValue, m_statusValue);
     }
   else {  // picture Icon
@@ -195,7 +195,7 @@ void KNutDock::repaintDock (const bool always) {
   TQPainter paint;
 
 
-  if (m_activeUpsInfo->upsNet == 0) { repaint(); return;}
+  if (m_activeUpsInfo->upsNet == 0) { tqrepaint(); return;}
 
   m_dataOkOld=m_dataOk;
 
@@ -215,7 +215,7 @@ void KNutDock::repaintDock (const bool always) {
       }
     else myRuntimeValue = knc::numberVarError;
 
-    myStatusValue = m_activeUpsInfo->upsNet->readStatus();
+    myStatusValue = m_activeUpsInfo->upsNet->readtqStatus();
 
 
     switch (m_typeOfIcon) {
@@ -223,14 +223,14 @@ void KNutDock::repaintDock (const bool always) {
 //    *********STATUS****************
       if (myStatusValue !=m_statusValue  ) {
         m_statusValue = myStatusValue;
-        paintStatus(m_statusValue);
+        painttqStatus(m_statusValue);
         repaintNow = true;
         }
 
 //   **********RUNTIME***********
       myStatusBatValue = myStatusValue & KNutNet::OB; // OB = UPS runs on battery
       if ((myRuntimeValue != m_runtimeValue) || (myStatusBatValue != m_statusBatValue)) {
-        // when runtime is changed or flags OB is changed we must repaint icons
+        // when runtime is changed or flags OB is changed we must tqrepaint icons
         // when OB is changed same items in icon will change color
         m_runtimeValue = myRuntimeValue; // runtime is old value of runtime, one is defined like global value of class
         m_statusBatValue = myStatusBatValue;
@@ -390,7 +390,7 @@ void KNutDock::repaintDock (const bool always) {
         }
       }
     }
-  repaint();
+  tqrepaint();
   }
 
 
@@ -483,17 +483,17 @@ void KNutDock::toolTip (int runtime, int status, int batteryCharge, int upsLoad
 
   if (m_toolTipFlags & TTRun) {
     if (runtime != knc::numberVarError)
-      text += "\n" + i18n("Runtime") + i18n(" : %1:%2 min").arg(min).arg(sec);
+      text += "\n" + i18n("Runtime") + i18n(" : %1:%2 min").tqarg(min).tqarg(sec);
     }
 
   if (m_toolTipFlags & TTCharge) {
     if (batteryCharge != knc::numberVarError)
-      text += "\n" + i18n("Battery Charge") + TQString(" : %1 %").arg(batteryCharge);
+      text += "\n" + i18n("Battery Charge") + TQString(" : %1 %").tqarg(batteryCharge);
     }
 
   if (m_toolTipFlags & TTLoad) {
     if (upsLoad != knc::numberVarError)
-      text += "\n" + i18n("UPS Load") + TQString(" : %1 %").arg(upsLoad);
+      text += "\n" + i18n("UPS Load") + TQString(" : %1 %").tqarg(upsLoad);
     }
 
   TQToolTip::remove(this);
@@ -726,7 +726,7 @@ void KNutDock::paintOKPoint (TQPainter& paint  ) {
   }
 
 
-void KNutDock::paintStatus (int status ) {
+void KNutDock::painttqStatus (int status ) {
   TQPainter paint;
   int lastPos = 0;
 
-- 
cgit v1.2.1