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/knutclient.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/knutclient.cpp')

diff --git a/src/knutclient.cpp b/src/knutclient.cpp
index 3c4adb1..935d1e1 100755
--- a/src/knutclient.cpp
+++ b/src/knutclient.cpp
@@ -90,7 +90,7 @@ KNutClient::KNutClient(bool noDock, TQObject* parent, const char *name) : TQObje
   // sets data for selected item
   setActiveUpsInfo(m_mainUpsInfo.record.name);
 
-  // sets mainUpsInfo.oldState to const value KNutNet::initStatus
+  // sets mainUpsInfo.oldState to const value KNutNet::inittqStatus
   m_mainUpsInfo.oldState=KNutNet::initState;
 
 
@@ -281,7 +281,7 @@ void KNutClient::slotErrorConnection (int error) {
     m_mainUpsInfo.reconnectCount++;
     if (m_mainUpsInfo.reconnectCount > countNextConnDelay) m_mainUpsInfo.reconnectCount = countNextConnDelay;
 
-    addEventString(i18n("The connection failed. The next connection will make after %1 sec.").arg(nextConnDelay[m_mainUpsInfo.reconnectCount-1]),m_mainUpsInfo.record.name);
+    addEventString(i18n("The connection failed. The next connection will make after %1 sec.").tqarg(nextConnDelay[m_mainUpsInfo.reconnectCount-1]),m_mainUpsInfo.record.name);
     m_reconnectTimer->start( nextConnDelay[m_mainUpsInfo.reconnectCount-1]*1000, TRUE ); // starts reconnect timer again
     }
   else {
@@ -715,7 +715,7 @@ void KNutClient::addEventString (const TQString text, const TQString UPSAddress)
     mainWindow->addComboStatusItem (text,UPSAddress);
   else
     {
-      TQString dateTime(TQDate::currentDate().toString());
+      TQString dateTime(TQDate::tqcurrentDate().toString());
       dateTime +=" " + TQTime::currentTime().toString();
       if (UPSAddress.isEmpty()) m_listKNutEvent->append(dateTime+" "+text);
       else m_listKNutEvent->append(dateTime+" "+UPSAddress+" : "+text);
@@ -791,7 +791,7 @@ void KNutClient::showStatusEvent(void) {
 
 
 //qDebug ("KNutClient::showStatusEvent");
-  int myState = m_mainUpsInfo.upsNet->readStatus();
+  int myState = m_mainUpsInfo.upsNet->readtqStatus();
   if (myState != m_mainUpsInfo.oldState) {
 
     if ((myState & KNutNet::OFF) != (m_mainUpsInfo.oldState & KNutNet::OFF)) {
@@ -1096,7 +1096,7 @@ void KNutClient::slotRefreshConnection(void) {
   if (m_myDock) {
     m_myDock->clearDockValues();
  //     myDock->initImage();
- //     myDock->repaint();
+ //     myDock->tqrepaint();
     }
   if (mainWindow) {
     mainWindow->cleanPanels();
-- 
cgit v1.2.1