Rename additional global TQt functions

pull/1/head
Timothy Pearson 12 years ago
parent f2da6a26f0
commit 236ba45f66

@ -391,7 +391,7 @@ void KNutAnalog::paintBackGround ( void ) {
TQPainter paint; TQPainter paint;
TQImage myImage; //big image TQImage myImage; //big image
//qDebug ("KNutAnalog::paintBackGround"); //tqDebug ("KNutAnalog::paintBackGround");
m_scaleLayerBig->fill( this,0,0); //color if background m_scaleLayerBig->fill( this,0,0); //color if background
@ -420,7 +420,7 @@ void KNutAnalog::paintBackGround ( void ) {
void KNutAnalog::paintPointer ( void ) { void KNutAnalog::paintPointer ( void ) {
//qDebug ("KNutAnalog::paintPointer"); //tqDebug ("KNutAnalog::paintPointer");
if (m_speedOfAAlias == none) paintPointerFastly (m_valueOfPointer); if (m_speedOfAAlias == none) paintPointerFastly (m_valueOfPointer);
else paintPointerSlowly ( m_valueOfPointer, m_centerX*3, m_centerY*3,m_widthOfScale*3); else paintPointerSlowly ( m_valueOfPointer, m_centerX*3, m_centerY*3,m_widthOfScale*3);
} }

@ -151,7 +151,7 @@ KNutClient::~KNutClient(void) {
void KNutClient::slotTryFirstConnection (int maxCount) { void KNutClient::slotTryFirstConnection (int maxCount) {
//qDebug ("KNutClient::slotTryFirstConnection"); //tqDebug ("KNutClient::slotTryFirstConnection");
//knutNet begin the first test of connection (connectToHost will be made after emiting signal tryFirstConnection ) //knutNet begin the first test of connection (connectToHost will be made after emiting signal tryFirstConnection )
// repaints icon // repaints icon
@ -161,7 +161,7 @@ void KNutClient::slotTryFirstConnection (int maxCount) {
void KNutClient::slotTryReepatFirstConnection (int number ) { void KNutClient::slotTryReepatFirstConnection (int number ) {
//qDebug ("KNutClient::slotTryFirstConnection"); //tqDebug ("KNutClient::slotTryFirstConnection");
//knutNet begin nexts test of connection //knutNet begin nexts test of connection
if (mainWindow) mainWindow->setProgressConnectPB (number); if (mainWindow) mainWindow->setProgressConnectPB (number);
@ -170,7 +170,7 @@ void KNutClient::slotTryReepatFirstConnection (int number ) {
void KNutClient::slotFirstConnection (void) { void KNutClient::slotFirstConnection (void) {
//qDebug ("sKNutClient::slotFirstConnection"); //tqDebug ("sKNutClient::slotFirstConnection");
//TCP - UDP connection to server was made //TCP - UDP connection to server was made
bool reconnecting = m_mainUpsInfo.reconnecting; bool reconnecting = m_mainUpsInfo.reconnecting;
@ -224,7 +224,7 @@ void KNutClient::slotFirstConnection (void) {
switch (m_mainUpsInfo.nutVariables) { // type of variables, old or new (with dot) switch (m_mainUpsInfo.nutVariables) { // type of variables, old or new (with dot)
case 1: case 1:
//qDebug ("sKNutClient::slotFirstConnection - var 1"); //tqDebug ("sKNutClient::slotFirstConnection - var 1");
if (!(m_mainUpsInfo.upsNet->existName("BATT_RUNTIME"))) m_mainUpsInfo.runtimeVar="BATT_RUNTIME"; if (!(m_mainUpsInfo.upsNet->existName("BATT_RUNTIME"))) m_mainUpsInfo.runtimeVar="BATT_RUNTIME";
else m_mainUpsInfo.runtimeVar="RUNTIME"; else m_mainUpsInfo.runtimeVar="RUNTIME";
m_mainUpsInfo.upsLoadVar="LOADPCT"; m_mainUpsInfo.upsLoadVar="LOADPCT";
@ -233,7 +233,7 @@ void KNutClient::slotFirstConnection (void) {
m_mainUpsInfo.statusVar="STATUS"; m_mainUpsInfo.statusVar="STATUS";
break; break;
case 2: case 2:
//qDebug ("sKNutClient::slotFirstConnection - var 2"); //tqDebug ("sKNutClient::slotFirstConnection - var 2");
m_mainUpsInfo.runtimeVar="battery.runtime"; m_mainUpsInfo.runtimeVar="battery.runtime";
m_mainUpsInfo.upsLoadVar="ups.load"; m_mainUpsInfo.upsLoadVar="ups.load";
m_mainUpsInfo.lowxferVar="input.transfer.low"; m_mainUpsInfo.lowxferVar="input.transfer.low";
@ -264,7 +264,7 @@ void KNutClient::slotFirstConnection (void) {
void KNutClient::slotErrorConnection (int error) { void KNutClient::slotErrorConnection (int error) {
//qDebug ("KNutClient::slotErrorConnection (1)"); //tqDebug ("KNutClient::slotErrorConnection (1)");
if (mainWindow) mainWindow->hideConnectPB(); if (mainWindow) mainWindow->hideConnectPB();
@ -277,7 +277,7 @@ void KNutClient::slotErrorConnection (int error) {
if (m_myDock) m_myDock->repaintDock(true); if (m_myDock) m_myDock->repaintDock(true);
if (m_mainUpsInfo.reconnecting) { if (m_mainUpsInfo.reconnecting) {
//qDebug ("KNutClient::slotErrorConnection (2)"); //tqDebug ("KNutClient::slotErrorConnection (2)");
m_mainUpsInfo.reconnectCount++; m_mainUpsInfo.reconnectCount++;
if (m_mainUpsInfo.reconnectCount > countNextConnDelay) m_mainUpsInfo.reconnectCount = countNextConnDelay; if (m_mainUpsInfo.reconnectCount > countNextConnDelay) m_mainUpsInfo.reconnectCount = countNextConnDelay;
@ -285,7 +285,7 @@ void KNutClient::slotErrorConnection (int error) {
m_reconnectTimer->start( nextConnDelay[m_mainUpsInfo.reconnectCount-1]*1000, TRUE ); // starts reconnect timer again m_reconnectTimer->start( nextConnDelay[m_mainUpsInfo.reconnectCount-1]*1000, TRUE ); // starts reconnect timer again
} }
else { else {
//qDebug ("KNutClient::slotErrorConnection (3)"); //tqDebug ("KNutClient::slotErrorConnection (3)");
addEventString (KNutVarData::errorToText(m_mainUpsInfo.netError),m_mainUpsInfo.record.name); addEventString (KNutVarData::errorToText(m_mainUpsInfo.netError),m_mainUpsInfo.record.name);
// KNutVarData::showError (mainUpsInfo.netError); // KNutVarData::showError (mainUpsInfo.netError);
if ((m_myMessMan)) m_myMessMan->addMessage(KNutVarData::errorToText(m_mainUpsInfo.netError),knc::errorLevel,true); if ((m_myMessMan)) m_myMessMan->addMessage(KNutVarData::errorToText(m_mainUpsInfo.netError),knc::errorLevel,true);
@ -529,7 +529,7 @@ bool KNutClient::commitData (TQSessionManager&) {
void KNutClient::upsActivate (void) { void KNutClient::upsActivate (void) {
//qDebug ("KNutClient::upsActivate"); //tqDebug ("KNutClient::upsActivate");
m_mainUpsInfo.upsNet = new KNutNet( m_mainUpsInfo.record.upsAddress,m_mainUpsInfo.record.upsName,m_mainUpsInfo.record.port,0,1); m_mainUpsInfo.upsNet = new KNutNet( m_mainUpsInfo.record.upsAddress,m_mainUpsInfo.record.upsName,m_mainUpsInfo.record.port,0,1);
if (m_mainUpsInfo.upsNet->getState() != KNutNet::Connected) { if (m_mainUpsInfo.upsNet->getState() != KNutNet::Connected) {
@ -677,7 +677,7 @@ void KNutClient::setActiveUpsInfo (TQString name) {
void KNutClient::getUpsData (void) { void KNutClient::getUpsData (void) {
int runNetError; int runNetError;
//qDebug("KNutClient::getUpsData"); //tqDebug("KNutClient::getUpsData");
//loads values for selected variables <getUpsValues(false)> / activate values //loads values for selected variables <getUpsValues(false)> / activate values
if (!(runNetError=m_mainUpsInfo.upsNet->getUpsValues(false))) { // data from upsNet is ok if (!(runNetError=m_mainUpsInfo.upsNet->getUpsValues(false))) { // data from upsNet is ok
@ -761,7 +761,7 @@ void KNutClient::slotTimeout (void) {
void KNutClient::slotConnectionClosed(void) { void KNutClient::slotConnectionClosed(void) {
//qDebug("KNutClient::slotConnectionClosed"); //tqDebug("KNutClient::slotConnectionClosed");
m_mainUpsInfo.netError = KNutNet::ConnetionClosedByServer; m_mainUpsInfo.netError = KNutNet::ConnetionClosedByServer;
@ -790,7 +790,7 @@ void KNutClient::slotConnectionClosed(void) {
void KNutClient::showStatusEvent(void) { void KNutClient::showStatusEvent(void) {
//qDebug ("KNutClient::showStatusEvent"); //tqDebug ("KNutClient::showStatusEvent");
int myState = m_mainUpsInfo.upsNet->readStatus(); int myState = m_mainUpsInfo.upsNet->readStatus();
if (myState != m_mainUpsInfo.oldState) { if (myState != m_mainUpsInfo.oldState) {

@ -566,7 +566,7 @@ void KNutDock::slotRefreshConnection(void) {
void KNutDock::mousePressEvent(TQMouseEvent *e) { void KNutDock::mousePressEvent(TQMouseEvent *e) {
//qDebug("KNutDock::mousePressEvent"); //tqDebug("KNutDock::mousePressEvent");
if( e->button()==Qt::LeftButton ) emit activeMainWindow(); if( e->button()==Qt::LeftButton ) emit activeMainWindow();
if( e->button()==Qt::RightButton ) m_menu->popup(e->globalPos()); if( e->button()==Qt::RightButton ) m_menu->popup(e->globalPos());
} }

@ -180,7 +180,7 @@ KNutMainWindow::~KNutMainWindow(void) {
void KNutMainWindow::setConfig (unsigned int changeSetting) { void KNutMainWindow::setConfig (unsigned int changeSetting) {
//qDebug ("KNutMainWindow::setConfig"); //tqDebug ("KNutMainWindow::setConfig");
KNutVarData::VarStrucDef analogMemberData; KNutVarData::VarStrucDef analogMemberData;
bool repaintVoltagePanels = false; bool repaintVoltagePanels = false;
bool repaintFrequencyPanels = false; bool repaintFrequencyPanels = false;
@ -361,7 +361,7 @@ void KNutMainWindow::setConfig (unsigned int changeSetting) {
void KNutMainWindow::showUpsData (void) { void KNutMainWindow::showUpsData (void) {
//qDebug ("KNutMainWindow::showUpsData start"); //tqDebug ("KNutMainWindow::showUpsData start");
if ((m_activeUpsInfo->upsNet != 0L) && (!m_activeUpsInfo->netError) && if ((m_activeUpsInfo->upsNet != 0L) && (!m_activeUpsInfo->netError) &&
@ -449,17 +449,17 @@ void KNutMainWindow::showUpsData (void) {
} }
} }
//qDebug ("KNutMainWindow::showUpsData 1"); //tqDebug ("KNutMainWindow::showUpsData 1");
m_panelMeter->activateAnalogs(); // makes panel and makes background of panel m_panelMeter->activateAnalogs(); // makes panel and makes background of panel
repaintAnalogs(false); repaintAnalogs(false);
//qDebug ("KNutMainWindow::showUpsData 2"); //tqDebug ("KNutMainWindow::showUpsData 2");
m_panelMeter->setSize(true); m_panelMeter->setSize(true);
//qDebug ("KNutMainWindow::showUpsData 3"); //tqDebug ("KNutMainWindow::showUpsData 3");
m_mainSplit->refresh(); m_mainSplit->refresh();
// doesn't repaint analog pointers, because pointers will be repainted twice // doesn't repaint analog pointers, because pointers will be repainted twice
//qDebug ("KNutMainWindow::showUpsData 4"); //tqDebug ("KNutMainWindow::showUpsData 4");
// repaintAnalogs(false); // don't make this // repaintAnalogs(false); // don't make this
//qDebug ("KNutMainWindow::showUpsData 5"); //tqDebug ("KNutMainWindow::showUpsData 5");
} }
else { else {
cleanPanels(); cleanPanels();
@ -502,7 +502,7 @@ void KNutMainWindow::repaintPanel (void) {
/// je volan vzdy po timeoutu /// je volan vzdy po timeoutu
/// this function is called after timeout always /// this function is called after timeout always
void KNutMainWindow::repaintAnalogs ( bool run ) { void KNutMainWindow::repaintAnalogs ( bool run ) {
//qDebug ("KNutMainWindow::repaintAnalogs"); //tqDebug ("KNutMainWindow::repaintAnalogs");
TQString nutStringVar; TQString nutStringVar;
@ -528,7 +528,7 @@ void KNutMainWindow::repaintAnalogs ( bool run ) {
} }
} }
//qDebug ("KNutMainWindow::repaintAnalogs 1"); //tqDebug ("KNutMainWindow::repaintAnalogs 1");
for (int i=0; i< knc::NumberOfVars; i++) { for (int i=0; i< knc::NumberOfVars; i++) {
if (m_activeUpsInfo->record.upsVarCode[i] != 0) { // jistota pokud by nam to nekde propadlo if (m_activeUpsInfo->record.upsVarCode[i] != 0) { // jistota pokud by nam to nekde propadlo
@ -540,7 +540,7 @@ void KNutMainWindow::repaintAnalogs ( bool run ) {
nutStringVar = m_activeUpsInfo->upsNet->readStringVar ((char *)nameUpsVars2[m_activeUpsInfo->record.upsVarCode[i]]); nutStringVar = m_activeUpsInfo->upsNet->readStringVar ((char *)nameUpsVars2[m_activeUpsInfo->record.upsVarCode[i]]);
break; break;
} }
//qDebug ("KNutMainWindow::repaintAnalogs 2 "); //tqDebug ("KNutMainWindow::repaintAnalogs 2 ");
if (nutStringVar.isEmpty()) numVar=0; if (nutStringVar.isEmpty()) numVar=0;
else numVar = nutStringVar.toFloat(); else numVar = nutStringVar.toFloat();
@ -550,7 +550,7 @@ void KNutMainWindow::repaintAnalogs ( bool run ) {
m_panelMeter->repaintAnalogPointer(i,numVar,run); m_panelMeter->repaintAnalogPointer(i,numVar,run);
} }
} // end for } // end for
//qDebug ("KNutMainWindow::repaintAnalogs 3 "); //tqDebug ("KNutMainWindow::repaintAnalogs 3 ");
} }

@ -19,7 +19,7 @@
#include <tqstring.h> #include <tqstring.h>
KNutMessageManager::KNutMessageManager( TQObject *parent, const char *name) : TQObject (parent, name) { KNutMessageManager::KNutMessageManager( TQObject *parent, const char *name) : TQObject (parent, name) {
//qDebug("KNutMessageManager::KNutMessageManager"); //tqDebug("KNutMessageManager::KNutMessageManager");
m_myMess =0; m_myMess =0;
@ -53,7 +53,7 @@ long int timeOfMessageValidity;
if (useShortTimeOfValidity) timeOfMessageValidity = ShortTimeOfValidity; if (useShortTimeOfValidity) timeOfMessageValidity = ShortTimeOfValidity;
else timeOfMessageValidity = TimeOfValidity; else timeOfMessageValidity = TimeOfValidity;
//qDebug("KNutMessageManager::addMessage"); //tqDebug("KNutMessageManager::addMessage");
deleteMessage(); deleteMessage();
if (useInfoIcon) m_myMess = new KNutMessage(text,KNutMessage::infoMess,timeOfMessageValidity); if (useInfoIcon) m_myMess = new KNutMessage(text,KNutMessage::infoMess,timeOfMessageValidity);
@ -109,7 +109,7 @@ void KNutMessageManager::slotEndMessage (void) {
void KNutMessageManager::slotMessageMoved (int x,int y) { void KNutMessageManager::slotMessageMoved (int x,int y) {
//qDebug("KNutMessageManager::slotMessageMoved"); //tqDebug("KNutMessageManager::slotMessageMoved");
m_xPos=x; m_xPos=x;
m_yPos=y; m_yPos=y;
} }

@ -39,7 +39,7 @@ KNutNet::KNutNet (const TQString upsAddress, const TQString upsName, const unsig
: TQObject(), m_upsAddress(upsAddress), m_upsName(upsName), m_countRepeat(countRepeat), m_port(port), m_delay(delay) { : TQObject(), m_upsAddress(upsAddress), m_upsName(upsName), m_countRepeat(countRepeat), m_port(port), m_delay(delay) {
//qDebug ("KNutNet::KNutNet"); //tqDebug ("KNutNet::KNutNet");
m_state = Idle; //idle is value m_state = Idle; //idle is value
m_numberVars = 0; m_numberVars = 0;
@ -1819,7 +1819,7 @@ int KNutNet::upsOldTranslateError (const TQString string) {
void KNutNet::slotConnectionError(int error) { void KNutNet::slotConnectionError(int error) {
//std::cout << "--KNutNet::slotConnectionError" << std::endl; //std::cout << "--KNutNet::slotConnectionError" << std::endl;
//qDebug ("--KNutNet::slotConnectionError"); //tqDebug ("--KNutNet::slotConnectionError");
m_state = ConnectError; m_state = ConnectError;
m_unConnectTimer->stop(); m_unConnectTimer->stop();
@ -1833,13 +1833,13 @@ void KNutNet::slotConnectionError(int error) {
if (m_firstConnect) { if (m_firstConnect) {
if (m_numberConnection < m_countRepeat) { if (m_numberConnection < m_countRepeat) {
m_numberConnection++; m_numberConnection++;
// qDebug ("--KNutNet:: connect error - try connect on next time"); // tqDebug ("--KNutNet:: connect error - try connect on next time");
m_unConnectTimer->start( m_delay, TRUE ); m_unConnectTimer->start( m_delay, TRUE );
} }
else { else {
// i don't connect server // i don't connect server
error=CantConnect; error=CantConnect;
// qDebug("--KNutNet::emit - connection error "); // tqDebug("--KNutNet::emit - connection error ");
emit connectionError(error); emit connectionError(error);
return; return;
} }
@ -1847,7 +1847,7 @@ void KNutNet::slotConnectionError(int error) {
else { else {
// connecting is down, try repeated connection // connecting is down, try repeated connection
// qDebug ("--KNutNet::no first connect connection error "); // tqDebug ("--KNutNet::no first connect connection error ");
m_unConnectTimer->start( m_delay, TRUE ); m_unConnectTimer->start( m_delay, TRUE );
} }
return; return;

@ -82,7 +82,7 @@ void KNutPanelMeter::deActivateAnalogs (void) {
} }
void KNutPanelMeter::activateAnalogs (void) { void KNutPanelMeter::activateAnalogs (void) {
//qDebug ("KNutPanelMeter::activateAnalogs start"); //tqDebug ("KNutPanelMeter::activateAnalogs start");
KNutVarData::VarStrucDef analogMemberData; KNutVarData::VarStrucDef analogMemberData;
@ -153,9 +153,9 @@ void KNutPanelMeter::activateAnalogs (void) {
} }
} }
//qDebug ( "KNutPanelMeter::activateAnalogs 1" ); //tqDebug ( "KNutPanelMeter::activateAnalogs 1" );
m_analogArea->repaint(); //repaint all analog panels, background was made already m_analogArea->repaint(); //repaint all analog panels, background was made already
//qDebug ("KNutPanelMeter::activateAnalogs - end"); //tqDebug ("KNutPanelMeter::activateAnalogs - end");
// analogSV->resizeContents(sizeHint().width(),sizeHint().height()); // analogSV->resizeContents(sizeHint().width(),sizeHint().height());
} }

Loading…
Cancel
Save